Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3473/1: Use numbers 0-15 for the VFP double registers
  [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6
  [ARM] 3471/1: FTOSI functions should return 0 for NaN
  [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features
  [ARM] 3469/1: S3C24XX: clkout missing hclk selector
  [ARM] 3468/1: S3C2410: SMDK common include fix
  [ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name
  [ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release()
  [ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation
  [ARM] Allow decompressor to be built with -ffunction-sections
  [ARM] Fix SA110/SA1100 cache flushing
  [ARM] ebsa110: Fix incorrect serial port address
  [ARM] Fix ebsa110 debug macros
  [ARM] Move FLUSH_BASE macros to asm/arch/memory.h
  [ARM] Remove unnecessary extra parens in include/asm-arm/memory.h
  [ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1

35 files changed, 140 insertions, 161 deletions

diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in
index eed616113e47..153a07e7222b 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.in
@@ -18,6 +18,7 @@ SECTIONS
     _start = .;
     *(.start)
     *(.text)
+    *(.text.*)
     *(.fixup)
     *(.gnu.warning)
     *(.rodata)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 437528403959..8cff73e668b3 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -322,6 +322,12 @@ static void __init setup_processor(void)
         sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);
         sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
         elf_hwcap = list->elf_hwcap;
+#ifndef CONFIG_ARM_THUMB
+        elf_hwcap &= ~HWCAP_THUMB;
+#endif
+#ifndef CONFIG_VFP
+        elf_hwcap &= ~HWCAP_VFP;
+#endif
 
         cpu_proc_init();
 }
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 876c38da14f7..847329cafc5c 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -25,10 +25,6 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 
-extern void omap_nop_release(struct device *dev);
-
-/*-------------------------------------------------------------------------*/
-
 #if     defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE)
 
 static u64 irda_dmamask = 0xffffffff;
@@ -37,7 +33,6 @@ static struct platform_device omap1610ir_device = {
         .name = "omap1610-ir",
         .id = -1,
         .dev = {
-                .release        = omap_nop_release,
                 .dma_mask       = &irda_dmamask,
         },
 };
@@ -84,9 +79,6 @@ static struct resource rtc_resources[] = {
 static struct platform_device omap_rtc_device = {
         .name           = "omap_rtc",
         .id             = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(rtc_resources),
         .resource       = rtc_resources,
 };
@@ -124,9 +116,6 @@ static struct resource sti_resources[] = {
 static struct platform_device sti_device = {
         .name           = "sti",
         .id             = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(sti_resources),
         .resource       = sti_resources,
 };
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index def9e5370edf..fb7f91da1aad 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -25,10 +25,6 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 
-extern void omap_nop_release(struct device *dev);
-
-/*-------------------------------------------------------------------------*/
-
 #if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define OMAP2_I2C_BASE2         0x48072000
@@ -49,9 +45,6 @@ static struct resource i2c_resources2[] = {
 static struct platform_device omap_i2c_device2 = {
         .name           = "i2c_omap",
         .id             = 2,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(i2c_resources2),
         .resource       = i2c_resources2,
 };
@@ -100,9 +93,6 @@ static struct resource sti_resources[] = {
 static struct platform_device sti_device = {
         .name           = "sti",
         .id             = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(sti_resources),
         .resource       = sti_resources,
 };
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index b7f85e6d6b76..6de713ad319a 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -367,6 +367,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
                 source = S3C2410_MISCCR_CLK0_UPLL;
         else if (parent == &clk_f)
                 source = S3C2410_MISCCR_CLK0_FCLK;
+        else if (parent == &clk_h)
+                source = S3C2410_MISCCR_CLK0_HCLK;
         else if (parent == &clk_p)
                 source = S3C2410_MISCCR_CLK0_PCLK;
         else if (clk == &s3c24xx_clkout0 && parent == &s3c24xx_dclk0)
@@ -376,6 +378,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
         else
                 return -EINVAL;
 
+        clk->parent = parent;
+
         if (clk == &s3c24xx_dclk0)
                 mask = S3C2410_MISCCR_CLK0_MASK;
         else {
diff --git a/arch/arm/mach-s3c2410/common-smdk.c b/arch/arm/mach-s3c2410/common-smdk.c
index 36b8291b5e03..f372fbda124e 100644
--- a/arch/arm/mach-s3c2410/common-smdk.c
+++ b/arch/arm/mach-s3c2410/common-smdk.c
@@ -37,6 +37,7 @@
 
 #include <asm/arch/nand.h>
 
+#include "common-smdk.h"
 #include "devs.h"
 #include "pm.h"
 
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S
index 5c4055b62d97..54e3c5bb5186 100644
--- a/arch/arm/mm/cache-v4wb.S
+++ b/arch/arm/mm/cache-v4wb.S
@@ -10,7 +10,7 @@
 #include <linux/config.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/hardware.h>
+#include <asm/memory.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
@@ -46,6 +46,11 @@
  */
 #define CACHE_DLIMIT    (CACHE_DSIZE * 4)
 
+        .data
+flush_base:
+        .long   FLUSH_BASE
+        .text
+
 /*
  *      flush_user_cache_all()
  *
@@ -63,11 +68,21 @@ ENTRY(v4wb_flush_kern_cache_all)
         mov     ip, #0
         mcr     p15, 0, ip, c7, c5, 0           @ invalidate I cache
 __flush_whole_cache:
-        mov     r0, #FLUSH_BASE
-        add     r1, r0, #CACHE_DSIZE
-1:      ldr     r2, [r0], #32
-        cmp     r0, r1
+        ldr     r3, =flush_base
+        ldr     r1, [r3, #0]
+        eor     r1, r1, #CACHE_DSIZE
+        str     r1, [r3, #0]
+        add     r2, r1, #CACHE_DSIZE
+1:      ldr     r3, [r1], #32
+        cmp     r1, r2
+        blo     1b
+#ifdef FLUSH_BASE_MINICACHE
+        add     r2, r2, #FLUSH_BASE_MINICACHE - FLUSH_BASE
+        sub     r1, r2, #512                    @ only 512 bytes
+1:      ldr     r3, [r1], #32
+        cmp     r1, r2
         blo     1b
+#endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain write buffer
         mov     pc, lr
 
@@ -82,6 +97,7 @@ __flush_whole_cache:
  *      - flags - vma_area_struct flags describing address space
  */
 ENTRY(v4wb_flush_user_cache_range)
+        mov     ip, #0
         sub     r3, r1, r0                      @ calculate total size
         tst     r2, #VM_EXEC                    @ executable region?
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 88279124317a..9ea1f87a7079 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -20,6 +20,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/setup.h>
+#include <asm/sizes.h>
 #include <asm/tlb.h>
 
 #include <asm/mach/arch.h>
@@ -455,14 +456,14 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
 #ifdef FLUSH_BASE
         map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
         map.virtual = FLUSH_BASE;
-        map.length = PGDIR_SIZE;
+        map.length = SZ_1M;
         map.type = MT_CACHECLEAN;
         create_mapping(&map);
 #endif
 #ifdef FLUSH_BASE_MINICACHE
-        map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + PGDIR_SIZE);
+        map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
         map.virtual = FLUSH_BASE_MINICACHE;
-        map.length = PGDIR_SIZE;
+        map.length = SZ_1M;
         map.type = MT_MINICLEAN;
         create_mapping(&map);
 #endif
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index c916a6cae404..a2dd5ae1077d 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -26,22 +26,7 @@
  * the cache line size of the I and D cache
  */
 #define DCACHELINESIZE  32
-#define FLUSH_OFFSET    32768
 
-        .macro flush_110_dcache rd, ra, re
-        ldr     \rd, =flush_base
-        ldr     \ra, [\rd]
-        eor     \ra, \ra, #FLUSH_OFFSET
-        str     \ra, [\rd]
-        add     \re, \ra, #16384                @ only necessary for 16k
-1001:   ldr     \rd, [\ra], #DCACHELINESIZE
-        teq     \re, \ra
-        bne     1001b
-        .endm
-
-        .data
-flush_base:
-        .long   FLUSH_BASE
         .text
 
 /*
@@ -145,13 +130,11 @@ ENTRY(cpu_sa110_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_sa110_switch_mm)
-        flush_110_dcache        r3, ip, r1
-        mov     r1, #0
-        mcr     p15, 0, r1, c7, c5, 0           @ invalidate I cache
-        mcr     p15, 0, r1, c7, c10, 4          @ drain WB
+        str     lr, [sp, #-4]!
+        bl      v4wb_flush_kern_cache_all       @ clears IP
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
-        mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, lr
+        mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
+        ldr     pc, [sp], #4
 
 /*
  * cpu_sa110_set_pte(ptep, pte)
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index 41f21f2dd8ff..777ad99c1439 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -30,30 +30,6 @@
  * the cache line size of the I and D cache
  */
 #define DCACHELINESIZE  32
-#define FLUSH_OFFSET    32768
-
-        .macro flush_1100_dcache rd, ra, re
-        ldr     \rd, =flush_base
-        ldr     \ra, [\rd]
-        eor     \ra, \ra, #FLUSH_OFFSET
-        str     \ra, [\rd]
-        add     \re, \ra, #8192                 @ only necessary for 8k
-1001:   ldr     \rd, [\ra], #DCACHELINESIZE
-        teq     \re, \ra
-        bne     1001b
-#ifdef FLUSH_BASE_MINICACHE
-        add     \ra, \ra, #FLUSH_BASE_MINICACHE - FLUSH_BASE
-        add     \re, \ra, #512                  @ only 512 bytes
-1002:   ldr     \rd, [\ra], #DCACHELINESIZE
-        teq     \re, \ra
-        bne     1002b
-#endif
-        .endm
-
-        .data
-flush_base:
-        .long   FLUSH_BASE
-        .text
 
         __INIT
 
@@ -79,9 +55,8 @@ ENTRY(cpu_sa1100_proc_fin)
         stmfd   sp!, {lr}
         mov     ip, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
         msr     cpsr_c, ip
-        flush_1100_dcache r0, r1, r2            @ clean caches
-        mov     r0, #0
-        mcr     p15, 0, r0, c15, c2, 2          @ Disable clock switching
+        bl      v4wb_flush_kern_cache_all
+        mcr     p15, 0, ip, c15, c2, 2          @ Disable clock switching
         mrc     p15, 0, r0, c1, c0, 0           @ ctrl register
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
@@ -167,14 +142,12 @@ ENTRY(cpu_sa1100_dcache_clean_area)
  */
         .align  5
 ENTRY(cpu_sa1100_switch_mm)
-        flush_1100_dcache r3, ip, r1
-        mov     ip, #0
-        mcr     p15, 0, ip, c7, c5, 0           @ invalidate I cache
+        str     lr, [sp, #-4]!
+        bl      v4wb_flush_kern_cache_all       @ clears IP
         mcr     p15, 0, ip, c9, c0, 0           @ invalidate RB
-        mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, lr
+        ldr     pc, [sp], #4
 
 /*
  * cpu_sa1100_set_pte(ptep, pte)
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 06485c193ee3..32ec04c58bcd 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -58,7 +58,7 @@ struct clk * clk_get(struct device *dev, const char *id)
                 if (p->id == idno &&
                     strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                         clk = p;
-                        break;
+                        goto found;
                 }
         }
 
@@ -69,6 +69,7 @@ struct clk * clk_get(struct device *dev, const char *id)
                 }
         }
 
+found:
         mutex_unlock(&clocks_mutex);
 
         return clk;
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 079b67deac0f..5d5d6eb222dd 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -26,14 +26,6 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/menelaus.h>
 
-
-void omap_nop_release(struct device *dev)
-{
-        /* Nothing */
-}
-
-/*-------------------------------------------------------------------------*/
-
 #if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define OMAP1_I2C_BASE          0xfffb3800
@@ -59,9 +51,6 @@ static struct resource i2c_resources1[] = {
 static struct platform_device omap_i2c_device1 = {
         .name           = "i2c_omap",
         .id             = 1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(i2c_resources1),
         .resource       = i2c_resources1,
 };
@@ -187,7 +176,6 @@ static struct platform_device mmc_omap_device1 = {
         .name           = "mmci-omap",
         .id             = 1,
         .dev = {
-                .release        = omap_nop_release,
                 .dma_mask       = &mmc1_dmamask,
                 .platform_data  = &mmc1_conf,
         },
@@ -217,7 +205,6 @@ static struct platform_device mmc_omap_device2 = {
         .name           = "mmci-omap",
         .id             = 2,
         .dev = {
-                .release        = omap_nop_release,
                 .dma_mask       = &mmc2_dmamask,
                 .platform_data  = &mmc2_conf,
         },
@@ -321,9 +308,6 @@ static struct resource uwire_resources[] = {
 static struct platform_device omap_uwire_device = {
         .name      = "omap_uwire",
         .id          = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(uwire_resources),
         .resource       = uwire_resources,
 };
@@ -365,9 +349,6 @@ static struct resource wdt_resources[] = {
 static struct platform_device omap_wdt_device = {
         .name      = "omap_wdt",
         .id          = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(wdt_resources),
         .resource       = wdt_resources,
 };
@@ -401,9 +382,6 @@ static struct resource rng_resources[] = {
 static struct platform_device omap_rng_device = {
         .name      = "omap_rng",
         .id          = -1,
-        .dev = {
-                .release        = omap_nop_release,
-        },
         .num_resources  = ARRAY_SIZE(rng_resources),
         .resource       = rng_resources,
 };
diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c
index 9b367a65cb4d..febd115dba28 100644
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
@@ -588,6 +588,7 @@ static u32 vfp_double_ftosi(int sd, int unused, int dm, u32 fpscr)
         struct vfp_double vdm;
         u32 d, exceptions = 0;
         int rmode = fpscr & FPSCR_RMODE_MASK;
+        int tm;
 
         vfp_double_unpack(&vdm, vfp_get_double(dm));
         vfp_double_dump("VDM", &vdm);
@@ -595,10 +596,14 @@ static u32 vfp_double_ftosi(int sd, int unused, int dm, u32 fpscr)
         /*
          * Do we have denormalised number?
          */
-        if (vfp_double_type(&vdm) & VFP_DENORMAL)
+        tm = vfp_double_type(&vdm);
+        if (tm & VFP_DENORMAL)
                 exceptions |= FPSCR_IDC;
 
-        if (vdm.exponent >= 1023 + 32) {
+        if (tm & VFP_NAN) {
+                d = 0;
+                exceptions |= FPSCR_IOC;
+        } else if (vdm.exponent >= 1023 + 32) {
                 d = 0x7fffffff;
                 if (vdm.sign)
                         d = ~d;
@@ -1122,9 +1127,9 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
 {
         u32 op = inst & FOP_MASK;
         u32 exceptions = 0;
-        unsigned int dd = vfp_get_sd(inst);
-        unsigned int dn = vfp_get_sn(inst);
-        unsigned int dm = vfp_get_sm(inst);
+        unsigned int dd = vfp_get_dd(inst);
+        unsigned int dn = vfp_get_dn(inst);
+        unsigned int dm = vfp_get_dm(inst);
         unsigned int vecitr, veclen, vecstride;
         u32 (*fop)(int, int, s32, u32);
 
@@ -1141,7 +1146,7 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
         pr_debug("VFP: vecstride=%u veclen=%u\n", vecstride,
                  (veclen >> FPSCR_LENGTH_BIT) + 1);
 
-        fop = (op == FOP_EXT) ? fop_extfns[dn] : fop_fns[FOP_TO_IDX(op)];
+        fop = (op == FOP_EXT) ? fop_extfns[FEXT_TO_IDX(inst)] : fop_fns[FOP_TO_IDX(op)];
         if (!fop)
                 goto invalid;
 
@@ -1149,17 +1154,13 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
                 u32 except;
 
                 if (op == FOP_EXT)
-                        pr_debug("VFP: itr%d (d%u.%u) = op[%u] (d%u.%u)\n",
+                        pr_debug("VFP: itr%d (d%u) = op[%u] (d%u)\n",
                                  vecitr >> FPSCR_LENGTH_BIT,
-                                 dd >> 1, dd & 1, dn,
-                                 dm >> 1, dm & 1);
+                                 dd, dn, dm);
                 else
-                        pr_debug("VFP: itr%d (d%u.%u) = (d%u.%u) op[%u] (d%u.%u)\n",
+                        pr_debug("VFP: itr%d (d%u) = (d%u) op[%u] (d%u)\n",
                                  vecitr >> FPSCR_LENGTH_BIT,
-                                 dd >> 1, dd & 1,
-                                 dn >> 1, dn & 1,
-                                 FOP_TO_IDX(op),
-                                 dm >> 1, dm & 1);
+                                 dd, dn, FOP_TO_IDX(op), dm);
 
                 except = fop(dd, dn, dm, fpscr);
                 pr_debug("VFP: itr%d: exceptions=%08x\n",
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index b7ed57e00cd4..a3f65b47aea9 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -189,11 +189,10 @@ vfp_put_float:
 
         .globl  vfp_get_double
 vfp_get_double:
-        mov     r0, r0, lsr #1
         add     pc, pc, r0, lsl #3
         mov     r0, r0
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-        mrrc    p10, 1, r0, r1, c\dr    @ fmrrd r0, r1, d\dr
+        mrrc    p11, 1, r0, r1, c\dr    @ fmrrd r0, r1, d\dr
         mov     pc, lr
         .endr
 
@@ -204,10 +203,9 @@ vfp_get_double:
 
         .globl  vfp_put_double
 vfp_put_double:
-        mov     r0, r0, lsr #1
         add     pc, pc, r0, lsl #3
         mov     r0, r0
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-        mcrr    p10, 1, r1, r2, c\dr    @ fmrrd r1, r2, d\dr
+        mcrr    p11, 1, r1, r2, c\dr    @ fmdrr r1, r2, d\dr
         mov     pc, lr
         .endr
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 14dd696ddeb1..4ac27f193934 100644
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -632,6 +632,7 @@ static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
         struct vfp_single vsm;
         u32 d, exceptions = 0;
         int rmode = fpscr & FPSCR_RMODE_MASK;
+        int tm;
 
         vfp_single_unpack(&vsm, m);
         vfp_single_dump("VSM", &vsm);
@@ -639,10 +640,14 @@ static u32 vfp_single_ftosi(int sd, int unused, s32 m, u32 fpscr)
         /*
          * Do we have a denormalised number?
          */
+        tm = vfp_single_type(&vsm);
         if (vfp_single_type(&vsm) & VFP_DENORMAL)
                 exceptions |= FPSCR_IDC;
 
-        if (vsm.exponent >= 127 + 32) {
+        if (tm & VFP_NAN) {
+                d = 0;
+                exceptions |= FPSCR_IOC;
+        } else if (vsm.exponent >= 127 + 32) {
                 /*
                  * m >= 2^31-2^7: invalid
                  */
@@ -1188,7 +1193,7 @@ u32 vfp_single_cpdo(u32 inst, u32 fpscr)
         pr_debug("VFP: vecstride=%u veclen=%u\n", vecstride,
                  (veclen >> FPSCR_LENGTH_BIT) + 1);
 
-        fop = (op == FOP_EXT) ? fop_extfns[sn] : fop_fns[FOP_TO_IDX(op)];
+        fop = (op == FOP_EXT) ? fop_extfns[FEXT_TO_IDX(inst)] : fop_fns[FOP_TO_IDX(op)];
         if (!fop)
                 goto invalid;
 
diff --git a/include/asm-arm/arch-cl7500/hardware.h b/include/asm-arm/arch-cl7500/hardware.h
index 2339b764f69f..1adfd18e6154 100644
--- a/include/asm-arm/arch-cl7500/hardware.h
+++ b/include/asm-arm/arch-cl7500/hardware.h
@@ -53,16 +53,12 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
 
-#define FLUSH_BASE              0xdf000000
-
 #define VIDC_BASE               (void __iomem *)0xe0400000
 #define IOMD_BASE               IOMEM(0xe0200000)
 #define IOC_BASE                IOMEM(0xe0200000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
 #define PCIO_BASE               IOMEM(0xe0010000)
 
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
-
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 
 /* in/out bias for the ISA slot region */
diff --git a/include/asm-arm/arch-cl7500/memory.h b/include/asm-arm/arch-cl7500/memory.h
index 34f40a6cec30..3178140e24ca 100644
--- a/include/asm-arm/arch-cl7500/memory.h
+++ b/include/asm-arm/arch-cl7500/memory.h
@@ -26,4 +26,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/include/asm-arm/arch-ebsa110/debug-macro.S
index f61cadabe0ec..9213bfe4831d 100644
--- a/include/asm-arm/arch-ebsa110/debug-macro.S
+++ b/include/asm-arm/arch-ebsa110/debug-macro.S
@@ -18,4 +18,4 @@
 
 #define UART_SHIFT      2
 #define FLOW_CONTROL
-#include <asm/hardware/debug-8250.h>
+#include <asm/hardware/debug-8250.S>
diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/include/asm-arm/arch-ebsa110/hardware.h
index 4e41c2358f4e..3ce864def41e 100644
--- a/include/asm-arm/arch-ebsa110/hardware.h
+++ b/include/asm-arm/arch-ebsa110/hardware.h
@@ -57,9 +57,6 @@
 /*
  * RAM definitions
  */
-#define FLUSH_BASE_PHYS         0x40000000
-#define FLUSH_BASE              0xdf000000
-
 #define UNCACHEABLE_ADDR        0xff000000      /* IRQ_STAT */
 
 #endif
diff --git a/include/asm-arm/arch-ebsa110/memory.h b/include/asm-arm/arch-ebsa110/memory.h
index 02f144520c10..c7c500e176d0 100644
--- a/include/asm-arm/arch-ebsa110/memory.h
+++ b/include/asm-arm/arch-ebsa110/memory.h
@@ -28,4 +28,10 @@
 #define __virt_to_bus(x)        (x)
 #define __bus_to_virt(x)        (x)
 
+/*
+ * Cache flushing area - SRAM
+ */
+#define FLUSH_BASE_PHYS         0x40000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/include/asm-arm/arch-ebsa110/uncompress.h
index 66b19c7fd908..ae5b775eb0b7 100644
--- a/include/asm-arm/arch-ebsa110/uncompress.h
+++ b/include/asm-arm/arch-ebsa110/uncompress.h
@@ -10,7 +10,7 @@
 
 #include <linux/serial_reg.h>
 
-#define SERIAL_BASE     ((unsigned char *)0xfe000be0)
+#define SERIAL_BASE     ((unsigned char *)0xf0000be0)
 
 /*
  * This does not append a newline
diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/include/asm-arm/arch-ebsa285/hardware.h
index 2ef2200f108c..ec51fe92483b 100644
--- a/include/asm-arm/arch-ebsa285/hardware.h
+++ b/include/asm-arm/arch-ebsa285/hardware.h
@@ -48,9 +48,6 @@
 #define PCICFG0_SIZE            0x01000000
 #define PCICFG0_BASE            0xfa000000
 
-#define FLUSH_SIZE              0x00100000
-#define FLUSH_BASE              0xf9000000
-
 #define PCIMEM_SIZE             0x01000000
 #define PCIMEM_BASE             0xf0000000
 
@@ -61,9 +58,6 @@
 #define PCIMEM_SIZE             0x80000000
 #define PCIMEM_BASE             0x80000000
 
-#define FLUSH_SIZE              0x00100000
-#define FLUSH_BASE              0x7e000000
-
 #define WFLUSH_SIZE             0x01000000
 #define WFLUSH_BASE             0x7d000000
 
@@ -94,7 +88,6 @@
 #define XBUS_SWITCH_J17_11      ((*XBUS_SWITCH) & (1 << 5))
 #define XBUS_SWITCH_J17_9       ((*XBUS_SWITCH) & (1 << 6))
 
-#define FLUSH_BASE_PHYS         0x50000000
 #define UNCACHEABLE_ADDR        (ARMCSR_BASE + 0x108)
 
 
diff --git a/include/asm-arm/arch-ebsa285/memory.h b/include/asm-arm/arch-ebsa285/memory.h
index 09e335cd687d..99181ffc7e27 100644
--- a/include/asm-arm/arch-ebsa285/memory.h
+++ b/include/asm-arm/arch-ebsa285/memory.h
@@ -49,12 +49,22 @@ extern unsigned long __bus_to_virt(unsigned long);
 #define TASK_SIZE               UL(0xbf000000)
 #define PAGE_OFFSET             UL(0xc0000000)
 
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE              0xf9000000
+
 #elif defined(CONFIG_ARCH_CO285)
 
 /* Task size and page offset at 1.5GB */
 #define TASK_SIZE               UL(0x5f000000)
 #define PAGE_OFFSET             UL(0x60000000)
 
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE              0x7e000000
+
 #else
 
 #error "Undefined footbridge architecture"
@@ -72,4 +82,6 @@ extern unsigned long __bus_to_virt(unsigned long);
  */
 #define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)
 
+#define FLUSH_BASE_PHYS         0x50000000
+
 #endif
diff --git a/include/asm-arm/arch-ixp23xx/debug-macro.S b/include/asm-arm/arch-ixp23xx/debug-macro.S
index eb99fd69fd24..2b25e640247d 100644
--- a/include/asm-arm/arch-ixp23xx/debug-macro.S
+++ b/include/asm-arm/arch-ixp23xx/debug-macro.S
@@ -17,6 +17,9 @@
                 tst     \rx, #1                         @ mmu enabled?
                 ldreq   \rx, =IXP23XX_PERIPHERAL_PHYS   @ physical
                 ldrne   \rx, =IXP23XX_PERIPHERAL_VIRT   @ virtual
+#ifdef __ARMEB__
+                orr     \rx, \rx, #0x00000003
+#endif
                 .endm
 
 #define UART_SHIFT      2
diff --git a/include/asm-arm/arch-l7200/hardware.h b/include/asm-arm/arch-l7200/hardware.h
index b755079befab..2ab43f3a4a8d 100644
--- a/include/asm-arm/arch-l7200/hardware.h
+++ b/include/asm-arm/arch-l7200/hardware.h
@@ -52,9 +52,6 @@
 #define ISA_SIZE                0x20000000
 #define ISA_BASE                0xe0000000
 
-#define FLUSH_BASE_PHYS         0x40000000      /* ROM */
-#define FLUSH_BASE              0xdf000000
-
 #define PCIO_BASE               IO_BASE
 
 #endif
diff --git a/include/asm-arm/arch-l7200/memory.h b/include/asm-arm/arch-l7200/memory.h
index 9e50a171f78a..402df637e740 100644
--- a/include/asm-arm/arch-l7200/memory.h
+++ b/include/asm-arm/arch-l7200/memory.h
@@ -20,4 +20,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x40000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h
index 9d7f87375aa7..7480f4e8d974 100644
--- a/include/asm-arm/arch-rpc/hardware.h
+++ b/include/asm-arm/arch-rpc/hardware.h
@@ -46,7 +46,6 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
 
-#define FLUSH_BASE              0xdf000000
 #define UNCACHEABLE_ADDR        0xdf010000
 
 /*
@@ -59,8 +58,6 @@
 #define PCIO_BASE               IOMEM(0xe0010000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
 
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
-
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 
 #define IO_EC_EASI_BASE         0x81400000
diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h
index 0592cb3f0c74..303c424ce673 100644
--- a/include/asm-arm/arch-rpc/memory.h
+++ b/include/asm-arm/arch-rpc/memory.h
@@ -30,4 +30,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
 
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/arch-sa1100/hardware.h b/include/asm-arm/arch-sa1100/hardware.h
index 28711aaa4968..ee008a5484f3 100644
--- a/include/asm-arm/arch-sa1100/hardware.h
+++ b/include/asm-arm/arch-sa1100/hardware.h
@@ -14,10 +14,6 @@
 
 #include <linux/config.h>
 
-/* Flushing areas */
-#define FLUSH_BASE_PHYS         0xe0000000      /* SA1100 zero bank */
-#define FLUSH_BASE              0xf5000000
-#define FLUSH_BASE_MINICACHE    0xf5800000
 #define UNCACHEABLE_ADDR        0xfa050000
 
 
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h
index 018a9f0e3986..a29fac1387ca 100644
--- a/include/asm-arm/arch-sa1100/memory.h
+++ b/include/asm-arm/arch-sa1100/memory.h
@@ -91,4 +91,11 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
 
 #endif
 
+/*
+ * Cache flushing area - SA1100 zero bank
+ */
+#define FLUSH_BASE_PHYS         0xe0000000
+#define FLUSH_BASE              0xf5000000
+#define FLUSH_BASE_MINICACHE    0xf5100000
+
 #endif
diff --git a/include/asm-arm/arch-shark/hardware.h b/include/asm-arm/arch-shark/hardware.h
index 4d35f8c154c3..ecba45260898 100644
--- a/include/asm-arm/arch-shark/hardware.h
+++ b/include/asm-arm/arch-shark/hardware.h
@@ -17,11 +17,6 @@
  */
 #define IO_BASE                 0xe0000000
 
-/*
- * RAM definitions
- */
-#define FLUSH_BASE_PHYS         0x80000000
-
 #else
 
 #define IO_BASE                 0
@@ -33,7 +28,6 @@
 #define ROMCARD_SIZE            0x08000000
 #define ROMCARD_START           0x10000000
 
-#define FLUSH_BASE              0xdf000000
 #define PCIO_BASE               0xe0000000
 
 
diff --git a/include/asm-arm/arch-shark/memory.h b/include/asm-arm/arch-shark/memory.h
index 95a29b4bc5d0..6968d6103ea0 100644
--- a/include/asm-arm/arch-shark/memory.h
+++ b/include/asm-arm/arch-shark/memory.h
@@ -39,4 +39,10 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
 #define __virt_to_bus(x)        __virt_to_phys(x)
 #define __bus_to_virt(x)        __phys_to_virt(x)
 
+/*
+ * Cache flushing area
+ */
+#define FLUSH_BASE_PHYS         0x80000000
+#define FLUSH_BASE              0xdf000000
+
 #endif
diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h
index 6246bf83627d..52bae088a185 100644
--- a/include/asm-arm/fpstate.h
+++ b/include/asm-arm/fpstate.h
@@ -26,7 +26,9 @@
 
 struct vfp_hard_struct {
         __u64 fpregs[16];
+#if __LINUX_ARM_ARCH__ < 6
         __u32 fpmx_state;
+#endif
         __u32 fpexc;
         __u32 fpscr;
         /*
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 2b3cf69b3ed9..209289407595 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -172,10 +172,10 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
  *  virt_addr_valid(k)  indicates whether a virtual address is valid
  */
 #ifndef CONFIG_DISCONTIGMEM
-#define ARCH_PFN_OFFSET         (PHYS_PFN_OFFSET)
+#define ARCH_PFN_OFFSET         PHYS_PFN_OFFSET
 #define pfn_valid(pfn)          ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
 
-#define virt_to_page(kaddr)     (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
+#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr)  ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)
 
 #define PHYS_TO_NID(addr)       (0)
@@ -187,8 +187,8 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
  * around in memory.
  */
 #include <linux/numa.h>
-#define arch_pfn_to_nid(pfn)    (PFN_TO_NID(pfn))
-#define arch_local_page_offset(pfn, nid) (LOCAL_MAP_NR((pfn) << PAGE_OFFSET))
+#define arch_pfn_to_nid(pfn)    PFN_TO_NID(pfn)
+#define arch_local_page_offset(pfn, nid) LOCAL_MAP_NR((pfn) << PAGE_SHIFT)
 
 #define pfn_valid(pfn)                                          \
         ({                                                      \
diff --git a/include/asm-arm/vfpmacros.h b/include/asm-arm/vfpmacros.h
index 15bd6e74c9cf..27fe028b4e72 100644
--- a/include/asm-arm/vfpmacros.h
+++ b/include/asm-arm/vfpmacros.h
@@ -16,10 +16,18 @@
 
         @ read all the working registers back into the VFP
         .macro  VFPFLDMIA, base
+#if __LINUX_ARM_ARCH__ < 6
         LDC     p11, cr0, [\base],#33*4             @ FLDMIAX \base!, {d0-d15}
+#else
+        LDC     p11, cr0, [\base],#32*4             @ FLDMIAD \base!, {d0-d15}
+#endif
         .endm
 
         @ write all the working registers out of the VFP
         .macro  VFPFSTMIA, base
+#if __LINUX_ARM_ARCH__ < 6
         STC     p11, cr0, [\base],#33*4             @ FSTMIAX \base!, {d0-d15}
+#else
+        STC     p11, cr0, [\base],#32*4             @ FSTMIAD \base!, {d0-d15}
+#endif
         .endm