xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core, before applying dependent patches

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2015-05-27 09:17:21 +02:00
parent d499c10684 68ab747604
commit 8d12ded3dd
600 changed files with 5858 additions and 5048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
init/do_mounts.c
View File

@@ -225,10 +225,11 @@ dev_t name_to_dev_t(const char *name)
#endif
if (strncmp(name, "/dev/", 5) != 0) {
unsigned maj, min;
unsigned maj, min, offset;
char dummy;
if (sscanf(name, "%u:%u%c", &maj, &min, &dummy) == 2) {
if ((sscanf(name, "%u:%u%c", &maj, &min, &dummy) == 2) ||
(sscanf(name, "%u:%u:%u:%c", &maj, &min, &offset, &dummy) == 3)) {
res = MKDEV(maj, min);
if (maj != MAJOR(res) || min != MINOR(res))
goto fail;