Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a61aef7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20130628' of... 

Merge tag 'for-linus-20130628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300

Pull two MN10300 fixes from David Howells:
 "The first fixes a problem with passing arrays rather than pointers to
  get_user() where __typeof__ then wants to declare and initialise an
  array variable which gcc doesn't like.

  The second fixes a problem whereby putting mem=xxx into the kernel
  command line causes init=xxx to get an incorrect value."

* tag 'for-linus-20130628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300:
  mn10300: Use early_param() to parse "mem=" parameter
  mn10300: Allow to pass array name to get_user()
parents a75930c6 e3f12a53

arch/mn10300/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct __large_struct { unsigned long buf[100]; }; 


#define __get_user_check(x, ptr, size)					\

({									\

	const __typeof__(ptr) __guc_ptr = (ptr);			\

	const __typeof__(*(ptr))* __guc_ptr = (ptr);			\

	int _e;								\

	if (likely(__access_ok((unsigned long) __guc_ptr, (size))))	\

		_e = __get_user_nocheck((x), __guc_ptr, (size));	\

arch/mn10300/kernel/setup.c

+21 −33
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct mn10300_cpuinfo boot_cpu_data; 
/* For PCI or other memory-mapped resources */

unsigned long pci_mem_start = 0x18000000;



static char __initdata cmd_line[COMMAND_LINE_SIZE];

char redboot_command_line[COMMAND_LINE_SIZE] =

	"console=ttyS0,115200 root=/dev/mtdblock3 rw";
@@ -74,45 +75,19 @@ static const char *const mn10300_cputypes[] = { 
};



/*

 *

 * Pick out the memory size.  We look for mem=size,

 * where size is "size[KkMm]"

 */

static void __init parse_mem_cmdline(char **cmdline_p)

static int __init early_mem(char *p)

{

	char *from, *to, c;



	/* save unparsed command line copy for /proc/cmdline */

	strcpy(boot_command_line, redboot_command_line);



	/* see if there's an explicit memory size option */

	from = redboot_command_line;

	to = redboot_command_line;

	c = ' ';



	for (;;) {

		if (c == ' ' && !memcmp(from, "mem=", 4)) {

			if (to != redboot_command_line)

				to--;

			memory_size = memparse(from + 4, &from);

		}



		c = *(from++);

		if (!c)

			break;



		*(to++) = c;

	}



	*to = '\0';

	*cmdline_p = redboot_command_line;

	memory_size = memparse(p, &p);



	if (memory_size == 0)

		panic("Memory size not known\n");



	memory_end = (unsigned long) CONFIG_KERNEL_RAM_BASE_ADDRESS +

		memory_size;

	if (memory_end > phys_memory_end)

		memory_end = phys_memory_end;

	return 0;

}

early_param("mem", early_mem);



/*

 * architecture specific setup
@@ -125,7 +100,20 @@ void __init setup_arch(char **cmdline_p) 
	cpu_init();

	unit_setup();

	smp_init_cpus();

	parse_mem_cmdline(cmdline_p);



	/* save unparsed command line copy for /proc/cmdline */

	strlcpy(boot_command_line, redboot_command_line, COMMAND_LINE_SIZE);



	/* populate cmd_line too for later use, preserving boot_command_line */

	strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);

	*cmdline_p = cmd_line;



	parse_early_param();



	memory_end = (unsigned long) CONFIG_KERNEL_RAM_BASE_ADDRESS +

		memory_size;

	if (memory_end > phys_memory_end)

		memory_end = phys_memory_end;



	init_mm.start_code = (unsigned long)&_text;

	init_mm.end_code = (unsigned long) &_etext;