Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (225 commits)
  [PATCH] Don't set calgary iommu as default y
  [PATCH] i386/x86-64: New Intel feature flags
  [PATCH] x86: Add a cumulative thermal throttle event counter.
  [PATCH] i386: Make the jiffies compares use the 64bit safe macros.
  [PATCH] x86: Refactor thermal throttle processing
  [PATCH] Add 64bit jiffies compares (for use with get_jiffies_64)
  [PATCH] Fix unwinder warning in traps.c
  [PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
  [PATCH] x86: Move direct PCI scanning functions out of line
  [PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
  [PATCH] Don't leak NT bit into next task
  [PATCH] i386/x86-64: Work around gcc bug with noreturn functions in unwinder
  [PATCH] Fix some broken white space in ia32_signal.c
  [PATCH] Initialize argument registers for 32bit signal handlers.
  [PATCH] Remove all traces of signal number conversion
  [PATCH] Don't synchronize time reading on single core AMD systems
  [PATCH] Remove outdated comment in x86-64 mmconfig code
  [PATCH] Use string instructions for Core2 copy/clear
  [PATCH] x86: - restore i8259A eoi status on resume
  [PATCH] i386: Split multi-line printk in oops output.
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/i386/Kconfig
Simple merge

diff --cc arch/i386/kernel/setup.c
index 16d9944,7a99b13..76a524b
--- 1/arch/i386/kernel/setup.c
--- 2/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@@ -701,257 -687,133 +688,151 @@@ static inline void copy_edd(void
  }
  #endif
  
- static void __init parse_cmdline_early (char ** cmdline_p)
- {
-       char c = ' ', *to = command_line, *from = saved_command_line;
-       int len = 0;
-       int userdef = 0;
+ static int __initdata user_defined_memmap = 0;
  
-       /* Save unparsed command line copy for /proc/cmdline */
-       saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+ /*
+  * "mem=nopentium" disables the 4MB page tables.
+  * "mem=XXX[kKmM]" defines a memory region from HIGH_MEM
+  * to <mem>, overriding the bios size.
+  * "memmap=XXX[KkmM]@XXX[KkmM]" defines a memory region from
+  * <start> to <start>+<mem>, overriding the bios size.
+  *
+  * HPA tells me bootloaders need to parse mem=, so no new
+  * option should be mem=  [also see Documentation/i386/boot.txt]
+  */
+ static int __init parse_mem(char *arg)
+ {
+       if (!arg)
+               return -EINVAL;
  
-       for (;;) {
-               if (c != ' ')
-                       goto next_char;
-               /*
-                * "mem=nopentium" disables the 4MB page tables.
-                * "mem=XXX[kKmM]" defines a memory region from HIGH_MEM
-                * to <mem>, overriding the bios size.
-                * "memmap=XXX[KkmM]@XXX[KkmM]" defines a memory region from
-                * <start> to <start>+<mem>, overriding the bios size.
-                *
-                * HPA tells me bootloaders need to parse mem=, so no new
-                * option should be mem=  [also see Documentation/i386/boot.txt]
+       if (strcmp(arg, "nopentium") == 0) {
+               clear_bit(X86_FEATURE_PSE, boot_cpu_data.x86_capability);
+               disable_pse = 1;
+       } else {
+               /* If the user specifies memory size, we
+                * limit the BIOS-provided memory map to
+                * that size. exactmap can be used to specify
+                * the exact map. mem=number can be used to
+                * trim the existing memory map.
                 */
-               if (!memcmp(from, "mem=", 4)) {
-                       if (to != command_line)
-                               to--;
-                       if (!memcmp(from+4, "nopentium", 9)) {
-                               from += 9+4;
-                               clear_bit(X86_FEATURE_PSE, boot_cpu_data.x86_capability);
-                               disable_pse = 1;
-                       } else {
-                               /* If the user specifies memory size, we
-                                * limit the BIOS-provided memory map to
-                                * that size. exactmap can be used to specify
-                                * the exact map. mem=number can be used to
-                                * trim the existing memory map.
-                                */
-                               unsigned long long mem_size;
+               unsigned long long mem_size;
   
-                               mem_size = memparse(from+4, &from);
-                               limit_regions(mem_size);
-                               userdef=1;
-                       }
-               }
- 
-               else if (!memcmp(from, "memmap=", 7)) {
-                       if (to != command_line)
-                               to--;
-                       if (!memcmp(from+7, "exactmap", 8)) {
- #ifdef CONFIG_CRASH_DUMP
-                               /* If we are doing a crash dump, we
-                                * still need to know the real mem
-                                * size before original memory map is
-                                * reset.
-                                */
-                               find_max_pfn();
-                               saved_max_pfn = max_pfn;
- #endif
-                               from += 8+7;
-                               e820.nr_map = 0;
-                               userdef = 1;
-                       } else {
-                               /* If the user specifies memory size, we
-                                * limit the BIOS-provided memory map to
-                                * that size. exactmap can be used to specify
-                                * the exact map. mem=number can be used to
-                                * trim the existing memory map.
-                                */
-                               unsigned long long start_at, mem_size;
-  
-                               mem_size = memparse(from+7, &from);
-                               if (*from == '@') {
-                                       start_at = memparse(from+1, &from);
-                                       add_memory_region(start_at, mem_size, E820_RAM);
-                               } else if (*from == '#') {
-                                       start_at = memparse(from+1, &from);
-                                       add_memory_region(start_at, mem_size, E820_ACPI);
-                               } else if (*from == '$') {
-                                       start_at = memparse(from+1, &from);
-                                       add_memory_region(start_at, mem_size, E820_RESERVED);
-                               } else {
-                                       limit_regions(mem_size);
-                                       userdef=1;
-                               }
-                       }
-               }
- 
-               else if (!memcmp(from, "noexec=", 7))
-                       noexec_setup(from + 7);
+               mem_size = memparse(arg, &arg);
+               limit_regions(mem_size);
+               user_defined_memmap = 1;
+       }
+       return 0;
+ }
+ early_param("mem", parse_mem);
  
+ static int __init parse_memmap(char *arg)
+ {
+       if (!arg)
+               return -EINVAL;
  
- #ifdef  CONFIG_X86_SMP
-               /*
-                * If the BIOS enumerates physical processors before logical,
-                * maxcpus=N at enumeration-time can be used to disable HT.
+       if (strcmp(arg, "exactmap") == 0) {
+ #ifdef CONFIG_CRASH_DUMP
+               /* If we are doing a crash dump, we
+                * still need to know the real mem
+                * size before original memory map is
+                * reset.
                 */
-               else if (!memcmp(from, "maxcpus=", 8)) {
-                       extern unsigned int maxcpus;
- 
-                       maxcpus = simple_strtoul(from + 8, NULL, 0);
-               }
+               find_max_pfn();
+               saved_max_pfn = max_pfn;
  #endif
- 
- #ifdef CONFIG_ACPI
-               /* "acpi=off" disables both ACPI table parsing and interpreter */
-               else if (!memcmp(from, "acpi=off", 8)) {
-                       disable_acpi();
-               }
- 
-               /* acpi=force to over-ride black-list */
-               else if (!memcmp(from, "acpi=force", 10)) {
-                       acpi_force = 1;
-                       acpi_ht = 1;
-                       acpi_disabled = 0;
-               }
- 
-               /* acpi=strict disables out-of-spec workarounds */
-               else if (!memcmp(from, "acpi=strict", 11)) {
-                       acpi_strict = 1;
-               }
- 
-               /* Limit ACPI just to boot-time to enable HT */
-               else if (!memcmp(from, "acpi=ht", 7)) {
-                       if (!acpi_force)
-                               disable_acpi();
-                       acpi_ht = 1;
-               }
-               
-               /* "pci=noacpi" disable ACPI IRQ routing and PCI scan */
-               else if (!memcmp(from, "pci=noacpi", 10)) {
-                       acpi_disable_pci();
-               }
-               /* "acpi=noirq" disables ACPI interrupt routing */
-               else if (!memcmp(from, "acpi=noirq", 10)) {
-                       acpi_noirq_set();
+               e820.nr_map = 0;
+               user_defined_memmap = 1;
+       } else {
+               /* If the user specifies memory size, we
+                * limit the BIOS-provided memory map to
+                * that size. exactmap can be used to specify
+                * the exact map. mem=number can be used to
+                * trim the existing memory map.
+                */
+               unsigned long long start_at, mem_size;
+ 
+               mem_size = memparse(arg, &arg);
+               if (*arg == '@') {
+                       start_at = memparse(arg+1, &arg);
+                       add_memory_region(start_at, mem_size, E820_RAM);
+               } else if (*arg == '#') {
+                       start_at = memparse(arg+1, &arg);
+                       add_memory_region(start_at, mem_size, E820_ACPI);
+               } else if (*arg == '$') {
+                       start_at = memparse(arg+1, &arg);
+                       add_memory_region(start_at, mem_size, E820_RESERVED);
+               } else {
+                       limit_regions(mem_size);
+                       user_defined_memmap = 1;
                }
+       }
+       return 0;
+ }
+ early_param("memmap", parse_memmap);
  
-               else if (!memcmp(from, "acpi_sci=edge", 13))
-                       acpi_sci_flags.trigger =  1;
- 
-               else if (!memcmp(from, "acpi_sci=level", 14))
-                       acpi_sci_flags.trigger = 3;
- 
-               else if (!memcmp(from, "acpi_sci=high", 13))
-                       acpi_sci_flags.polarity = 1;
- 
-               else if (!memcmp(from, "acpi_sci=low", 12))
-                       acpi_sci_flags.polarity = 3;
- 
- #ifdef CONFIG_X86_IO_APIC
-               else if (!memcmp(from, "acpi_skip_timer_override", 24))
-                       acpi_skip_timer_override = 1;
- 
-               if (!memcmp(from, "disable_timer_pin_1", 19))
-                       disable_timer_pin_1 = 1;
-               if (!memcmp(from, "enable_timer_pin_1", 18))
-                       disable_timer_pin_1 = -1;
+ #ifdef CONFIG_PROC_VMCORE
+ /* elfcorehdr= specifies the location of elf core header
+  * stored by the crashed kernel.
+  */
+ static int __init parse_elfcorehdr(char *arg)
+ {
+       if (!arg)
+               return -EINVAL;
  
-               /* disable IO-APIC */
-               else if (!memcmp(from, "noapic", 6))
-                       disable_ioapic_setup();
- #endif /* CONFIG_X86_IO_APIC */
- #endif /* CONFIG_ACPI */
+       elfcorehdr_addr = memparse(arg, &arg);
+       return 0;
+ }
+ early_param("elfcorehdr", parse_elfcorehdr);
+ #endif /* CONFIG_PROC_VMCORE */
  
- #ifdef CONFIG_X86_LOCAL_APIC
-               /* enable local APIC */
-               else if (!memcmp(from, "lapic", 5))
-                       lapic_enable();
+ /*
+  * highmem=size forces highmem to be exactly 'size' bytes.
+  * This works even on boxes that have no highmem otherwise.
+  * This also works to reduce highmem size on bigger boxes.
+  */
+ static int __init parse_highmem(char *arg)
+ {
+       if (!arg)
+               return -EINVAL;
  
-               /* disable local APIC */
-               else if (!memcmp(from, "nolapic", 6))
-                       lapic_disable();
- #endif /* CONFIG_X86_LOCAL_APIC */
+       highmem_pages = memparse(arg, &arg) >> PAGE_SHIFT;
+       return 0;
+ }
+ early_param("highmem", parse_highmem);
  
- #ifdef CONFIG_KEXEC
-               /* crashkernel=size@addr specifies the location to reserve for
-                * a crash kernel.  By reserving this memory we guarantee
-                * that linux never set's it up as a DMA target.
-                * Useful for holding code to do something appropriate
-                * after a kernel panic.
-                */
-               else if (!memcmp(from, "crashkernel=", 12)) {
-                       unsigned long size, base;
-                       size = memparse(from+12, &from);
-                       if (*from == '@') {
-                               base = memparse(from+1, &from);
-                               /* FIXME: Do I want a sanity check
-                                * to validate the memory range?
-                                */
-                               crashk_res.start = base;
-                               crashk_res.end   = base + size - 1;
-                       }
-               }
- #endif
- #ifdef CONFIG_PROC_VMCORE
-               /* elfcorehdr= specifies the location of elf core header
-                * stored by the crashed kernel.
-                */
-               else if (!memcmp(from, "elfcorehdr=", 11))
-                       elfcorehdr_addr = memparse(from+11, &from);
- #endif
+ /*
+  * vmalloc=size forces the vmalloc area to be exactly 'size'
+  * bytes. This can be used to increase (or decrease) the
+  * vmalloc area - the default is 128m.
+  */
+ static int __init parse_vmalloc(char *arg)
+ {
+       if (!arg)
+               return -EINVAL;
  
-               /*
-                * highmem=size forces highmem to be exactly 'size' bytes.
-                * This works even on boxes that have no highmem otherwise.
-                * This also works to reduce highmem size on bigger boxes.
-                */
-               else if (!memcmp(from, "highmem=", 8))
-                       highmem_pages = memparse(from+8, &from) >> PAGE_SHIFT;
-       
-               /*
-                * vmalloc=size forces the vmalloc area to be exactly 'size'
-                * bytes. This can be used to increase (or decrease) the
-                * vmalloc area - the default is 128m.
-                */
-               else if (!memcmp(from, "vmalloc=", 8))
-                       __VMALLOC_RESERVE = memparse(from+8, &from);
- 
-       next_char:
-               c = *(from++);
-               if (!c)
-                       break;
-               if (COMMAND_LINE_SIZE <= ++len)
-                       break;
-               *(to++) = c;
-       }
-       *to = '\0';
-       *cmdline_p = command_line;
-       if (userdef) {
-               printk(KERN_INFO "user-defined physical RAM map:\n");
-               print_memory_map("user");
-       }
+       __VMALLOC_RESERVE = memparse(arg, &arg);
+       return 0;
  }
+ early_param("vmalloc", parse_vmalloc);
  
 +/*
 + * reservetop=size reserves a hole at the top of the kernel address space which
 + * a hypervisor can load into later.  Needed for dynamically loaded hypervisors,
 + * so relocating the fixmap can be done before paging initialization.
 + */
 +static int __init parse_reservetop(char *arg)
 +{
 +      unsigned long address;
 +
 +      if (!arg)
 +              return -EINVAL;
 +
 +      address = memparse(arg, &arg);
 +      reserve_top_address(address);
 +      return 0;
 +}
 +early_param("reservetop", parse_reservetop);
 +
  /*
   * Callback for efi_memory_walk.
   */

diff --cc arch/i386/kernel/time.c
Simple merge

diff --cc arch/i386/kernel/traps.c
Simple merge

diff --cc arch/i386/mm/discontig.c
Simple merge

diff --cc arch/i386/mm/init.c
Simple merge

diff --cc arch/um/sys-i386/Makefile
Simple merge

diff --cc arch/x86_64/Kconfig
Simple merge

diff --cc arch/x86_64/kernel/e820.c
Simple merge

diff --cc arch/x86_64/kernel/setup.c
Simple merge

diff --cc arch/x86_64/kernel/smpboot.c
Simple merge

diff --cc arch/x86_64/kernel/time.c
Simple merge

diff --cc arch/x86_64/mm/fault.c
Simple merge

diff --cc arch/x86_64/mm/init.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc include/asm-i386/pgtable.h
Simple merge

diff --cc include/asm-i386/ptrace.h
Simple merge

diff --cc include/asm-x86_64/e820.h
Simple merge

diff --cc include/asm-x86_64/percpu.h
Simple merge

diff --cc include/asm-x86_64/pgtable.h
Simple merge

diff --cc include/asm-x86_64/smp.h
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/sysctl.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge