Merge ../linux-2.6

29 files changed, 131 insertions, 433 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 18ec9fe6deb6..8dfa3054f10f 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -467,7 +467,7 @@ endchoice
 
 choice
         depends on EXPERIMENTAL && !X86_PAE
-        prompt "Memory split"
+        prompt "Memory split" if EMBEDDED
         default VMSPLIT_3G
         help
           Select the desired split between kernel and user memory.
@@ -756,12 +756,12 @@ config PHYSICAL_START
 
 config HOTPLUG_CPU
         bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-        depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER && !X86_PC
+        depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
         ---help---
-          Say Y here to experiment with turning CPUs off and on.  CPUs
-          can be controlled through /sys/devices/system/cpu.
+          Say Y here to experiment with turning CPUs off and on, and to
+          enable suspend on SMP systems. CPUs can be controlled through
+          /sys/devices/system/cpu.
 
-          Say N.
 
 endmenu
 
diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index 6e97df6979e8..c92191b1fb67 100644
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -81,4 +81,13 @@ config X86_MPPARSE
         depends on X86_LOCAL_APIC && !X86_VISWS
         default y
 
+config DOUBLEFAULT
+        default y
+        bool "Enable doublefault exception handler" if EMBEDDED
+        help
+          This option allows trapping of rare doublefault exceptions that
+          would otherwise cause a system to silently reboot. Disabling this
+          option saves about 4k and might cause you much additional grey
+          hair.
+
 endmenu
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 030a0007a4e0..40e5aba3ad3d 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
         unsigned long i;
         int config_size;
 
-        if (!phys_addr || !size || !cpu_has_apic)
+        if (!phys_addr || !size)
                 return -EINVAL;
 
         mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
@@ -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 || !cpu_has_apic)
+        if (!phys_addr || !size)
                 return -EINVAL;
 
         madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index 2e3b643a4dc4..1649a175a206 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -5,17 +5,34 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/acpi.h>
+
 #include <asm/pci-direct.h>
 #include <asm/acpi.h>
 #include <asm/apic.h>
 
+#ifdef CONFIG_ACPI
+
+static int nvidia_hpet_detected __initdata;
+
+static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)
+{
+        nvidia_hpet_detected = 1;
+        return 0;
+}
+#endif
+
 static int __init check_bridge(int vendor, int device)
 {
 #ifdef CONFIG_ACPI
-        /* According to Nvidia all timer overrides are bogus. Just ignore
-           them all. */
+        /* According to Nvidia all timer overrides are bogus unless HPET
+           is enabled. */
         if (vendor == PCI_VENDOR_ID_NVIDIA) {
-                acpi_skip_timer_override = 1;
+                nvidia_hpet_detected = 0;
+                acpi_table_parse(ACPI_HPET, nvidia_hpet_check);
+                if (nvidia_hpet_detected == 0) {
+                        acpi_skip_timer_override = 1;
+                }
         }
 #endif
         if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 254cee9f0b7b..3d4b2f3d116a 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -757,10 +757,6 @@ static int __init apic_set_verbosity(char *str)
                 apic_verbosity = APIC_DEBUG;
         else if (strcmp("verbose", str) == 0)
                 apic_verbosity = APIC_VERBOSE;
-        else
-                printk(KERN_WARNING "APIC Verbosity level %s not recognised"
-                                " use apic=verbose or apic=debug\n", str);
-
         return 1;
 }
 
@@ -1345,6 +1341,14 @@ int __init APIC_init_uniprocessor (void)
 
         connect_bsp_APIC();
 
+        /*
+         * Hack: In case of kdump, after a crash, kernel might be booting
+         * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
+         * might be zero if read from MP tables. Get it from LAPIC.
+         */
+#ifdef CONFIG_CRASH_DUMP
+        boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
+#endif
         phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid);
 
         setup_local_APIC();
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 ff2b2154ac1b..786d1a57048b 100644
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/i386/kernel/cpu/amd.c
@@ -207,6 +207,8 @@ 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);
 
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
index 7c0e160a2145..71fffa174425 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -905,14 +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));
@@ -1109,9 +1112,6 @@ static unsigned int powernowk8_get (unsigned int cpu)
         if (!data)
                 return -EINVAL;
 
-        if (!data)
-                return -EINVAL;
-
         set_cpus_allowed(current, cpumask_of_cpu(cpu));
         if (smp_processor_id() != cpu) {
                 printk(KERN_ERR PFX "limiting to CPU %d failed in powernowk8_get\n", cpu);
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c
index 9df87b03612c..c8547a6fa7e6 100644
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -642,7 +642,7 @@ static void __cpuexit cache_remove_dev(struct sys_device * sys_dev)
         return;
 }
 
-static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
+static int cacheinfo_cpu_callback(struct notifier_block *nfb,
                                         unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long)hcpu;
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/io_apic.c b/arch/i386/kernel/io_apic.c
index f8f132aa5472..d70f2ade5cde 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -2238,6 +2238,8 @@ static inline void unlock_ExtINT_logic(void)
         spin_unlock_irqrestore(&ioapic_lock, flags);
 }
 
+int timer_uses_ioapic_pin_0;
+
 /*
  * This code may look a bit paranoid, but it's supposed to cooperate with
  * a wide range of boards and BIOS bugs.  Fortunately only the timer IRQ
@@ -2274,6 +2276,9 @@ static inline void check_timer(void)
         pin2  = ioapic_i8259.pin;
         apic2 = ioapic_i8259.apic;
 
+        if (pin1 == 0)
+                timer_uses_ioapic_pin_0 = 1;
+
         printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n",
                 vector, apic1, pin1, apic2, pin2);
 
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index f19768789e8a..38806f427849 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;
@@ -242,10 +242,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                         kcb->kprobe_status = KPROBE_REENTER;
                         return 1;
                 } else {
-                        if (regs->eflags & VM_MASK) {
-                        /* We are in virtual-8086 mode. Return 0 */
-                                goto no_kprobe;
-                        }
                         if (*addr != BREAKPOINT_INSTRUCTION) {
                         /* The breakpoint instruction was removed by
                          * another cpu right after we hit, no further
@@ -265,11 +261,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
 
         p = get_kprobe(addr);
         if (!p) {
-                if (regs->eflags & VM_MASK) {
-                        /* We are in virtual-8086 mode. Return 0 */
-                        goto no_kprobe;
-                }
-
                 if (*addr != BREAKPOINT_INSTRUCTION) {
                         /*
                          * The breakpoint instruction was removed right
@@ -452,10 +443,11 @@ static void __kprobes resume_execution(struct kprobe *p,
                 *tos &= ~(TF_MASK | IF_MASK);
                 *tos |= kcb->kprobe_old_eflags;
                 break;
-        case 0xc3:              /* ret/lret */
-        case 0xcb:
-        case 0xc2:
+        case 0xc2:              /* iret/ret/lret */
+        case 0xc3:
         case 0xca:
+        case 0xcb:
+        case 0xcf:
         case 0xea:              /* jmp absolute -- eip is correct */
                 /* eip is already adjusted, no more changes required */
                 p->ainsn.boostable = 1;
@@ -463,10 +455,13 @@ static void __kprobes resume_execution(struct kprobe *p,
         case 0xe8:              /* call relative - Fix return addr */
                 *tos = orig_eip + (*tos - copy_eip);
                 break;
+        case 0x9a:              /* call absolute -- same as call absolute, indirect */
+                *tos = orig_eip + (*tos - copy_eip);
+                goto no_change;
         case 0xff:
                 if ((p->ainsn.insn[1] & 0x30) == 0x10) {
-                        /* call absolute, indirect */
                         /*
+                         * call absolute, indirect
                          * Fix return addr; eip is correct.
                          * But this is not boostable
                          */
@@ -507,7 +502,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 +538,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 34d21e21e012..6b1392d33ed5 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -1130,7 +1130,17 @@ int mp_register_gsi (u32 gsi, int triggering, int polarity)
                  */
                 int irq = gsi;
                 if (gsi < MAX_GSI_NUM) {
-                        if (gsi > 15)
+                        /*
+                         * Retain the VIA chipset work-around (gsi > 15), but
+                         * avoid a problem where the 8254 timer (IRQ0) is setup
+                         * via an override (so it's not on pin 0 of the ioapic),
+                         * and at the same time, the pin 0 interrupt is a PCI
+                         * type.  The gsi > 15 test could cause these two pins
+                         * to be shared as IRQ0, and they are not shareable.
+                         * So test for this condition, and if necessary, avoid
+                         * the pin collision.
+                         */
+                        if (gsi > 15 || (gsi == 0 && !timer_uses_ioapic_pin_0))
                                 gsi = pci_irq++;
                         /*
                          * Don't assign IRQ used by ACPI SCI
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/ptrace.c b/arch/i386/kernel/ptrace.c
index 506462ef36a0..fd7eaf7866e0 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -671,7 +671,7 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
 
         if (unlikely(current->audit_context)) {
                 if (entryexit)
-                        audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
+                        audit_syscall_exit(AUDITSC_RESULT(regs->eax),
                                                 regs->eax);
                 /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
                  * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is
@@ -720,14 +720,13 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
         ret = is_sysemu;
 out:
         if (unlikely(current->audit_context) && !entryexit)
-                audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax,
+                audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_eax,
                                     regs->ebx, regs->ecx, regs->edx, regs->esi);
         if (ret == 0)
                 return 0;
 
         regs->orig_eax = -1; /* force skip of syscall restarting */
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
-                                regs->eax);
+                audit_syscall_exit(AUDITSC_RESULT(regs->eax), regs->eax);
         return 1;
 }
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 80cb3b2d0997..dd6b0e3386ce 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -970,8 +970,10 @@ efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg)
   * not-overlapping, which is the case
   */
 int __init
-e820_all_mapped(unsigned long start, unsigned long end, unsigned type)
+e820_all_mapped(unsigned long s, unsigned long e, unsigned type)
 {
+        u64 start = s;
+        u64 end = e;
         int i;
         for (i = 0; i < e820.nr_map; i++) {
                 struct e820entry *ei = &e820.map[i];
@@ -1318,6 +1320,8 @@ 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 = kzalloc(sizeof(struct resource), GFP_ATOMIC);
                 switch (e820.map[i].type) {
                 case E820_RAM:  res->name = "System RAM"; break;
@@ -1543,15 +1547,18 @@ void __init setup_arch(char **cmdline_p)
         if (efi_enabled)
                 efi_map_memmap();
 
-#ifdef CONFIG_X86_IO_APIC
-        check_acpi_pci();       /* Checks more than just ACPI actually */
-#endif
-
 #ifdef CONFIG_ACPI
         /*
          * Parse the ACPI tables for possible boot-time SMP configuration.
          */
         acpi_boot_table_init();
+#endif
+
+#ifdef CONFIG_X86_IO_APIC
+        check_acpi_pci();       /* Checks more than just ACPI actually */
+#endif
+
+#ifdef CONFIG_ACPI
         acpi_boot_init();
 
 #if defined(CONFIG_SMP) && defined(CONFIG_X86_PC)
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index a6969903f2d6..825b2b4ca721 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -313,7 +313,9 @@ static void __init synchronize_tsc_bp (void)
                         if (tsc_values[i] < avg)
                                 realdelta = -realdelta;
 
-                        printk(KERN_INFO "CPU#%d had %ld usecs TSC skew, fixed it up.\n", i, realdelta);
+                        if (realdelta > 0)
+                                printk(KERN_INFO "CPU#%d had %ld usecs TSC "
+                                        "skew, fixed it up.\n", i, realdelta);
                 }
 
                 sum += delta;
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 4f58b9c0efe3..af56987f69b0 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -314,3 +314,5 @@ ENTRY(sys_call_table)
         .long sys_get_robust_list
         .long sys_splice
         .long sys_sync_file_range
+        .long sys_tee                   /* 315 */
+        .long sys_vmsplice
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
index 5e41ee29c8cf..f1187ddb0d0f 100644
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
@@ -279,7 +279,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
 {
         struct cpufreq_freqs *freq = data;
 
-        if (val != CPUFREQ_RESUMECHANGE)
+        if (val != CPUFREQ_RESUMECHANGE && val != CPUFREQ_SUSPENDCHANGE)
                 write_seqlock_irq(&xtime_lock);
         if (!ref_freq) {
                 if (!freq->old){
@@ -312,7 +312,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
         }
 
 end:
-        if (val != CPUFREQ_RESUMECHANGE)
+        if (val != CPUFREQ_RESUMECHANGE && val != CPUFREQ_SUSPENDCHANGE)
                 write_sequnlock_irq(&xtime_lock);
 
         return 0;
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 2d22f5761b1d..0e498369f35e 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -130,9 +130,8 @@ static inline int print_addr_and_symbol(unsigned long addr, char *log_lvl,
         print_symbol("%s", addr);
 
         printed = (printed + 1) % CONFIG_STACK_BACKTRACE_COLS;
-
         if (printed)
-                printk("  ");
+                printk(" ");
         else
                 printk("\n");
 
@@ -212,7 +211,6 @@ static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp,
         }
 
         stack = esp;
-        printk(log_lvl);
         for(i = 0; i < kstack_depth_to_print; i++) {
                 if (kstack_end(stack))
                         break;
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index aee14fafd13d..00e0118e717c 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -312,7 +312,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
 
         /*call audit_syscall_exit since we do not exit via the normal paths */
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+                audit_syscall_exit(AUDITSC_RESULT(eax), eax);
 
         __asm__ __volatile__(
                 "movl %0,%%esp\n\t"
diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c
index cea5b3ce4b57..d55fa7b187ab 100644
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/i386/mach-generic/probe.c
@@ -93,9 +93,11 @@ int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid
         int i;
         for (i = 0; apic_probe[i]; ++i) { 
                 if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { 
-                        genapic = apic_probe[i];
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
-                               genapic->name);
+                        if (!cmdline_apic) {
+                                genapic = apic_probe[i];
+                                printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+                                       genapic->name);
+                        }
                         return 1;
                 } 
         } 
@@ -107,9 +109,11 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
         int i;
         for (i = 0; apic_probe[i]; ++i) { 
                 if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { 
-                        genapic = apic_probe[i];
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
-                               genapic->name);
+                        if (!cmdline_apic) {
+                                genapic = apic_probe[i];
+                                printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+                                       genapic->name);
+                        }
                         return 1;
                 } 
         } 
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c
index 3039539de51e..10d21df14531 100644
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
@@ -120,7 +120,6 @@ static struct resource qic_res = {
  * It writes num_bits of the data buffer in msg starting at start_bit.
  * Note: This function assumes that any unused bit in the data stream
  * is set to zero so that the ors will work correctly */
-#define BITS_PER_BYTE 8
 static void
 cat_pack(__u8 *msg, const __u16 start_bit, __u8 *data, const __u16 num_bits)
 {
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index ae6534ad8161..3df1371d4520 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -651,7 +651,7 @@ void __init mem_init(void)
  * Specifically, in the case of x86, we will always add
  * memory to the highmem for now.
  */
-#ifdef CONFIG_HOTPLUG_MEMORY
+#ifdef CONFIG_MEMORY_HOTPLUG
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 int add_memory(u64 start, u64 size)
 {
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index 1a2076ce6f6a..ec0fd3cfa774 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -332,10 +332,11 @@ static int __init ppro_init(char ** cpu_type)
 {
         __u8 cpu_model = boot_cpu_data.x86_model;
 
-        if (cpu_model > 0xd)
+        if (cpu_model == 14)
+                *cpu_type = "i386/core";
+        else if (cpu_model > 0xd)
                 return 0;
-
-        if (cpu_model == 9) {
+        else if (cpu_model == 9) {
                 *cpu_type = "i386/p6_mobile";
         } else if (cpu_model > 5) {
                 *cpu_type = "i386/piii";
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 3ca59cad05f3..06dab00aaadc 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -588,7 +588,9 @@ static __init int via_router_probe(struct irq_router *r,
         case PCI_DEVICE_ID_VIA_82C596:
         case PCI_DEVICE_ID_VIA_82C686:
         case PCI_DEVICE_ID_VIA_8231:
+        case PCI_DEVICE_ID_VIA_8233A:
         case PCI_DEVICE_ID_VIA_8235:
+        case PCI_DEVICE_ID_VIA_8237:
                 /* FIXME: add new ones for 8233/5 */
                 r->name = "VIA";
                 r->get = pirq_via_get;
diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c
index 50a0bef8c85f..79b2370c7fac 100644
--- a/arch/i386/power/cpu.c
+++ b/arch/i386/power/cpu.c
@@ -92,7 +92,7 @@ void __restore_processor_state(struct saved_context *ctxt)
         write_cr4(ctxt->cr4);
         write_cr3(ctxt->cr3);
         write_cr2(ctxt->cr2);
-        write_cr2(ctxt->cr0);
+        write_cr0(ctxt->cr0);
 
         /*
          * now restore the descriptor tables to their proper values