16 files changed, 120 insertions, 423 deletions

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 5b9ed21216cf..96fb8a020af2 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -6,7 +6,7 @@ extra-y := head.o init_task.o vmlinux.lds
 
 obj-y   := process.o semaphore.o signal.o entry.o traps.o irq.o \
                 ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
-                pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
+                pci-dma.o i386_ksyms.o i387.o bootflag.o \
                 quirks.o i8237.o topology.o alternative.o
 
 obj-y                           += cpu/
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 033066176b3e..049a25583793 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
 {
         struct acpi_table_madt *madt = NULL;
 
-        if (!phys_addr || !size)
+        if (!phys_addr || !size || !cpu_has_apic)
                 return -EINVAL;
 
         madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@ -693,6 +693,9 @@ static int __init acpi_parse_madt_lapic_entries(void)
 {
         int count;
 
+        if (!cpu_has_apic)
+                return -ENODEV;
+
         /* 
          * Note that the LAPIC address is obtained from the MADT (32-bit value)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
@@ -751,6 +754,9 @@ static int __init acpi_parse_madt_ioapic_entries(void)
                 return -ENODEV;
         }
 
+        if (!cpu_has_apic)
+                return -ENODEV;
+
         /*
          * if "noapic" boot option, don't look for IO-APICs
          */
@@ -1096,6 +1102,9 @@ int __init acpi_boot_table_init(void)
         dmi_check_system(acpi_dmi_table);
 #endif
 
+        if (!cpu_has_apic)
+                return -ENODEV;
+
         /*
          * If acpi_disabled, bail out
          * One exception: acpi=ht continues far enough to enumerate LAPICs
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 6273bf74c203..254cee9f0b7b 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -62,6 +62,18 @@ int apic_verbosity;
 
 static void apic_pm_activate(void);
 
+int modern_apic(void)
+{
+        unsigned int lvr, version;
+        /* AMD systems use old APIC versions, so check the CPU */
+        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
+                boot_cpu_data.x86 >= 0xf)
+                return 1;
+        lvr = apic_read(APIC_LVR);
+        version = GET_APIC_VERSION(lvr);
+        return version >= 0x14;
+}
+
 /*
  * 'what should we do if we get a hw irq event on an illegal vector'.
  * each architecture has to answer this themselves.
@@ -119,10 +131,7 @@ void enable_NMI_through_LVT0 (void * dummy)
 
 int get_physical_broadcast(void)
 {
-        unsigned int lvr, version;
-        lvr = apic_read(APIC_LVR);
-        version = GET_APIC_VERSION(lvr);
-        if (!APIC_INTEGRATED(version) || version >= 0x14)
+        if (modern_apic())
                 return 0xff;
         else
                 return 0xf;
@@ -349,9 +358,9 @@ int __init verify_local_APIC(void)
 
 void __init sync_Arb_IDs(void)
 {
-        /* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 */
-        unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
-        if (ver >= 0x14)        /* P4 or higher */
+        /* Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1
+           And not needed on AMD */
+        if (modern_apic())
                 return;
         /*
          * Wait for idle.
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index da30a374dd4e..df0e1745f189 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -1079,7 +1079,7 @@ static int apm_console_blank(int blank)
                         break;
         }
 
-        if (error == APM_NOT_ENGAGED && state != APM_STATE_READY) {
+        if (error == APM_NOT_ENGAGED) {
                 static int tried;
                 int eng_error;
                 if (tried++ == 0) {
diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
index 0810f81f2a05..786d1a57048b 100644
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -207,13 +207,13 @@ static void __init init_amd(struct cpuinfo_x86 *c)
                 set_bit(X86_FEATURE_K7, c->x86_capability); 
                 break;
         }
+        if (c->x86 >= 6)
+                set_bit(X86_FEATURE_FXSAVE_LEAK, c->x86_capability);
 
         display_cacheinfo(c);
 
         if (cpuid_eax(0x80000000) >= 0x80000008) {
                 c->x86_max_cores = (cpuid_ecx(0x80000008) & 0xff) + 1;
-                if (c->x86_max_cores & (c->x86_max_cores - 1))
-                        c->x86_max_cores = 1;
         }
 
         if (cpuid_eax(0x80000000) >= 0x80000007) {
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
index 712a26bd4457..71fffa174425 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -46,7 +46,7 @@
 
 #define PFX "powernow-k8: "
 #define BFX PFX "BIOS error: "
-#define VERSION "version 1.60.1"
+#define VERSION "version 1.60.2"
 #include "powernow-k8.h"
 
 /* serialize freq changes  */
@@ -55,7 +55,7 @@ static DEFINE_MUTEX(fidvid_mutex);
 static struct powernow_k8_data *powernow_data[NR_CPUS];
 
 #ifndef CONFIG_SMP
-static cpumask_t cpu_core_map[1] = { CPU_MASK_ALL };
+static cpumask_t cpu_core_map[1];
 #endif
 
 /* Return a frequency in MHz, given an input fid */
@@ -905,11 +905,17 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi
 {
         cpumask_t oldmask = CPU_MASK_ALL;
         struct powernow_k8_data *data = powernow_data[pol->cpu];
-        u32 checkfid = data->currfid;
-        u32 checkvid = data->currvid;
+        u32 checkfid;
+        u32 checkvid;
         unsigned int newstate;
         int ret = -EIO;
 
+        if (!data)
+                return -EINVAL;
+
+        checkfid = data->currfid;
+        checkvid = data->currvid;
+
         /* only run on specific CPU from here on */
         oldmask = current->cpus_allowed;
         set_cpus_allowed(current, cpumask_of_cpu(pol->cpu));
@@ -969,6 +975,9 @@ static int powernowk8_verify(struct cpufreq_policy *pol)
 {
         struct powernow_k8_data *data = powernow_data[pol->cpu];
 
+        if (!data)
+                return -EINVAL;
+
         return cpufreq_frequency_table_verify(pol, data->powernow_table);
 }
 
@@ -977,7 +986,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 {
         struct powernow_k8_data *data;
         cpumask_t oldmask = CPU_MASK_ALL;
-        int rc, i;
+        int rc;
 
         if (!cpu_online(pol->cpu))
                 return -ENODEV;
@@ -1063,8 +1072,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
         printk("cpu_init done, current fid 0x%x, vid 0x%x\n",
                data->currfid, data->currvid);
 
-        for_each_cpu_mask(i, cpu_core_map[pol->cpu])
-                powernow_data[i] = data;
+        powernow_data[pol->cpu] = data;
 
         return 0;
 
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 006141d1c12a..1d9a4abcdfc7 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -168,7 +168,7 @@ static int cpuid_class_device_create(int i)
         return err;
 }
 
-static int __devinit cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
 
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
deleted file mode 100644
index 5efceebc48dc..000000000000
--- a/arch/i386/kernel/dmi_scan.c
+++ /dev/null
@@ -1,358 +0,0 @@
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/dmi.h>
-#include <linux/efi.h>
-#include <linux/bootmem.h>
-#include <linux/slab.h>
-#include <asm/dmi.h>
-
-static char * __init dmi_string(struct dmi_header *dm, u8 s)
-{
-        u8 *bp = ((u8 *) dm) + dm->length;
-        char *str = "";
-
-        if (s) {
-                s--;
-                while (s > 0 && *bp) {
-                        bp += strlen(bp) + 1;
-                        s--;
-                }
-
-                if (*bp != 0) {
-                        str = dmi_alloc(strlen(bp) + 1);
-                        if (str != NULL)
-                                strcpy(str, bp);
-                        else
-                                printk(KERN_ERR "dmi_string: out of memory.\n");
-                }
-        }
-
-        return str;
-}
-
-/*
- *      We have to be cautious here. We have seen BIOSes with DMI pointers
- *      pointing to completely the wrong place for example
- */
-static int __init dmi_table(u32 base, int len, int num,
-                            void (*decode)(struct dmi_header *))
-{
-        u8 *buf, *data;
-        int i = 0;
-                
-        buf = dmi_ioremap(base, len);
-        if (buf == NULL)
-                return -1;
-
-        data = buf;
-
-        /*
-         *      Stop when we see all the items the table claimed to have
-         *      OR we run off the end of the table (also happens)
-         */
-        while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) {
-                struct dmi_header *dm = (struct dmi_header *)data;
-                /*
-                 *  We want to know the total length (formated area and strings)
-                 *  before decoding to make sure we won't run off the table in
-                 *  dmi_decode or dmi_string
-                 */
-                data += dm->length;
-                while ((data - buf < len - 1) && (data[0] || data[1]))
-                        data++;
-                if (data - buf < len - 1)
-                        decode(dm);
-                data += 2;
-                i++;
-        }
-        dmi_iounmap(buf, len);
-        return 0;
-}
-
-static int __init dmi_checksum(u8 *buf)
-{
-        u8 sum = 0;
-        int a;
-        
-        for (a = 0; a < 15; a++)
-                sum += buf[a];
-
-        return sum == 0;
-}
-
-static char *dmi_ident[DMI_STRING_MAX];
-static LIST_HEAD(dmi_devices);
-
-/*
- *      Save a DMI string
- */
-static void __init dmi_save_ident(struct dmi_header *dm, int slot, int string)
-{
-        char *p, *d = (char*) dm;
-
-        if (dmi_ident[slot])
-                return;
-
-        p = dmi_string(dm, d[string]);
-        if (p == NULL)
-                return;
-
-        dmi_ident[slot] = p;
-}
-
-static void __init dmi_save_devices(struct dmi_header *dm)
-{
-        int i, count = (dm->length - sizeof(struct dmi_header)) / 2;
-        struct dmi_device *dev;
-
-        for (i = 0; i < count; i++) {
-                char *d = (char *)(dm + 1) + (i * 2);
-
-                /* Skip disabled device */
-                if ((*d & 0x80) == 0)
-                        continue;
-
-                dev = dmi_alloc(sizeof(*dev));
-                if (!dev) {
-                        printk(KERN_ERR "dmi_save_devices: out of memory.\n");
-                        break;
-                }
-
-                dev->type = *d++ & 0x7f;
-                dev->name = dmi_string(dm, *d);
-                dev->device_data = NULL;
-
-                list_add(&dev->list, &dmi_devices);
-        }
-}
-
-static void __init dmi_save_ipmi_device(struct dmi_header *dm)
-{
-        struct dmi_device *dev;
-        void * data;
-
-        data = dmi_alloc(dm->length);
-        if (data == NULL) {
-                printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
-                return;
-        }
-
-        memcpy(data, dm, dm->length);
-
-        dev = dmi_alloc(sizeof(*dev));
-        if (!dev) {
-                printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
-                return;
-        }
-
-        dev->type = DMI_DEV_TYPE_IPMI;
-        dev->name = "IPMI controller";
-        dev->device_data = data;
-
-        list_add(&dev->list, &dmi_devices);
-}
-
-/*
- *      Process a DMI table entry. Right now all we care about are the BIOS
- *      and machine entries. For 2.5 we should pull the smbus controller info
- *      out of here.
- */
-static void __init dmi_decode(struct dmi_header *dm)
-{
-        switch(dm->type) {
-        case 0:         /* BIOS Information */
-                dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
-                dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
-                dmi_save_ident(dm, DMI_BIOS_DATE, 8);
-                break;
-        case 1:         /* System Information */
-                dmi_save_ident(dm, DMI_SYS_VENDOR, 4);
-                dmi_save_ident(dm, DMI_PRODUCT_NAME, 5);
-                dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
-                dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
-                break;
-        case 2:         /* Base Board Information */
-                dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
-                dmi_save_ident(dm, DMI_BOARD_NAME, 5);
-                dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
-                break;
-        case 10:        /* Onboard Devices Information */
-                dmi_save_devices(dm);
-                break;
-        case 38:        /* IPMI Device Information */
-                dmi_save_ipmi_device(dm);
-        }
-}
-
-static int __init dmi_present(char __iomem *p)
-{
-        u8 buf[15];
-        memcpy_fromio(buf, p, 15);
-        if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
-                u16 num = (buf[13] << 8) | buf[12];
-                u16 len = (buf[7] << 8) | buf[6];
-                u32 base = (buf[11] << 24) | (buf[10] << 16) |
-                        (buf[9] << 8) | buf[8];
-
-                /*
-                 * DMI version 0.0 means that the real version is taken from
-                 * the SMBIOS version, which we don't know at this point.
-                 */
-                if (buf[14] != 0)
-                        printk(KERN_INFO "DMI %d.%d present.\n",
-                               buf[14] >> 4, buf[14] & 0xF);
-                else
-                        printk(KERN_INFO "DMI present.\n");
-                if (dmi_table(base,len, num, dmi_decode) == 0)
-                        return 0;
-        }
-        return 1;
-}
-
-void __init dmi_scan_machine(void)
-{
-        char __iomem *p, *q;
-        int rc;
-
-        if (efi_enabled) {
-                if (efi.smbios == EFI_INVALID_TABLE_ADDR)
-                        goto out;
-
-               /* This is called as a core_initcall() because it isn't
-                * needed during early boot.  This also means we can
-                * iounmap the space when we're done with it.
-                */
-                p = dmi_ioremap(efi.smbios, 32);
-                if (p == NULL)
-                        goto out;
-
-                rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
-                dmi_iounmap(p, 32);
-                if (!rc)
-                        return;
-        }
-        else {
-                /*
-                 * no iounmap() for that ioremap(); it would be a no-op, but
-                 * it's so early in setup that sucker gets confused into doing
-                 * what it shouldn't if we actually call it.
-                 */
-                p = dmi_ioremap(0xF0000, 0x10000);
-                if (p == NULL)
-                        goto out;
-
-                for (q = p; q < p + 0x10000; q += 16) {
-                        rc = dmi_present(q);
-                        if (!rc)
-                                return;
-                }
-        }
- out:   printk(KERN_INFO "DMI not present or invalid.\n");
-}
-
-/**
- *      dmi_check_system - check system DMI data
- *      @list: array of dmi_system_id structures to match against
- *
- *      Walk the blacklist table running matching functions until someone
- *      returns non zero or we hit the end. Callback function is called for
- *      each successfull match. Returns the number of matches.
- */
-int dmi_check_system(struct dmi_system_id *list)
-{
-        int i, count = 0;
-        struct dmi_system_id *d = list;
-
-        while (d->ident) {
-                for (i = 0; i < ARRAY_SIZE(d->matches); i++) {
-                        int s = d->matches[i].slot;
-                        if (s == DMI_NONE)
-                                continue;
-                        if (dmi_ident[s] && strstr(dmi_ident[s], d->matches[i].substr))
-                                continue;
-                        /* No match */
-                        goto fail;
-                }
-                count++;
-                if (d->callback && d->callback(d))
-                        break;
-fail:           d++;
-        }
-
-        return count;
-}
-EXPORT_SYMBOL(dmi_check_system);
-
-/**
- *      dmi_get_system_info - return DMI data value
- *      @field: data index (see enum dmi_filed)
- *
- *      Returns one DMI data value, can be used to perform
- *      complex DMI data checks.
- */
-char *dmi_get_system_info(int field)
-{
-        return dmi_ident[field];
-}
-EXPORT_SYMBOL(dmi_get_system_info);
-
-/**
- *      dmi_find_device - find onboard device by type/name
- *      @type: device type or %DMI_DEV_TYPE_ANY to match all device types
- *      @desc: device name string or %NULL to match all
- *      @from: previous device found in search, or %NULL for new search.
- *
- *      Iterates through the list of known onboard devices. If a device is
- *      found with a matching @vendor and @device, a pointer to its device
- *      structure is returned.  Otherwise, %NULL is returned.
- *      A new search is initiated by passing %NULL to the @from argument.
- *      If @from is not %NULL, searches continue from next device.
- */
-struct dmi_device * dmi_find_device(int type, const char *name,
-                                    struct dmi_device *from)
-{
-        struct list_head *d, *head = from ? &from->list : &dmi_devices;
-
-        for(d = head->next; d != &dmi_devices; d = d->next) {
-                struct dmi_device *dev = list_entry(d, struct dmi_device, list);
-
-                if (((type == DMI_DEV_TYPE_ANY) || (dev->type == type)) &&
-                    ((name == NULL) || (strcmp(dev->name, name) == 0)))
-                        return dev;
-        }
-
-        return NULL;
-}
-EXPORT_SYMBOL(dmi_find_device);
-
-/**
- *      dmi_get_year - Return year of a DMI date
- *      @field: data index (like dmi_get_system_info)
- *
- *      Returns -1 when the field doesn't exist. 0 when it is broken.
- */
-int dmi_get_year(int field)
-{
-        int year;
-        char *s = dmi_get_system_info(field);
-
-        if (!s)
-                return -1;
-        if (*s == '\0')
-                return 0;
-        s = strrchr(s, '/');
-        if (!s)
-                return 0;
-
-        s += 1;
-        year = simple_strtoul(s, NULL, 0);
-        if (year && year < 100) {       /* 2-digit year */
-                year += 1900;
-                if (year < 1996)        /* no dates < spec 1.0 */
-                        year += 100;
-        }
-
-        return year;
-}
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c
index 055325056a74..036a9857936f 100644
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/i386/kernel/i386_ksyms.c
@@ -19,7 +19,6 @@ EXPORT_SYMBOL(__put_user_2);
 EXPORT_SYMBOL(__put_user_4);
 EXPORT_SYMBOL(__put_user_8);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 
 #ifdef CONFIG_SMP
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index f19768789e8a..043f5292e70a 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -43,7 +43,7 @@ DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
 DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
 /* insert a jmp code */
-static inline void set_jmp_op(void *from, void *to)
+static __always_inline void set_jmp_op(void *from, void *to)
 {
         struct __arch_jmp_op {
                 char op;
@@ -57,7 +57,7 @@ static inline void set_jmp_op(void *from, void *to)
 /*
  * returns non-zero if opcodes can be boosted.
  */
-static inline int can_boost(kprobe_opcode_t opcode)
+static __always_inline int can_boost(kprobe_opcode_t opcode)
 {
         switch (opcode & 0xf0 ) {
         case 0x70:
@@ -88,7 +88,7 @@ static inline int can_boost(kprobe_opcode_t opcode)
 /*
  * returns non-zero if opcode modifies the interrupt flag.
  */
-static inline int is_IF_modifier(kprobe_opcode_t opcode)
+static int __kprobes is_IF_modifier(kprobe_opcode_t opcode)
 {
         switch (opcode) {
         case 0xfa:              /* cli */
@@ -138,7 +138,7 @@ void __kprobes arch_remove_kprobe(struct kprobe *p)
         mutex_unlock(&kprobe_mutex);
 }
 
-static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb)
+static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
         kcb->prev_kprobe.kp = kprobe_running();
         kcb->prev_kprobe.status = kcb->kprobe_status;
@@ -146,7 +146,7 @@ static inline void save_previous_kprobe(struct kprobe_ctlblk *kcb)
         kcb->prev_kprobe.saved_eflags = kcb->kprobe_saved_eflags;
 }
 
-static inline void restore_previous_kprobe(struct kprobe_ctlblk *kcb)
+static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
         __get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
         kcb->kprobe_status = kcb->prev_kprobe.status;
@@ -154,7 +154,7 @@ static inline void restore_previous_kprobe(struct kprobe_ctlblk *kcb)
         kcb->kprobe_saved_eflags = kcb->prev_kprobe.saved_eflags;
 }
 
-static inline void set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
+static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
                                 struct kprobe_ctlblk *kcb)
 {
         __get_cpu_var(current_kprobe) = p;
@@ -164,7 +164,7 @@ static inline void set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
                 kcb->kprobe_saved_eflags &= ~IF_MASK;
 }
 
-static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
 {
         regs->eflags |= TF_MASK;
         regs->eflags &= ~IF_MASK;
@@ -507,7 +507,7 @@ no_change:
  * Interrupts are disabled on entry as trap1 is an interrupt gate and they
  * remain disabled thoroughout this function.
  */
-static inline int post_kprobe_handler(struct pt_regs *regs)
+static int __kprobes post_kprobe_handler(struct pt_regs *regs)
 {
         struct kprobe *cur = kprobe_running();
         struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
@@ -543,7 +543,7 @@ out:
         return 1;
 }
 
-static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
+static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 {
         struct kprobe *cur = kprobe_running();
         struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 8d8aa9d1796d..34d21e21e012 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -38,12 +38,6 @@
 int smp_found_config;
 unsigned int __initdata maxcpus = NR_CPUS;
 
-#ifdef CONFIG_HOTPLUG_CPU
-#define CPU_HOTPLUG_ENABLED     (1)
-#else
-#define CPU_HOTPLUG_ENABLED     (0)
-#endif
-
 /*
  * Various Linux-internal data structures created from the
  * MP-table.
@@ -110,21 +104,6 @@ static int __init mpf_checksum(unsigned char *mp, int len)
 static int mpc_record; 
 static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata;
 
-#ifdef CONFIG_X86_NUMAQ
-static int MP_valid_apicid(int apicid, int version)
-{
-        return hweight_long(apicid & 0xf) == 1 && (apicid >> 4) != 0xf;
-}
-#else
-static int MP_valid_apicid(int apicid, int version)
-{
-        if (version >= 0x14)
-                return apicid < 0xff;
-        else
-                return apicid < 0xf;
-}
-#endif
-
 static void __devinit MP_processor_info (struct mpc_config_processor *m)
 {
         int ver, apicid;
@@ -190,12 +169,6 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
 
         ver = m->mpc_apicver;
 
-        if (!MP_valid_apicid(apicid, ver)) {
-                printk(KERN_WARNING "Processor #%d INVALID. (Max ID: %d).\n",
-                        m->mpc_apicid, MAX_APICS);
-                return;
-        }
-
         /*
          * Validate version
          */
@@ -225,7 +198,14 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
         cpu_set(num_processors, cpu_possible_map);
         num_processors++;
 
-        if (CPU_HOTPLUG_ENABLED || (num_processors > 8)) {
+        /*
+         * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y
+         * but we need to work other dependencies like SMP_SUSPEND etc
+         * before this can be done without some confusion.
+         * if (CPU_HOTPLUG_ENABLED || num_processors > 8)
+         *       - Ashok Raj <ashok.raj@intel.com>
+         */
+        if (num_processors > 8) {
                 switch (boot_cpu_data.x86_vendor) {
                 case X86_VENDOR_INTEL:
                         if (!APIC_XAPIC(ver)) {
@@ -249,6 +229,13 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
 
         mpc_oem_bus_info(m, str, translation_table[mpc_record]);
 
+        if (m->mpc_busid >= MAX_MP_BUSSES) {
+                printk(KERN_WARNING "MP table busid value (%d) for bustype %s "
+                        " is too large, max. supported is %d\n",
+                        m->mpc_busid, str, MAX_MP_BUSSES - 1);
+                return;
+        }
+
         if (strncmp(str, BUSTYPE_ISA, sizeof(BUSTYPE_ISA)-1) == 0) {
                 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA;
         } else if (strncmp(str, BUSTYPE_EISA, sizeof(BUSTYPE_EISA)-1) == 0) {
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index 1d0a55e68760..7a328230e540 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -251,7 +251,7 @@ static int msr_class_device_create(int i)
         return err;
 }
 
-static int __devinit msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
 
diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/i386/kernel/reboot_fixups.c
index 10e21a4773dd..99aab41a05b0 100644
--- a/arch/i386/kernel/reboot_fixups.c
+++ b/arch/i386/kernel/reboot_fixups.c
@@ -51,7 +51,5 @@ void mach_reboot_fixups(void)
 
                 cur->reboot_fixup(dev);
         }
-
-        printk(KERN_WARNING "No reboot fixup found for your hardware\n");
 }
 
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index eacc3f0a2ea4..80cb3b2d0997 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -963,6 +963,36 @@ efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg)
         return 0;
 }
 
+ /*
+  * This function checks if the entire range <start,end> is mapped with type.
+  *
+  * Note: this function only works correct if the e820 table is sorted and
+  * not-overlapping, which is the case
+  */
+int __init
+e820_all_mapped(unsigned long start, unsigned long end, unsigned type)
+{
+        int i;
+        for (i = 0; i < e820.nr_map; i++) {
+                struct e820entry *ei = &e820.map[i];
+                if (type && ei->type != type)
+                        continue;
+                /* is the region (part) in overlap with the current region ?*/
+                if (ei->addr >= end || ei->addr + ei->size <= start)
+                        continue;
+                /* if the region is at the beginning of <start,end> we move
+                 * start to the end of the region since it's ok until there
+                 */
+                if (ei->addr <= start)
+                        start = ei->addr + ei->size;
+                /* if start is now at or beyond end, we're done, full
+                 * coverage */
+                if (start >= end)
+                        return 1; /* we're done */
+        }
+        return 0;
+}
+
 /*
  * Find the highest page frame number we have available
  */
@@ -1317,8 +1347,8 @@ 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).
+ * This is called just before pcibios_init(), which is also a
+ * subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
  */
 static int __init request_standard_resources(void)
 {
@@ -1339,7 +1369,7 @@ static int __init request_standard_resources(void)
         return 0;
 }
 
-fs_initcall(request_standard_resources);
+subsys_initcall(request_standard_resources);
 
 static void __init register_memory(void)
 {
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 4f58b9c0efe3..f48bef15b4f0 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -314,3 +314,4 @@ ENTRY(sys_call_table)
         .long sys_get_robust_list
         .long sys_splice
         .long sys_sync_file_range
+        .long sys_tee                   /* 315 */
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index e38527994590..2d22f5761b1d 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -365,6 +365,9 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         if (++die.lock_owner_depth < 3) {
                 int nl = 0;
+                unsigned long esp;
+                unsigned short ss;
+
                 handle_BUG(regs);
                 printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
@@ -387,8 +390,19 @@ void die(const char * str, struct pt_regs * regs, long err)
                         printk("\n");
                 if (notify_die(DIE_OOPS, str, regs, err,
                                         current->thread.trap_no, SIGSEGV) !=
-                                NOTIFY_STOP)
+                                NOTIFY_STOP) {
                         show_registers(regs);
+                        /* Executive summary in case the oops scrolled away */
+                        esp = (unsigned long) (&regs->esp);
+                        savesegment(ss, ss);
+                        if (user_mode(regs)) {
+                                esp = regs->esp;
+                                ss = regs->xss & 0xffff;
+                        }
+                        printk(KERN_EMERG "EIP: [<%08lx>] ", regs->eip);
+                        print_symbol("%s", regs->eip);
+                        printk(" SS:ESP %04x:%08lx\n", ss, esp);
+                }
                 else
                         regs = NULL;
         } else