Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: export length of os_hpmc vector
  parisc: fix kernel crash (protection id trap) when compiling ruby1.9
  parisc: Use DEFINE_SPINLOCK
  parisc: add uevent helper for parisc bus
  parisc: fix ipv6 checksum
  parisc: quiet palo not-found message from "which"
  parisc: Replace NR_CPUS in parisc code
  parisc: trivial fixes
  parisc: fix braino in commit adding __space_to_prot
  parisc: factor out sid to protid conversion
  parisc: use leX_to_cpu in place of __fswabX
  parisc: fix GFP_KERNEL use while atomic in unwinder
  parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
  parisc: set_time() catch errors
  parisc: use the new byteorder headers
  parisc: drivers/parisc/: make code static
  parisc: lib/: make code static

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 4c771cd580ec..ba658d2086f7 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -745,6 +745,10 @@ void handle_interruption(int code, struct pt_regs *regs)
                 /* Fall Through */
         case 27: 
                 /* Data memory protection ID trap */
+                if (code == 27 && !user_mode(regs) &&
+                        fixup_exception(regs))
+                        return;
+
                 die_if_kernel("Protection id trap", regs, code);
                 si.si_code = SEGV_MAPERR;
                 si.si_signo = SIGSEGV;
@@ -821,8 +825,8 @@ void handle_interruption(int code, struct pt_regs *regs)
 
 int __init check_ivt(void *iva)
 {
+        extern u32 os_hpmc_size;
         extern const u32 os_hpmc[];
-        extern const u32 os_hpmc_end[];
 
         int i;
         u32 check = 0;
@@ -839,8 +843,7 @@ int __init check_ivt(void *iva)
             *ivap++ = 0;
 
         /* Compute Checksum for HPMC handler */
-
-        length = os_hpmc_end - os_hpmc;
+        length = os_hpmc_size;
         ivap[7] = length;
 
         hpmcp = (u32 *)os_hpmc;