Manual merge with Linus.

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

1 files changed, 31 insertions, 118 deletions

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index a0b407585679..eacc3f0a2ea4 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -47,6 +47,7 @@
 #include <linux/kexec.h>
 #include <linux/crash_dump.h>
 #include <linux/dmi.h>
+#include <linux/pfn.h>
 
 #include <video/edid.h>
 
@@ -1059,10 +1060,10 @@ static int __init
 free_available_memory(unsigned long start, unsigned long end, void *arg)
 {
         /* check max_low_pfn */
-        if (start >= ((max_low_pfn + 1) << PAGE_SHIFT))
+        if (start >= (max_low_pfn << PAGE_SHIFT))
                 return 0;
-        if (end >= ((max_low_pfn + 1) << PAGE_SHIFT))
-                end = (max_low_pfn + 1) << PAGE_SHIFT;
+        if (end >= (max_low_pfn << PAGE_SHIFT))
+                end = max_low_pfn << PAGE_SHIFT;
         if (start < end)
                 free_bootmem(start, end - start);
 
@@ -1287,9 +1288,7 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
         probe_roms();
         for (i = 0; i < e820.nr_map; i++) {
                 struct resource *res;
-                if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)
-                        continue;
-                res = alloc_bootmem_low(sizeof(struct resource));
+                res = kzalloc(sizeof(struct resource), GFP_ATOMIC);
                 switch (e820.map[i].type) {
                 case E820_RAM:  res->name = "System RAM"; break;
                 case E820_ACPI: res->name = "ACPI Tables"; break;
@@ -1317,13 +1316,15 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
 
 /*
  * Request address space for all standard resources
+ *
+ * This is called just before pcibios_assign_resources(), which is also
+ * an fs_initcall, but is linked in later (in arch/i386/pci/i386.c).
  */
-static void __init register_memory(void)
+static int __init request_standard_resources(void)
 {
-        unsigned long gapstart, gapsize, round;
-        unsigned long long last;
-        int           i;
+        int i;
 
+        printk("Setting up standard PCI resources\n");
         if (efi_enabled)
                 efi_initialize_iomem_resources(&code_resource, &data_resource);
         else
@@ -1335,6 +1336,16 @@ static void __init register_memory(void)
         /* request I/O space for devices used on all i[345]86 PCs */
         for (i = 0; i < STANDARD_IO_RESOURCES; i++)
                 request_resource(&ioport_resource, &standard_io_resources[i]);
+        return 0;
+}
+
+fs_initcall(request_standard_resources);
+
+static void __init register_memory(void)
+{
+        unsigned long gapstart, gapsize, round;
+        unsigned long long last;
+        int i;
 
         /*
          * Search for the bigest gap in the low 32 bits of the e820
@@ -1378,101 +1389,6 @@ static void __init register_memory(void)
                 pci_mem_start, gapstart, gapsize);
 }
 
-/* Use inline assembly to define this because the nops are defined 
-   as inline assembly strings in the include files and we cannot 
-   get them easily into strings. */
-asm("\t.data\nintelnops: " 
-    GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6
-    GENERIC_NOP7 GENERIC_NOP8); 
-asm("\t.data\nk8nops: " 
-    K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6
-    K8_NOP7 K8_NOP8); 
-asm("\t.data\nk7nops: " 
-    K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6
-    K7_NOP7 K7_NOP8); 
-    
-extern unsigned char intelnops[], k8nops[], k7nops[];
-static unsigned char *intel_nops[ASM_NOP_MAX+1] = { 
-     NULL,
-     intelnops,
-     intelnops + 1,
-     intelnops + 1 + 2,
-     intelnops + 1 + 2 + 3,
-     intelnops + 1 + 2 + 3 + 4,
-     intelnops + 1 + 2 + 3 + 4 + 5,
-     intelnops + 1 + 2 + 3 + 4 + 5 + 6,
-     intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
-}; 
-static unsigned char *k8_nops[ASM_NOP_MAX+1] = { 
-     NULL,
-     k8nops,
-     k8nops + 1,
-     k8nops + 1 + 2,
-     k8nops + 1 + 2 + 3,
-     k8nops + 1 + 2 + 3 + 4,
-     k8nops + 1 + 2 + 3 + 4 + 5,
-     k8nops + 1 + 2 + 3 + 4 + 5 + 6,
-     k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
-}; 
-static unsigned char *k7_nops[ASM_NOP_MAX+1] = { 
-     NULL,
-     k7nops,
-     k7nops + 1,
-     k7nops + 1 + 2,
-     k7nops + 1 + 2 + 3,
-     k7nops + 1 + 2 + 3 + 4,
-     k7nops + 1 + 2 + 3 + 4 + 5,
-     k7nops + 1 + 2 + 3 + 4 + 5 + 6,
-     k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
-}; 
-static struct nop { 
-     int cpuid; 
-     unsigned char **noptable; 
-} noptypes[] = { 
-     { X86_FEATURE_K8, k8_nops }, 
-     { X86_FEATURE_K7, k7_nops }, 
-     { -1, NULL }
-}; 
-
-/* Replace instructions with better alternatives for this CPU type.
-
-   This runs before SMP is initialized to avoid SMP problems with
-   self modifying code. This implies that assymetric systems where
-   APs have less capabilities than the boot processor are not handled. 
-   Tough. Make sure you disable such features by hand. */ 
-void apply_alternatives(void *start, void *end) 
-{ 
-        struct alt_instr *a; 
-        int diff, i, k;
-        unsigned char **noptable = intel_nops; 
-        for (i = 0; noptypes[i].cpuid >= 0; i++) { 
-                if (boot_cpu_has(noptypes[i].cpuid)) { 
-                        noptable = noptypes[i].noptable;
-                        break;
-                }
-        } 
-        for (a = start; (void *)a < end; a++) { 
-                if (!boot_cpu_has(a->cpuid))
-                        continue;
-                BUG_ON(a->replacementlen > a->instrlen); 
-                memcpy(a->instr, a->replacement, a->replacementlen); 
-                diff = a->instrlen - a->replacementlen; 
-                /* Pad the rest with nops */
-                for (i = a->replacementlen; diff > 0; diff -= k, i += k) {
-                        k = diff;
-                        if (k > ASM_NOP_MAX)
-                                k = ASM_NOP_MAX;
-                        memcpy(a->instr + i, noptable[k], k); 
-                } 
-        }
-} 
-
-void __init alternative_instructions(void)
-{
-        extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
-        apply_alternatives(__alt_instructions, __alt_instructions_end);
-}
-
 static char * __init machine_specific_memory_setup(void);
 
 #ifdef CONFIG_MCA
@@ -1555,6 +1471,16 @@ void __init setup_arch(char **cmdline_p)
 
         parse_cmdline_early(cmdline_p);
 
+#ifdef CONFIG_EARLY_PRINTK
+        {
+                char *s = strstr(*cmdline_p, "earlyprintk=");
+                if (s) {
+                        setup_early_printk(strchr(s, '=') + 1);
+                        printk("early console enabled\n");
+                }
+        }
+#endif
+
         max_low_pfn = setup_memory();
 
         /*
@@ -1579,19 +1505,6 @@ void __init setup_arch(char **cmdline_p)
          * NOTE: at this point the bootmem allocator is fully available.
          */
 
-#ifdef CONFIG_EARLY_PRINTK
-        {
-                char *s = strstr(*cmdline_p, "earlyprintk=");
-                if (s) {
-                        extern void setup_early_printk(char *);
-
-                        setup_early_printk(strchr(s, '=') + 1);
-                        printk("early console enabled\n");
-                }
-        }
-#endif
-
-
         dmi_scan_machine();
 
 #ifdef CONFIG_X86_GENERICARCH