14 files changed, 124 insertions, 83 deletions
diff --git a/arch/arm/mach-iop13xx/io.c b/arch/arm/mach-iop13xx/io.c
index fbf9f88e46ea..e79a1b62600f 100644
--- a/arch/arm/mach-iop13xx/io.c
+++ b/arch/arm/mach-iop13xx/io.c
@@ -21,6 +21,25 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
+void * __iomem __iop13xx_io(unsigned long io_addr)
+{
+        void __iomem * io_virt;
+        switch (io_addr) {
+        case IOP13XX_PCIE_LOWER_IO_PA ... IOP13XX_PCIE_UPPER_IO_PA:
+                io_virt = (void *) IOP13XX_PCIE_IO_PHYS_TO_VIRT(io_addr);
+                break;
+        case IOP13XX_PCIX_LOWER_IO_PA ... IOP13XX_PCIX_UPPER_IO_PA:
+                io_virt = (void *) IOP13XX_PCIX_IO_PHYS_TO_VIRT(io_addr);
+                break;
+        default:
+                BUG();
+        }
+        return io_virt;
+}
+EXPORT_SYMBOL(__iop13xx_io);
 void * __iomem __iop13xx_ioremap(unsigned long cookie, size_t size,
        unsigned long flags)
 {
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 6ae605857ca9..9de1278d234f 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -76,7 +76,9 @@ unsigned long long sched_clock(void)
        /*
         * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for
         * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand
-         * years range which is nice, but with higher computation cost.
+         * years range and truncation to unsigned long long limits it to
+         * sched_clock's max range of ~584 years.  This is nice but with
+         * higher computation cost.
         */
        {
                union {
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 3775b8f38429..ee2beb400414 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -101,7 +101,7 @@ static struct irqaction pxa_timer_irq = {
        .handler        = pxa_timer_interrupt,
 };
-cycle_t pxa_get_cycles(void)
+static cycle_t pxa_get_cycles(void)
 {
        return OSCR;
 }
@@ -134,13 +134,13 @@ static void __init pxa_timer_init(void)
        OSMR0 = OSCR + LATCH;   /* set initial match */
        local_irq_restore(flags);
-        /* on PXA OSCR runs continiously and is not written to, so we can use it
+        /*
-         * as clock source directly.
+         * OSCR runs continuously on PXA and is not written to,
+         * so we can use it as clock source directly.
         */
        clocksource_pxa.mult =
                clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_pxa.shift);
        clocksource_register(&clocksource_pxa);
 }
 #ifdef CONFIG_NO_IDLE_HZ
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index 717322a0916b..fa860e716b4f 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -1053,11 +1053,11 @@ int s3c2410_dma_config(dmach_t channel,
        if (chan == NULL)
                return -EINVAL;
-        printk("Initial dcon is %08x\n", dcon);
+        pr_debug("%s: Initial dcon is %08x\n", __FUNCTION__, dcon);
        dcon |= chan->dcon & dma_sel.dcon_mask;
-        printk("New dcon is %08x\n", dcon);
+        pr_debug("%s: New dcon is %08x\n", __FUNCTION__, dcon);
        switch (xferunit) {
        case 1:
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index 408b05ae6b9b..ded0e96d069d 100644
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
@@ -19,6 +19,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
 #include "mm.h"
@@ -69,6 +70,11 @@ mc_copy_user_page(void *from, void *to)
 void v4_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr)
 {
+        struct page *page = virt_to_page(kfrom);
+        if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
+                __flush_dcache_page(page_mapping(page), page);
        spin_lock(&minicache_lock);
        set_pte_ext(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0);
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c
index 865777dec161..3adb79257f43 100644
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
@@ -53,6 +53,10 @@ static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned lo
 {
        unsigned int offset = CACHE_COLOUR(vaddr);
        unsigned long from, to;
+        struct page *page = virt_to_page(kfrom);
+        if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
+                __flush_dcache_page(page_mapping(page), page);
        /*
         * Discard data in the kernel mapping for the new page.
diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c
index aea5da723596..2e455f82a4d5 100644
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
@@ -19,6 +19,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
 #include "mm.h"
@@ -91,6 +92,11 @@ mc_copy_user_page(void *from, void *to)
 void xscale_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr)
 {
+        struct page *page = virt_to_page(kfrom);
+        if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
+                __flush_dcache_page(page_mapping(page), page);
        spin_lock(&minicache_lock);
        set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0);
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index e26cc1f59948..490d9d18a7d1 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -264,6 +264,18 @@ void VFP9_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
                vfp_raise_exceptions(exceptions, trigger, orig_fpscr, regs);
 }
+static void vfp_enable(void *unused)
+{
+        u32 access = get_copro_access();
+        /*
+         * Enable full access to VFP (cp10 and cp11)
+         */
+        set_copro_access(access | CPACC_FULL(10) | CPACC_FULL(11));
+}
+#include <linux/smp.h>
 /*
 * VFP support code initialisation.
 */
@@ -288,6 +300,7 @@ static int __init vfp_init(void)
         * we just need to read the VFPSID register.
         */
        vfpsid = fmrx(FPSID);
+        barrier();
        printk(KERN_INFO "VFP support v0.3: ");
        if (VFP_arch) {
@@ -301,6 +314,8 @@ static int __init vfp_init(void)
        } else if (vfpsid & FPSID_NODOUBLE) {
                printk("no double precision support\n");
        } else {
+                smp_call_function(vfp_enable, NULL, 1, 1);
                VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */
                printk("implementor %02x architecture %d part %02x variant %x rev %x\n",
                        (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT,
diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head.S
index f395a4bb38bb..3517a32aaf41 100644
--- a/arch/i386/boot/compressed/head.S
+++ b/arch/i386/boot/compressed/head.S
@@ -28,7 +28,7 @@
 #include <asm/page.h>
 #include <asm/boot.h>
-.section ".text.head"
+.section ".text.head","ax",@progbits
        .globl startup_32
 startup_32:
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index b735458c6e3a..10baa3501ed3 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -373,8 +373,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        cpumask_t online_policy_cpus;
        struct drv_cmd cmd;
        unsigned int msr;
-        unsigned int next_state = 0;
+        unsigned int next_state = 0; /* Index into freq_table */
-        unsigned int next_perf_state = 0;
+        unsigned int next_perf_state = 0; /* Index into perf table */
        unsigned int i;
        int result = 0;
@@ -420,6 +420,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                msr =
                    (u32) perf->states[next_perf_state].
                    control & INTEL_MSR_RANGE;
+                cmd.val = get_cur_val(online_policy_cpus);
                cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
                break;
        case SYSTEM_IO_CAPABLE:
@@ -439,8 +440,8 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        else
                cpu_set(policy->cpu, cmd.mask);
-        freqs.old = data->freq_table[perf->state].frequency;
+        freqs.old = perf->states[perf->state].core_frequency * 1000;
-        freqs.new = data->freq_table[next_perf_state].frequency;
+        freqs.new = data->freq_table[next_state].frequency;
        for_each_cpu_mask(i, cmd.mask) {
                freqs.cpu = i;
                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
@@ -677,6 +678,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                valid_states++;
        }
        data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
+        perf->state = 0;
        result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
        if (result)
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index 6d9c97a690fd..e940e00b96c9 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -52,6 +52,10 @@
 #define CPU_EZRA_T      4
 #define CPU_NEHEMIAH    5
+/* Flags */
+#define USE_ACPI_C3             (1 << 1)
+#define USE_NORTHBRIDGE         (1 << 2)
 static int cpu_model;
 static unsigned int numscales=16;
 static unsigned int fsb;
@@ -68,7 +72,7 @@ static unsigned int minmult, maxmult;
 static int can_scale_voltage;
 static struct acpi_processor *pr = NULL;
 static struct acpi_processor_cx *cx = NULL;
-static int port22_en;
+static u8 longhaul_flags;
 /* Module parameters */
 static int scale_voltage;
@@ -80,7 +84,6 @@ static int ignore_latency;
 /* Clock ratios multiplied by 10 */
 static int clock_ratio[32];
 static int eblcr_table[32];
-static unsigned int highest_speed, lowest_speed; /* kHz */
 static int longhaul_version;
 static struct cpufreq_frequency_table *longhaul_table;
@@ -178,7 +181,7 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
        safe_halt();
        /* Change frequency on next halt or sleep */
        wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        if (port22_en) {
+        if (!cx_address) {
                ACPI_FLUSH_CPU_CACHE();
                /* Invoke C1 */
                halt();
@@ -189,7 +192,6 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index)
                /* Dummy op - must do something useless after P_LVL3 read */
                t = inl(acpi_fadt.xpm_tmr_blk.address);
        }
        /* Disable bus ratio bit */
        local_irq_disable();
        longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
@@ -243,15 +245,14 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
        outb(0xFF,0xA1);        /* Overkill */
        outb(0xFE,0x21);        /* TMR0 only */
-        if (pr->flags.bm_control) {
+        if (longhaul_flags & USE_NORTHBRIDGE) {
+                /* Disable AGP and PCI arbiters */
+                outb(3, 0x22);
+        } else if ((pr != NULL) && pr->flags.bm_control) {
                /* Disable bus master arbitration */
                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,
                                  ACPI_MTX_DO_NOT_LOCK);
-        } else if (port22_en) {
-                /* Disable AGP and PCI arbiters */
-                outb(3, 0x22);
        }
        switch (longhaul_version) {
        /*
@@ -278,22 +279,25 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
         * to work in practice.
         */
        case TYPE_POWERSAVER:
-                /* Don't allow wakeup */
+                if (longhaul_flags & USE_ACPI_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
+                        /* Don't allow wakeup */
-                                  ACPI_MTX_DO_NOT_LOCK);
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
-                do_powersaver(cx->address, clock_ratio_index);
+                                          ACPI_MTX_DO_NOT_LOCK);
+                        do_powersaver(cx->address, clock_ratio_index);
+                } else {
+                        do_powersaver(0, clock_ratio_index);
+                }
                break;
        }
-        if (pr->flags.bm_control) {
+        if (longhaul_flags & USE_NORTHBRIDGE) {
+                /* Enable arbiters */
+                outb(0, 0x22);
+        } else if ((pr != NULL) && pr->flags.bm_control) {
                /* Enable bus master arbitration */
                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
                                  ACPI_MTX_DO_NOT_LOCK);
-        } else if (port22_en) {
-                /* Enable arbiters */
-                outb(0, 0x22);
        }
        outb(pic2_mask,0xA1);   /* restore mask */
        outb(pic1_mask,0x21);
@@ -314,12 +318,12 @@ static void longhaul_setstate(unsigned int clock_ratio_index)
 #define ROUNDING        0xf
-static int _guess(int guess)
+static int _guess(int guess, int mult)
 {
        int target;
-        target = ((maxmult/10)*guess);
+        target = ((mult/10)*guess);
-        if (maxmult%10 != 0)
+        if (mult%10 != 0)
                target += (guess/2);
        target += ROUNDING/2;
        target &= ~ROUNDING;
@@ -327,17 +331,17 @@ static int _guess(int guess)
 }
-static int guess_fsb(void)
+static int guess_fsb(int mult)
 {
        int speed = (cpu_khz/1000);
        int i;
-        int speeds[3] = { 66, 100, 133 };
+        int speeds[] = { 66, 100, 133, 200 };
        speed += ROUNDING/2;
        speed &= ~ROUNDING;
-        for (i=0; i<3; i++) {
+        for (i=0; i<4; i++) {
-                if (_guess(speeds[i]) == speed)
+                if (_guess(speeds[i], mult) == speed)
                        return speeds[i];
        }
        return 0;
@@ -354,9 +358,7 @@ static int __init longhaul_get_ranges(void)
                        130, 150, 160, 140,  -1, 155,  -1, 145 };
        unsigned int j, k = 0;
        union msr_longhaul longhaul;
-        unsigned long lo, hi;
+        int mult = 0;
-        unsigned int eblcr_fsb_table_v1[] = { 66, 133, 100, -1 };
-        unsigned int eblcr_fsb_table_v2[] = { 133, 100, -1, 66 };
        switch (longhaul_version) {
        case TYPE_LONGHAUL_V1:
@@ -364,30 +366,18 @@ static int __init longhaul_get_ranges(void)
                /* Ugh, Longhaul v1 didn't have the min/max MSRs.
                   Assume min=3.0x & max = whatever we booted at. */
                minmult = 30;
-                maxmult = longhaul_get_cpu_mult();
+                maxmult = mult = longhaul_get_cpu_mult();
-                rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi);
-                invalue = (lo & (1<<18|1<<19)) >>18;
-                if (cpu_model==CPU_SAMUEL || cpu_model==CPU_SAMUEL2)
-                        fsb = eblcr_fsb_table_v1[invalue];
-                else
-                        fsb = guess_fsb();
                break;
        case TYPE_POWERSAVER:
                /* Ezra-T */
                if (cpu_model==CPU_EZRA_T) {
+                        minmult = 30;
                        rdmsrl (MSR_VIA_LONGHAUL, longhaul.val);
                        invalue = longhaul.bits.MaxMHzBR;
                        if (longhaul.bits.MaxMHzBR4)
                                invalue += 16;
-                        maxmult=ezra_t_multipliers[invalue];
+                        maxmult = mult = ezra_t_multipliers[invalue];
-                        invalue = longhaul.bits.MinMHzBR;
-                        if (longhaul.bits.MinMHzBR4 == 1)
-                                minmult = 30;
-                        else
-                                minmult = ezra_t_multipliers[invalue];
-                        fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
                        break;
                }
@@ -407,21 +397,16 @@ static int __init longhaul_get_ranges(void)
                         *   But it works, so we don't grumble.
                         */
                        minmult=40;
-                        maxmult=longhaul_get_cpu_mult();
+                        maxmult = mult = longhaul_get_cpu_mult();
-                        /* Starting with the 1.2GHz parts, theres a 200MHz bus. */
-                        if ((cpu_khz/maxmult) > 13400)
-                                fsb = 200;
-                        else
-                                fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
                        break;
                }
        }
+        fsb = guess_fsb(mult);
        dprintk ("MinMult:%d.%dx MaxMult:%d.%dx\n",
                 minmult/10, minmult%10, maxmult/10, maxmult%10);
-        if (fsb == -1) {
+        if (fsb == 0) {
                printk (KERN_INFO PFX "Invalid (reserved) FSB!\n");
                return -EINVAL;
        }
@@ -691,27 +676,32 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
        /* Find ACPI data for processor */
        acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
                            &longhaul_walk_callback, NULL, (void *)&pr);
-        if (pr == NULL)
-                goto err_acpi;
-        if (longhaul_version == TYPE_POWERSAVER) {
+        /* Check ACPI support for C3 state */
-                /* Check ACPI support for C3 state */
+        if ((pr != NULL) && (longhaul_version == TYPE_POWERSAVER)) {
                cx = &pr->power.states[ACPI_STATE_C3];
                if (cx->address > 0 &&
                   (cx->latency <= 1000 || ignore_latency != 0) ) {
+                        longhaul_flags |= USE_ACPI_C3;
                        goto print_support_type;
                }
        }
+        /* Check if northbridge is friendly */
+        if (enable_arbiter_disable()) {
+                longhaul_flags |= USE_NORTHBRIDGE;
+                goto print_support_type;
+        }
+        /* No ACPI C3 or we can't use it */
        /* Check ACPI support for bus master arbiter disable */
-        if (!pr->flags.bm_control) {
+        if ((pr == NULL) || !(pr->flags.bm_control)) {
-                if (enable_arbiter_disable()) {
+                printk(KERN_ERR PFX
-                        port22_en = 1;
+                        "No ACPI support. Unsupported northbridge.\n");
-                } else {
+                return -ENODEV;
-                        goto err_acpi;
-                }
        }
 print_support_type:
-        if (!port22_en) {
+        if (!(longhaul_flags & USE_NORTHBRIDGE)) {
                printk (KERN_INFO PFX "Using ACPI support.\n");
        } else {
                printk (KERN_INFO PFX "Using northbridge support.\n");
@@ -736,10 +726,6 @@ print_support_type:
        cpufreq_frequency_table_get_attr(longhaul_table, policy->cpu);
        return 0;
-err_acpi:
-        printk(KERN_ERR PFX "No ACPI support. Unsupported northbridge. Aborting.\n");
-        return -ENODEV;
 }
 static int __devexit longhaul_cpu_exit(struct cpufreq_policy *policy)
@@ -774,8 +760,8 @@ static int __init longhaul_init(void)
 #ifdef CONFIG_SMP
        if (num_online_cpus() > 1) {
-                return -ENODEV;
                printk(KERN_ERR PFX "More than 1 CPU detected, longhaul disabled.\n");
+                return -ENODEV;
        }
 #endif
 #ifdef CONFIG_X86_IO_APIC
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 5113e9231634..f43b987f952b 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -533,9 +533,9 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
        /* notify BIOS that we exist */
        acpi_processor_notify_smm(THIS_MODULE);
-        printk("speedstep-centrino with X86_SPEEDSTEP_CENTRINO_ACPI"
+        printk("speedstep-centrino with X86_SPEEDSTEP_CENTRINO_ACPI "
-                        "config is deprecated.\n "
+               "config is deprecated.\n "
-                        "Use X86_ACPI_CPUFREQ (acpi-cpufreq instead.\n" );
+               "Use X86_ACPI_CPUFREQ (acpi-cpufreq) instead.\n" );
        return 0;
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index 3abcfa3e1ed7..45a6a1fd14ac 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -49,6 +49,7 @@ config X86_SPEEDSTEP_CENTRINO_ACPI
 config X86_ACPI_CPUFREQ
        tristate "ACPI Processor P-States driver"
+        select CPU_FREQ_TABLE
        depends on ACPI_PROCESSOR
        help
          This driver adds a CPUFreq driver which utilizes the ACPI
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 1d9eb6db732a..09d2e8a10a49 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -319,7 +319,7 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
        /*
         * This handles the process stack:
         */
-        tinfo = current_thread_info();
+        tinfo = task_thread_info(tsk);
        HANDLE_STACK (valid_stack_ptr(tinfo, stack));
 #undef HANDLE_STACK
        put_cpu();