Skip to content

Commit

Permalink
Fix merge fallout
Browse files Browse the repository at this point in the history
Fix issues introduced in the latest merge.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
larsclausen committed Feb 28, 2014
1 parent f0094ff commit 1f446f9
Showing 3 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion arch/lm32/mm/init.c
Original file line number Diff line number Diff line change
@@ -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();

10 changes: 4 additions & 6 deletions arch/lm32/platforms/milkymist/early_printk.c
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,
}
}

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);
}
6 changes: 2 additions & 4 deletions include/linux/syscalls.h
Original file line number Diff line number Diff line change
@@ -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,

0 comments on commit 1f446f9

Please sign in to comment.