Merge branch 'merge'

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c

12 files changed, 120 insertions, 39 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index c49ebcc6c41e..33c5216fd3e1 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -242,12 +242,19 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
 
 static void __cpuinit acpi_register_lapic(int id, u8 enabled)
 {
+        unsigned int ver = 0;
+
         if (!enabled) {
                 ++disabled_cpus;
                 return;
         }
 
-        generic_processor_info(id, 0);
+#ifdef CONFIG_X86_32
+        if (boot_cpu_physical_apicid != -1U)
+                ver = apic_version[boot_cpu_physical_apicid];
+#endif
+
+        generic_processor_info(id, ver);
 }
 
 static int __init
@@ -767,8 +774,13 @@ static void __init acpi_register_lapic_address(unsigned long address)
         mp_lapic_addr = address;
 
         set_fixmap_nocache(FIX_APIC_BASE, address);
-        if (boot_cpu_physical_apicid == -1U)
+        if (boot_cpu_physical_apicid == -1U) {
                 boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());
+#ifdef CONFIG_X86_32
+                apic_version[boot_cpu_physical_apicid] =
+                         GET_APIC_VERSION(apic_read(APIC_LVR));
+#endif
+        }
 }
 
 static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5910020c3f24..0633cfd0dc29 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -534,7 +534,7 @@ int setup_profiling_timer(unsigned int multiplier)
  */
 void clear_local_APIC(void)
 {
-        int maxlvt = lapic_get_maxlvt();
+        int maxlvt;
         u32 v;
 
         /* APIC hasn't been mapped yet */
diff --git a/arch/x86/kernel/cpu/cpufreq/longrun.c b/arch/x86/kernel/cpu/cpufreq/longrun.c
index af4a867a097c..777a7ff075de 100644
--- a/arch/x86/kernel/cpu/cpufreq/longrun.c
+++ b/arch/x86/kernel/cpu/cpufreq/longrun.c
@@ -245,7 +245,7 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
         if ((ecx > 95) || (ecx == 0) || (eax < ebx))
                 return -EIO;
 
-        edx = (eax - ebx) / (100 - ecx);
+        edx = ((eax - ebx) * 100) / (100 - ecx);
         *low_freq = edx * 1000; /* back to kHz */
 
         dprintk("low frequency is %u kHz\n", *low_freq);
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index 46d4034d9f37..206791eb46e3 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -1127,12 +1127,23 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
                  * an UP version, and is deprecated by AMD.
                  */
                 if (num_online_cpus() != 1) {
-                        printk(KERN_ERR PFX "MP systems not supported by PSB BIOS structure\n");
+#ifndef CONFIG_ACPI_PROCESSOR
+                        printk(KERN_ERR PFX "ACPI Processor support is required "
+                               "for SMP systems but is absent. Please load the "
+                               "ACPI Processor module before starting this "
+                               "driver.\n");
+#else
+                        printk(KERN_ERR PFX "Your BIOS does not provide ACPI "
+                               "_PSS objects in a way that Linux understands. "
+                               "Please report this to the Linux ACPI maintainers"
+                               " and complain to your BIOS vendor.\n");
+#endif
                         kfree(data);
                         return -ENODEV;
                 }
                 if (pol->cpu != 0) {
-                        printk(KERN_ERR PFX "No _PSS objects for CPU other than CPU0\n");
+                        printk(KERN_ERR PFX "No ACPI _PSS objects for CPU other than "
+                               "CPU0. Complain to your BIOS vendor.\n");
                         kfree(data);
                         return -ENODEV;
                 }
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index e03cc952f233..eb9ddd8efb82 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -56,6 +56,11 @@ void __cpuinit mxcsr_feature_mask_init(void)
 
 void __init init_thread_xstate(void)
 {
+        if (!HAVE_HWFP) {
+                xstate_size = sizeof(struct i387_soft_struct);
+                return;
+        }
+
         if (cpu_has_fxsr)
                 xstate_size = sizeof(struct i387_fxsave_struct);
 #ifdef CONFIG_X86_32
@@ -94,7 +99,7 @@ void __cpuinit fpu_init(void)
 int init_fpu(struct task_struct *tsk)
 {
         if (tsk_used_math(tsk)) {
-                if (tsk == current)
+                if (HAVE_HWFP && tsk == current)
                         unlazy_fpu(tsk);
                 return 0;
         }
@@ -109,6 +114,15 @@ int init_fpu(struct task_struct *tsk)
                         return -ENOMEM;
         }
 
+#ifdef CONFIG_X86_32
+        if (!HAVE_HWFP) {
+                memset(tsk->thread.xstate, 0, xstate_size);
+                finit();
+                set_stopped_child_used_math(tsk);
+                return 0;
+        }
+#endif
+
         if (cpu_has_fxsr) {
                 struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave;
 
@@ -330,13 +344,13 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
         struct user_i387_ia32_struct env;
         int ret;
 
-        if (!HAVE_HWFP)
-                return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);
-
         ret = init_fpu(target);
         if (ret)
                 return ret;
 
+        if (!HAVE_HWFP)
+                return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);
+
         if (!cpu_has_fxsr) {
                 return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
                                            &target->thread.xstate->fsave, 0,
@@ -360,15 +374,15 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset,
         struct user_i387_ia32_struct env;
         int ret;
 
-        if (!HAVE_HWFP)
-                return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);
-
         ret = init_fpu(target);
         if (ret)
                 return ret;
 
         set_stopped_child_used_math(target);
 
+        if (!HAVE_HWFP)
+                return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);
+
         if (!cpu_has_fxsr) {
                 return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                           &target->thread.xstate->fsave, 0, -1);
@@ -474,18 +488,18 @@ static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf)
 int restore_i387_ia32(struct _fpstate_ia32 __user *buf)
 {
         int err;
+        struct task_struct *tsk = current;
 
-        if (HAVE_HWFP) {
-                struct task_struct *tsk = current;
-
+        if (HAVE_HWFP)
                 clear_fpu(tsk);
 
-                if (!used_math()) {
-                        err = init_fpu(tsk);
-                        if (err)
-                                return err;
-                }
+        if (!used_math()) {
+                err = init_fpu(tsk);
+                if (err)
+                        return err;
+        }
 
+        if (HAVE_HWFP) {
                 if (cpu_has_fxsr)
                         err = restore_i387_fxsave(buf);
                 else
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 4bc1be5d5472..08a30986d472 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -53,7 +53,7 @@ static cycle_t kvm_clock_read(void);
  * have elapsed since the hypervisor wrote the data. So we try to account for
  * that with system time
  */
-unsigned long kvm_get_wallclock(void)
+static unsigned long kvm_get_wallclock(void)
 {
         u32 wc_sec, wc_nsec;
         u64 delta;
@@ -86,7 +86,7 @@ unsigned long kvm_get_wallclock(void)
         return ts.tv_sec + 1;
 }
 
-int kvm_set_wallclock(unsigned long now)
+static int kvm_set_wallclock(unsigned long now)
 {
         return 0;
 }
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index c07455d1695f..aa8ec928caa8 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -26,6 +26,7 @@
 #include <linux/kdebug.h>
 #include <linux/scatterlist.h>
 #include <linux/iommu-helper.h>
+#include <linux/sysdev.h>
 #include <asm/atomic.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
@@ -548,6 +549,28 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size)
         return aper_base;
 }
 
+static int gart_resume(struct sys_device *dev)
+{
+        return 0;
+}
+
+static int gart_suspend(struct sys_device *dev, pm_message_t state)
+{
+        return -EINVAL;
+}
+
+static struct sysdev_class gart_sysdev_class = {
+        .name = "gart",
+        .suspend = gart_suspend,
+        .resume = gart_resume,
+
+};
+
+static struct sys_device device_gart = {
+        .id     = 0,
+        .cls    = &gart_sysdev_class,
+};
+
 /*
  * Private Northbridge GATT initialization in case we cannot use the
  * AGP driver for some reason.
@@ -558,7 +581,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
         unsigned aper_base, new_aper_base;
         struct pci_dev *dev;
         void *gatt;
-        int i;
+        int i, error;
 
         printk(KERN_INFO "PCI-DMA: Disabling AGP.\n");
         aper_size = aper_base = info->aper_size = 0;
@@ -606,6 +629,12 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
 
                 pci_write_config_dword(dev, 0x90, ctl);
         }
+
+        error = sysdev_class_register(&gart_sysdev_class);
+        if (!error)
+                error = sysdev_register(&device_gart);
+        if (error)
+                panic("Could not register gart_sysdev -- would corrupt data on next suspend");
         flush_gart();
 
         printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n",
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index f8476dfbb60d..6d5483356e74 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -649,8 +649,11 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
         /* If the task has used fpu the last 5 timeslices, just do a full
          * restore of the math state immediately to avoid the trap; the
          * chances of needing FPU soon are obviously high now
+         *
+         * tsk_used_math() checks prevent calling math_state_restore(),
+         * which can sleep in the case of !tsk_used_math()
          */
-        if (next_p->fpu_counter > 5)
+        if (tsk_used_math(next_p) && next_p->fpu_counter > 5)
                 math_state_restore();
 
         /*
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index e2319f39988b..ac54ff56df80 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -658,8 +658,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
         /* If the task has used fpu the last 5 timeslices, just do a full
          * restore of the math state immediately to avoid the trap; the
          * chances of needing FPU soon are obviously high now
+         *
+         * tsk_used_math() checks prevent calling math_state_restore(),
+         * which can sleep in the case of !tsk_used_math()
          */
-        if (next_p->fpu_counter>5)
+        if (tsk_used_math(next_p) && next_p->fpu_counter > 5)
                 math_state_restore();
         return prev_p;
 }
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 38988491c622..56078d61c793 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1190,6 +1190,7 @@ static void __init smp_cpu_index_default(void)
  */
 void __init native_smp_prepare_cpus(unsigned int max_cpus)
 {
+        preempt_disable();
         nmi_watchdog_default();
         smp_cpu_index_default();
         current_cpu_data = boot_cpu_data;
@@ -1206,7 +1207,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
         if (smp_sanity_check(max_cpus) < 0) {
                 printk(KERN_INFO "SMP disabled\n");
                 disable_smp();
-                return;
+                goto out;
         }
 
         preempt_disable();
@@ -1246,6 +1247,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
         printk(KERN_INFO "CPU%d: ", 0);
         print_cpu_info(&cpu_data(0));
         setup_boot_clock();
+out:
+        preempt_enable();
 }
 /*
  * Early setup to make printk work.
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index e4790728b224..068759db63dd 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -14,7 +14,7 @@
 
 #include "mach_timer.h"
 
-static int tsc_enabled;
+static int tsc_disabled;
 
 /*
  * On some systems the TSC frequency does not
@@ -28,8 +28,8 @@ EXPORT_SYMBOL_GPL(tsc_khz);
 static int __init tsc_setup(char *str)
 {
         printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, "
-                                "cannot disable TSC completely.\n");
-        mark_tsc_unstable("user disabled TSC");
+               "cannot disable TSC completely.\n");
+        tsc_disabled = 1;
         return 1;
 }
 #else
@@ -120,7 +120,7 @@ unsigned long long native_sched_clock(void)
          *   very important for it to be as fast as the platform
          *   can achive it. )
          */
-        if (unlikely(!tsc_enabled && !tsc_unstable))
+        if (unlikely(tsc_disabled))
                 /* No locking but a rare wrong value is not a big deal: */
                 return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);
 
@@ -322,7 +322,6 @@ void mark_tsc_unstable(char *reason)
 {
         if (!tsc_unstable) {
                 tsc_unstable = 1;
-                tsc_enabled = 0;
                 printk("Marking TSC unstable due to: %s.\n", reason);
                 /* Can be called before registration */
                 if (clocksource_tsc.mult)
@@ -336,7 +335,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
 static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d)
 {
         printk(KERN_NOTICE "%s detected: marking TSC unstable.\n",
-                       d->ident);
+               d->ident);
         tsc_unstable = 1;
         return 0;
 }
@@ -403,14 +402,22 @@ void __init tsc_init(void)
 {
         int cpu;
 
-        if (!cpu_has_tsc)
+        if (!cpu_has_tsc || tsc_disabled) {
+                /* Disable the TSC in case of !cpu_has_tsc */
+                tsc_disabled = 1;
                 return;
+        }
 
         cpu_khz = calculate_cpu_khz();
         tsc_khz = cpu_khz;
 
         if (!cpu_khz) {
                 mark_tsc_unstable("could not calculate TSC khz");
+                /*
+                 * We need to disable the TSC completely in this case
+                 * to prevent sched_clock() from using it.
+                 */
+                tsc_disabled = 1;
                 return;
         }
 
@@ -441,8 +448,6 @@ void __init tsc_init(void)
         if (check_tsc_unstable()) {
                 clocksource_tsc.rating = 0;
                 clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;
-        } else
-                tsc_enabled = 1;
-
+        }
         clocksource_register(&clocksource_tsc);
 }
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c
index fcc16e58609e..1784b8077a12 100644
--- a/arch/x86/kernel/tsc_64.c
+++ b/arch/x86/kernel/tsc_64.c
@@ -227,14 +227,14 @@ void __init tsc_calibrate(void)
         /* hpet or pmtimer available ? */
         if (!hpet && !pm1 && !pm2) {
                 printk(KERN_INFO "TSC calibrated against PIT\n");
-                return;
+                goto out;
         }
 
         /* Check, whether the sampling was disturbed by an SMI */
         if (tsc1 == ULONG_MAX || tsc2 == ULONG_MAX) {
                 printk(KERN_WARNING "TSC calibration disturbed by SMI, "
                        "using PIT calibration result\n");
-                return;
+                goto out;
         }
 
         tsc2 = (tsc2 - tsc1) * 1000000L;
@@ -255,6 +255,7 @@ void __init tsc_calibrate(void)
 
         tsc_khz = tsc2 / tsc1;
 
+out:
         for_each_possible_cpu(cpu)
                 set_cyc2ns_scale(tsc_khz, cpu);
 }