linux-next: manual merge of the boot-params tree

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
arch/parisc/kernel/setup.c between commit
14e01f8241387e4c236148bfaca77e3e546ad94d ("parisc: remove dead
BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions") from the parisc
tree and commit 0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/parisc/kernel/setup.c
index 8d8b024,3bdf1e2..0000000
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@@ -58,7 -58,12 +58,7 @@@ int parisc_bus_is_phys __read_mostly = 
  EXPORT_SYMBOL(parisc_bus_is_phys);
  #endif
  
- void __init setup_cmdline(char **cmdline_p)
 -/* This sets the vmerge boundary and size, it's here because it has to
 - * be available on all platforms (zero means no-virtual merging) */
 -unsigned long parisc_vmerge_boundary = 0;
 -unsigned long parisc_vmerge_max_size = 0;
 -
+ void __init arch_get_boot_command_line(void)
  {
  	extern unsigned int boot_args[];
  

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
arch/parisc/kernel/setup.c between commit
14e01f8241387e4c236148bfaca77e3e546ad94d ("parisc: remove dead
BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions") from the parisc
tree and commit 0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/parisc/kernel/setup.c
index 8d8b024,3bdf1e2..0000000
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@@ -58,7 -58,12 +58,7 @@@ int parisc_bus_is_phys __read_mostly = 
  EXPORT_SYMBOL(parisc_bus_is_phys);
  #endif
  
- void __init setup_cmdline(char **cmdline_p)
 -/* This sets the vmerge boundary and size, it's here because it has to
 - * be available on all platforms (zero means no-virtual merging) */
 -unsigned long parisc_vmerge_boundary = 0;
 -unsigned long parisc_vmerge_max_size = 0;
 -
+ void __init arch_get_boot_command_line(void)
  {
  	extern unsigned int boot_args[];
  

Re: linux-next: manual merge of the boot-params tree

[Rusty Russell]

On Tuesday 30 December 2008 00:40:55 Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next merge of the boot-params tree got a conflict in
> drivers/usb/core/usb.c between commit
> 6e7b5429a08fe4f71c336710bd45acdce6cd3df7 ("USB: don't use
> __module_param_call") from the usb tree and commit
> 9634765245cd7aba71328c71813ca882d008632d ("USB: Don't use
> __module_param_call; use core_param") from the boot-params tree.
> 
> Two different versions of the same change?  I fixed it up (used the
> boot-params tree version) and can carry the fix as necessary.  It sounds
> like Greg should drop the patch from the usb tree (or pick up the version
> from the boot-params tree).

Yes; I sent Greg an email but it might have been lost in the flood.  Pete
acked.

I'd rather this version for simplicity in the other patches, but I can live
if not.  It's also a little clearer, IMHO.

Thanks,
Rusty.

>From 9634765245cd7aba71328c71813ca882d008632d Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 25 Dec 2008 22:06:14 +1030
Subject: [PATCH] USB: Don't use __module_param_call; use core_param.

Impact: cleanup

Found this when I changed args to __module_param_call.  We now have
core_param for exactly this, but Greg assures me "nousb" is used as a
module parameter, so we need the #ifdef MODULE.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Pete Zaitcev <zaitcev@redhat.com>

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index be1fa07..74d9dcd 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -962,8 +962,12 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
 }
 EXPORT_SYMBOL_GPL(usb_buffer_unmap_sg);
 
-/* format to disable USB on kernel command line is: nousb */
-__module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444);
+/* To disable USB, kernel command line is 'nousb' not 'usbcore.nousb' */
+#ifdef MODULE
+module_param(nousb, bool, 0444);
+#else
+core_param(nousb, nousb, bool, 0444);
+#endif
 
 /*
  * for external read access to <nousb>

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
init/main.c between commit 0b8f1efad30bd58f89961b82dfe68b9edf8fd2ac
("sparse irq_desc[] array: core kernel and x86 changes") from the
sparseirq tree and commit 25bf48b74b9fb23b347d00656b604f9e55c72183 ("Fix
powerpc (tested on ppc64) command line handling") from the boot-params
tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc init/main.c
index 396b271,ad933ad..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -543,20 -522,30 +526,40 @@@ void __init __weak thread_info_cache_in
  {
  }
  
 +int __init __weak arch_early_irq_init(void)
 +{
 +	return 0;
 +}
 +
 +int __init __weak early_irq_init(void)
 +{
 +	return arch_early_irq_init();
 +}
 +
+ /* Non-destructive early parse of commandline.  PowerPC calls this early. */
+ void __init parse_early_and_core_params(char *cmdline)
+ {
+ 	static bool __initdata done = false;
+ 
+ 	if (done)
+ 		return;
+ 
+ 	parse_args("Core and early params", cmdline,
+ 		   __start___core_param,
+ 		   __stop___core_param - __start___core_param,
+ 		   do_early_param, true);
+ 	done = true;
+ }
+ 
  asmlinkage void __init start_kernel(void)
  {
- 	char * command_line;
- 	extern struct kernel_param __start___param[], __stop___param[];
+ 	char *static_command_line;
+ 
+ 	printk(KERN_NOTICE);
+ 	printk(linux_banner);
+ 
+ 	arch_get_boot_command_line();
+ 	parse_early_and_core_params(boot_command_line);
  
  	smp_setup_processor_id();
  

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
drivers/usb/core/usb.c between commit
6e7b5429a08fe4f71c336710bd45acdce6cd3df7 ("USB: don't use
__module_param_call") from the usb tree and commit
9634765245cd7aba71328c71813ca882d008632d ("USB: Don't use
__module_param_call; use core_param") from the boot-params tree.

Two different versions of the same change?  I fixed it up (used the
boot-params tree version) and can carry the fix as necessary.  It sounds
like Greg should drop the patch from the usb tree (or pick up the version
from the boot-params tree).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
arch/x86/kernel/cpu/common.c between commit
88b094fb8d4fe43b7025ea8d487059e8813e02cd ("x86: Hypervisor detection and
get tsc_freq from hypervisor") from Linus' tree and commit
568991994fb3aad34504e9bdac458a2bfd388c7f ("x86: clean up
setup_clear/force_cpu_cap handling") from the boot-params tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for now.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/x86/kernel/cpu/common.c
index 42e0853,63531c9..0000000
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -704,7 -716,9 +717,11 @@@ static void __cpuinit identify_cpu(stru
  	detect_ht(c);
  #endif
  
 +	init_hypervisor(c);
++
+ 	/* Command-line override before we AND into smp all cpus cap. */
+ 	override_capabilities(c->x86_capability);
+ 
  	/*
  	 * On SMP, boot_cpu_data holds the common feature set between
  	 * all CPUs; so make sure that we indicate which features are

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
arch/sh/boards/mach-microdev/setup.c between commit
cee3e05ee0c727945280b754b3d4bfe0d7bcb622 ("sh: mach-microdev: Split out
the fdc37c93xapm initialization code") from the sh tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.

The former removed the code that the latter changed.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
arch/sh/boards/mach-migor/setup.c between commit
2f75cd4d60aa955f983134f7ceb656b1b8cb8c30 ("sh: mach-migor: Kill off
unused Migo-R machvec") from the sh tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.

The former removes the code that the latter modified.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
arch/arm/kernel/setup.c between commit
4b5f32cee0cce7b9783ced5cbeabd17aa53c51fb ("[ARM] rationalize memory
configuration code some more") from the arm tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.

I fixed it up as best I could (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/arm/kernel/setup.c
index 7049815,72b7aa5..0000000
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -112,9 -112,9 +112,8 @@@ static struct stack stacks[NR_CPUS]
  char elf_platform[ELF_PLATFORM_SIZE];
  EXPORT_SYMBOL(elf_platform);
  
 -static struct meminfo meminfo __initdata = { 0, };
  static const char *cpu_name;
  static const char *machine_name;
- static char __initdata command_line[COMMAND_LINE_SIZE];
  
  static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
  static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@@ -708,22 -700,30 +705,30 @@@ void __init arch_get_boot_command_line(
  	if (mdesc->fixup)
  		mdesc->fixup(mdesc, tags, &from, &meminfo);
  
- 	if (tags->hdr.tag == ATAG_CORE) {
- 		if (meminfo.nr_banks != 0)
- 			squash_mem_tags(tags);
- 		save_atags(tags);
- 		parse_tags(tags);
- 	}
+ 	if (meminfo.nr_banks != 0)
+ 		squash_mem_tags(tags);
+ 	save_atags(tags);
+ 	parse_tags(tags);
+ 
+ 	/* This copies into boot_command_line */
+ 	parse_cmdline(from);
+ }
+ 
+ void __init setup_arch(void)
+ {
+ 	struct machine_desc *mdesc = setup_machine(machine_arch_type);
+ 
+ 	machine_name = mdesc->name;
+ 
+ 	if (mdesc->soft_reboot)
+ 		reboot_setup("s");
  
 -	init_mm.start_code = (unsigned long) &_text;
 -	init_mm.end_code   = (unsigned long) &_etext;
 -	init_mm.end_data   = (unsigned long) &_edata;
 -	init_mm.brk	   = (unsigned long) &_end;
 +	init_mm.start_code = (unsigned long) _text;
 +	init_mm.end_code   = (unsigned long) _etext;
 +	init_mm.end_data   = (unsigned long) _edata;
 +	init_mm.brk	   = (unsigned long) _end;
  
- 	memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
- 	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
- 	parse_cmdline(cmdline_p, from);
 -	paging_init(&meminfo, mdesc);
 +	paging_init(mdesc);
  	request_standard_resources(&meminfo, mdesc);
  
  #ifdef CONFIG_SMP

linux-next: manual merge of the boot-params tree

[Stephen Rothwell]

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
init/main.c between commit 0b8f1efad30bd58f89961b82dfe68b9edf8fd2ac
("sparse irq_desc[] array: core kernel and x86 changes") from the
sparseirq tree and commit 0de5c2d9f02d2018fd671ca1015432dffa5eb338
("param: arch_get_boot_command_line()") from the boot-params tree.

Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc init/main.c
index 1d3ccf8,e0d6592..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -543,19 -522,19 +526,28 @@@ void __init __weak thread_info_cache_in
  {
  }
  
 +void __init __weak arch_early_irq_init(void)
 +{
 +}
 +
 +void __init __weak early_irq_init(void)
 +{
 +	arch_early_irq_init();
 +}
 +
+ /* Ideally, this would take a 'const char *cmdline' param. */
  asmlinkage void __init start_kernel(void)
  {
- 	char * command_line;
- 	extern struct kernel_param __start___param[], __stop___param[];
+ 	char *static_command_line;
+ 
+ 	printk(KERN_NOTICE);
+ 	printk(linux_banner);
+ 
+ 	arch_get_boot_command_line();
+ 	parse_args("Core and early params", boot_command_line,
+ 		   __start___core_param,
+ 		   __stop___core_param - __start___core_param,
+ 		   do_early_param, true);
  
  	smp_setup_processor_id();