Fix merge fallout

larsclausen · larsclausen · commit 1f446f97a436 · 2014-02-28T21:49:20.000+01:00
Fix issues introduced in the latest merge.

Signed-off-by: Lars-Peter Clausen &lt;lars@metafoo.de&gt;
diff --git a/arch/lm32/mm/init.c b/arch/lm32/mm/init.c
@@ -109,7 +109,7 @@ void __init mem_init(void)
 {
 	high_memory = (void *)__va(max_low_pfn * PAGE_SIZE);
 
-	max_mapnr = num_physpages = max_low_pfn;
+	max_mapnr = max_low_pfn;
 
 	totalram_pages = free_all_bootmem();
 
diff --git a/arch/lm32/platforms/milkymist/early_printk.c b/arch/lm32/platforms/milkymist/early_printk.c
@@ -67,20 +67,18 @@ static void __init early_console_write(struct console *con, const char *s,
 	}
 }
 
-static struct console early_console __initdata = {
+static struct console early_console_dev __initdata = {
 	.name	= "early",
 	.write	= early_console_write,
 	.flags	= CON_PRINTBUFFER | CON_BOOT,
 	.index	= -1
 };
 
-static bool early_console_initialized __initdata;
-
 void __init milkymist_setup_early_printk(void)
 {
-	if (early_console_initialized)
+	if (early_console)
 		return;
-	early_console_initialized = true;
 
-	register_console(&early_console);
+	early_console = &early_console_dev;
+	register_console(&early_console_dev);
 }
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
@@ -801,18 +801,16 @@ asmlinkage long sys_vfork(void);
 #ifdef CONFIG_CLONE_BACKWARDS
 asmlinkage long sys_clone(unsigned long, unsigned long, int __user *, int,
 	       int __user *);
-#elif defined(CONFIG_CLONE_BACKWARDS3)
+#elif defined(CONFIG_CLONE_BACKWARDS4)
 asmlinkage long sys_clone(unsigned int, unsigned long, unsigned long, int __user *,
 	       int __user *, int);
-#else
-#ifdef CONFIG_CLONE_BACKWARDS3
+#elif defined(CONFIG_CLONE_BACKWARDS3)
 asmlinkage long sys_clone(unsigned long, unsigned long, int, int __user *,
 			  int __user *, int);
 #else
 asmlinkage long sys_clone(unsigned long, unsigned long, int __user *,
 	       int __user *, int);
 #endif
-#endif
 
 asmlinkage long sys_execve(const char __user *filename,
 		const char __user *const __user *argv,

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void __init mem_init(void)`
`109`	`109`	`{`
`110`	`110`	`high_memory = (void )__va(max_low_pfn PAGE_SIZE);`
`111`	`111`
`112`		`- max_mapnr = num_physpages = max_low_pfn;`
	`112`	`+ max_mapnr = max_low_pfn;`
`113`	`113`
`114`	`114`	`totalram_pages = free_all_bootmem();`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -67,20 +67,18 @@ static void __init early_console_write(struct console con, const char s,`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-static struct console early_console __initdata = {`
	`70`	`+static struct console early_console_dev __initdata = {`
`71`	`71`	`.name = "early",`
`72`	`72`	`.write = early_console_write,`
`73`	`73`	`.flags = CON_PRINTBUFFER \| CON_BOOT,`
`74`	`74`	`.index = -1`
`75`	`75`	`};`
`76`	`76`
`77`		`-static bool early_console_initialized __initdata;`
`78`		`-`
`79`	`77`	`void __init milkymist_setup_early_printk(void)`
`80`	`78`	`{`
`81`		`- if (early_console_initialized)`
	`79`	`+ if (early_console)`
`82`	`80`	`return;`
`83`		`- early_console_initialized = true;`
`84`	`81`
`85`		`- register_console(&early_console);`
	`82`	`+ early_console = &early_console_dev;`
	`83`	`+ register_console(&early_console_dev);`
`86`	`84`	`}`