11 files changed, 53 insertions, 25 deletions

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 53bb9a79e274..65656c033d70 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -11,7 +11,7 @@ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
 
 obj-y                           += cpu/
 obj-y                           += timers/
-obj-$(CONFIG_ACPI)              += acpi/
+obj-y                           += acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)   += reboot.o
 obj-$(CONFIG_MCA)               += mca.o
 obj-$(CONFIG_X86_MSR)           += msr.o
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index d51c7313cae8..7e9ac99354f4 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,4 +1,4 @@
-obj-y                           := boot.o
+obj-$(CONFIG_ACPI)              += boot.o
 obj-$(CONFIG_X86_IO_APIC)       += earlyquirk.o
 obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup.o
 
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 79577f0ace98..f1a21945963d 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -1111,9 +1111,6 @@ int __init acpi_boot_table_init(void)
                 disable_acpi();
                 return error;
         }
-#ifdef __i386__
-        check_acpi_pci();
-#endif
 
         acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
 
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index f1b9d2a46dab..2e3b643a4dc4 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -7,14 +7,22 @@
 #include <linux/pci.h>
 #include <asm/pci-direct.h>
 #include <asm/acpi.h>
+#include <asm/apic.h>
 
 static int __init check_bridge(int vendor, int device)
 {
+#ifdef CONFIG_ACPI
         /* According to Nvidia all timer overrides are bogus. Just ignore
            them all. */
         if (vendor == PCI_VENDOR_ID_NVIDIA) {
                 acpi_skip_timer_override = 1;
         }
+#endif
+        if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
+                timer_over_8254 = 0;
+                printk(KERN_INFO "ATI board detected. Disabling timer routing "
+                                "over 8254.\n");
+        }
         return 0;
 }
 
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 4ecd4b326ded..e6bd095ae108 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -278,10 +278,10 @@ void __devinit generic_identify(struct cpuinfo_x86 * c)
                         c->x86_capability[4] = excap;
                         c->x86 = (tfms >> 8) & 15;
                         c->x86_model = (tfms >> 4) & 15;
-                        if (c->x86 == 0xf) {
+                        if (c->x86 == 0xf)
                                 c->x86 += (tfms >> 20) & 0xff;
+                        if (c->x86 >= 0x6)
                                 c->x86_model += ((tfms >> 16) & 0xF) << 4;
-                        } 
                         c->x86_mask = tfms & 15;
                 } else {
                         /* Have CPUID level 0 only - unheard of */
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index e3e42fd62401..c9cad7ba0d2d 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -70,10 +70,13 @@ static void efi_call_phys_prelog(void)
 {
         unsigned long cr4;
         unsigned long temp;
+        struct Xgt_desc_struct *cpu_gdt_descr;
 
         spin_lock(&efi_rt_lock);
         local_irq_save(efi_rt_eflags);
 
+        cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0);
+
         /*
          * If I don't have PSE, I should just duplicate two entries in page
          * directory. If I have PSE, I just need to duplicate one entry in
@@ -103,18 +106,17 @@ static void efi_call_phys_prelog(void)
          */
         local_flush_tlb();
 
-        per_cpu(cpu_gdt_descr, 0).address =
-                                 __pa(per_cpu(cpu_gdt_descr, 0).address);
-        load_gdt((struct Xgt_desc_struct *)__pa(&per_cpu(cpu_gdt_descr, 0)));
+        cpu_gdt_descr->address = __pa(cpu_gdt_descr->address);
+        load_gdt(cpu_gdt_descr);
 }
 
 static void efi_call_phys_epilog(void)
 {
         unsigned long cr4;
+        struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0);
 
-        per_cpu(cpu_gdt_descr, 0).address =
-                        (unsigned long)__va(per_cpu(cpu_gdt_descr, 0).address);
-        load_gdt((struct Xgt_desc_struct *)__va(&per_cpu(cpu_gdt_descr, 0)));
+        cpu_gdt_descr->address = __va(cpu_gdt_descr->address);
+        load_gdt(cpu_gdt_descr);
 
         cr4 = read_cr4();
 
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 235822b3f41b..39d9a5fa907e 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -51,6 +51,8 @@ static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
 
 static DEFINE_SPINLOCK(ioapic_lock);
 
+int timer_over_8254 __initdata = 1;
+
 /*
  *      Is the SiS APIC rmw bug present ?
  *      -1 = don't know, 0 = no, 1 = yes
@@ -2267,7 +2269,8 @@ static inline void check_timer(void)
         apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);
         init_8259A(1);
         timer_ack = 1;
-        enable_8259A_irq(0);
+        if (timer_over_8254 > 0)
+                enable_8259A_irq(0);
 
         pin1  = find_isa_irq_pin(0, mp_INT);
         apic1 = find_isa_irq_apic(0, mp_INT);
@@ -2392,6 +2395,20 @@ void __init setup_IO_APIC(void)
                 print_IO_APIC();
 }
 
+static int __init setup_disable_8254_timer(char *s)
+{
+        timer_over_8254 = -1;
+        return 1;
+}
+static int __init setup_enable_8254_timer(char *s)
+{
+        timer_over_8254 = 2;
+        return 1;
+}
+
+__setup("disable_8254_timer", setup_disable_8254_timer);
+__setup("enable_8254_timer", setup_enable_8254_timer);
+
 /*
  *      Called after all the initialization is done. If we didnt find any
  *      APIC bugs then we can allow the modify fast path
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index a912fed48482..f73d7374a2ba 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -116,13 +116,13 @@ static void load_segments(void)
         __asm__ __volatile__ (
                 "\tljmp $"STR(__KERNEL_CS)",$1f\n"
                 "\t1:\n"
-                "\tmovl $"STR(__KERNEL_DS)",%eax\n"
-                "\tmovl %eax,%ds\n"
-                "\tmovl %eax,%es\n"
-                "\tmovl %eax,%fs\n"
-                "\tmovl %eax,%gs\n"
-                "\tmovl %eax,%ss\n"
-                );
+                "\tmovl $"STR(__KERNEL_DS)",%%eax\n"
+                "\tmovl %%eax,%%ds\n"
+                "\tmovl %%eax,%%es\n"
+                "\tmovl %%eax,%%fs\n"
+                "\tmovl %%eax,%%gs\n"
+                "\tmovl %%eax,%%ss\n"
+                ::: "eax", "memory");
 #undef STR
 #undef __STR
 }
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 63f39a7e2c96..be87c5e2ee95 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -357,7 +357,7 @@ static void clear_msr_range(unsigned int base, unsigned int n)
                 wrmsr(base+i, 0, 0);
 }
 
-static inline void write_watchdog_counter(const char *descr)
+static void write_watchdog_counter(const char *descr)
 {
         u64 count = (u64)cpu_khz * 1000;
 
@@ -544,7 +544,7 @@ void nmi_watchdog_tick (struct pt_regs * regs)
                          * die_nmi will return ONLY if NOTIFY_STOP happens..
                          */
                         die_nmi(regs, "NMI Watchdog detected LOCKUP");
-
+        } else {
                 last_irq_sums[cpu] = sum;
                 alert_counter[cpu] = 0;
         }
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 51e513b4f72d..ab62a9f4701e 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1599,6 +1599,10 @@ 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.
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index a14d594bfbeb..9d3074759856 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -412,9 +412,9 @@ static int timer_resume(struct sys_device *dev)
         write_seqlock_irqsave(&xtime_lock, flags);
         xtime.tv_sec = sec;
         xtime.tv_nsec = 0;
-        write_sequnlock_irqrestore(&xtime_lock, flags);
-        jiffies += sleep_length;
+        jiffies_64 += sleep_length;
         wall_jiffies += sleep_length;
+        write_sequnlock_irqrestore(&xtime_lock, flags);
         if (last_timer->resume)
                 last_timer->resume();
         cur_timer = last_timer;