Merge ../linux-2.6

diff --combined Makefile
index d9ad521936a8f37357896b17a24c8b5cef440b0f,c265e41ec55a48b9966a5d65845b930b3185dcd0..a4b4b730f10b2972739469bc53a8424095c52bf6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,8 -1,8 +1,8 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 23
- EXTRAVERSION =-rc6
- NAME = Pink Farting Weasel
+ EXTRAVERSION =-rc7
+ NAME = Arr Matey! A Hairy Bilge Rat!
  
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
@@@ -16,9 -16,6 +16,9 @@@
  # o  print "Entering directory ...";
  MAKEFLAGS += -rR --no-print-directory
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
@@@ -166,8 -163,6 +166,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -188,7 -183,7 +188,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE := $(ARCH)

diff --combined arch/arm/vfp/vfpmodule.c
index 4aae7a7dfd81692370df521719389f798e6968ed,eea3f50743d58b3076592969f5e0cf98b0ecedef..b486863e198ffc0453e2a63672d30bdbd80fc5df
--- 1/arch/arm/vfp/vfpmodule.c
--- 2/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@@ -125,13 -125,13 +125,13 @@@ void vfp_raise_sigfpe(unsigned int sico
        send_sig_info(SIGFPE, &info, current);
  }
  
 -static void vfp_panic(char *reason)
 +static void vfp_panic(char *reason, u32 inst)
  {
        int i;
  
        printk(KERN_ERR "VFP: Error: %s\n", reason);
        printk(KERN_ERR "VFP: EXC 0x%08x SCR 0x%08x INST 0x%08x\n",
 -              fmrx(FPEXC), fmrx(FPSCR), fmrx(FPINST));
 +              fmrx(FPEXC), fmrx(FPSCR), inst);
        for (i = 0; i < 32; i += 2)
                printk(KERN_ERR "VFP: s%2u: 0x%08x s%2u: 0x%08x\n",
                       i, vfp_get_float(i), i+1, vfp_get_float(i+1));
@@@ -147,7 -147,7 +147,7 @@@ static void vfp_raise_exceptions(u32 ex
        pr_debug("VFP: raising exceptions %08x\n", exceptions);
  
        if (exceptions == VFP_EXCEPTION_ERROR) {
 -              vfp_panic("unhandled bounce");
 +              vfp_panic("unhandled bounce", inst);
                vfp_raise_sigfpe(0, regs);
                return;
        }
@@@ -262,16 -262,11 +262,16 @@@ void VFP9_bounce(u32 trigger, u32 fpexc
         * FPEXC bounce reason, but this appears to be unreliable.
         * Emulate the bounced instruction instead.
         */
 +#ifndef CONFIG_VFPv3
        inst = fmrx(FPINST);
 +#else
 +      inst = trigger;
 +#endif
        exceptions = vfp_emulate_instruction(inst, fpscr, regs);
        if (exceptions)
                vfp_raise_exceptions(exceptions, inst, orig_fpscr, regs);
  
 +#ifndef CONFIG_VFPv3
        /*
         * If there isn't a second FP instruction, exit now.
         */
@@@ -285,9 -280,6 +285,9 @@@
        barrier();
        trigger = fmrx(FPINST2);
        orig_fpscr = fpscr = fmrx(FPSCR);
 +#else
 +      return;
 +#endif
  
   emulate:
        exceptions = vfp_emulate_instruction(trigger, fpscr, regs);
@@@ -331,6 -323,7 +331,7 @@@ static int __init vfp_init(void
         * we just need to read the VFPSID register.
         */
        vfp_vector = vfp_testing_entry;
+       barrier();
        vfpsid = fmrx(FPSID);
        barrier();
        vfp_vector = vfp_null_entry;