Merge commit 'v2.6.39-rc3' into for-2.6.39

13 files changed, 19 insertions, 20 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 9b1f427cdc37..69ff049c8571 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -15,7 +15,6 @@ config PARISC
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
         select IRQ_PER_CPU
-        select GENERIC_HARDIRQS_NO_DEPRECATED
 
         help
           The PA-RISC microprocessor is designed by Hewlett-Packard and used
diff --git a/arch/parisc/include/asm/eisa_eeprom.h b/arch/parisc/include/asm/eisa_eeprom.h
index 9c9da980402a..8ce8b85ca588 100644
--- a/arch/parisc/include/asm/eisa_eeprom.h
+++ b/arch/parisc/include/asm/eisa_eeprom.h
@@ -27,7 +27,7 @@ struct eeprom_header
         u_int8_t  ver_maj;
         u_int8_t  ver_min;
         u_int8_t  num_slots;        /* number of EISA slots in system */
-        u_int16_t csum;             /* checksum, I don't know how to calulate this */
+        u_int16_t csum;             /* checksum, I don't know how to calculate this */
         u_int8_t  pad[10];
 } __attribute__ ((packed));
 
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index e5477092a5d4..ead8d2a1034c 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -187,8 +187,8 @@
 
         /* Register definitions for tlb miss handler macros */
 
-        va  = r8        /* virtual address for which the trap occured */
-        spc = r24       /* space for which the trap occured */
+        va  = r8        /* virtual address for which the trap occurred */
+        spc = r24       /* space for which the trap occurred */
 
 #ifndef CONFIG_64BIT
 
@@ -882,7 +882,7 @@ ENTRY(syscall_exit_rfi)
          * (we don't store them in the sigcontext), so set them
          * to "proper" values now (otherwise we'll wind up restoring
          * whatever was last stored in the task structure, which might
-         * be inconsistent if an interrupt occured while on the gateway
+         * be inconsistent if an interrupt occurred while on the gateway
          * page). Note that we may be "trashing" values the user put in
          * them, but we don't support the user changing them.
          */
@@ -1156,11 +1156,11 @@ ENDPROC(intr_save)
          */
 
         t0 = r1         /* temporary register 0 */
-        va = r8         /* virtual address for which the trap occured */
+        va = r8         /* virtual address for which the trap occurred */
         t1 = r9         /* temporary register 1 */
         pte  = r16      /* pte/phys page # */
         prot = r17      /* prot bits */
-        spc  = r24      /* space for which the trap occured */
+        spc  = r24      /* space for which the trap occurred */
         ptp = r25       /* page directory/page table pointer */
 
 #ifdef CONFIG_64BIT
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index 4dbdf0ed6fa0..145c5e4caaa0 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -131,7 +131,7 @@ $pgt_fill_loop:
         ldo             THREAD_SZ_ALGN(%r6),%sp
 
 #ifdef CONFIG_SMP
-        /* Set the smp rendevous address into page zero.
+        /* Set the smp rendezvous address into page zero.
         ** It would be safer to do this in init_smp_config() but
         ** it's just way easier to deal with here because
         ** of 64-bit function ptrs and the address is local to this file.
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index d228d8237879..08324aac3544 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -93,7 +93,7 @@ void __init setup_pdc(void)
         case 0x6:               /* 705, 710 */
         case 0x7:               /* 715, 725 */
         case 0x8:               /* 745, 747, 742 */
-        case 0xA:               /* 712 and similiar */
+        case 0xA:               /* 712 and similar */
         case 0xC:               /* 715/64, at least */
 
                 pdc_type = PDC_TYPE_SNAKE;
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 609a331878e7..12c1ed33dc18 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -291,7 +291,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 DBG(1,"setup_rt_frame: frame->uc = 0x%p\n", &frame->uc);
                 DBG(1,"setup_rt_frame: frame->uc.uc_mcontext = 0x%p\n", &frame->uc.uc_mcontext);
                 err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, in_syscall);
-                /* FIXME: Should probably be converted aswell for the compat case */
+                /* FIXME: Should probably be converted as well for the compat case */
                 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         }
         
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 68e75ce838d6..82a52b2fb13f 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -605,7 +605,7 @@ cas_action:
         copy    %r0, %r21
 
 3:              
-        /* Error occured on load or store */
+        /* Error occurred on load or store */
         /* Free lock */
         stw     %r20, 0(%sr2,%r20)
 #if ENABLE_LWS_DEBUG
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 74867dfdabe5..4be85ee10b85 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -34,7 +34,7 @@
 /* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and
  * narrow palinux.  Use ENTRY_DIFF for those where a 32-bit specific
  * implementation is required on wide palinux.  Use ENTRY_COMP where
- * the compatability layer has a useful 32-bit implementation.
+ * the compatibility layer has a useful 32-bit implementation.
  */
 #define ENTRY_SAME(_name_) .dword sys_##_name_
 #define ENTRY_DIFF(_name_) .dword sys32_##_name_
diff --git a/arch/parisc/math-emu/dfadd.c b/arch/parisc/math-emu/dfadd.c
index e147d7d3b0f4..d37e2d2cb6fe 100644
--- a/arch/parisc/math-emu/dfadd.c
+++ b/arch/parisc/math-emu/dfadd.c
@@ -303,7 +303,7 @@ dbl_fadd(
         if(Dbl_iszero_hidden(resultp1))
             {
             /* Handle normalization */
-            /* A straight foward algorithm would now shift the result
+            /* A straight forward algorithm would now shift the result
              * and extension left until the hidden bit becomes one.  Not
              * all of the extension bits need participate in the shift.
              * Only the two most significant bits (round and guard) are
diff --git a/arch/parisc/math-emu/dfsub.c b/arch/parisc/math-emu/dfsub.c
index 87ebc60d465b..2e8b5a79bff7 100644
--- a/arch/parisc/math-emu/dfsub.c
+++ b/arch/parisc/math-emu/dfsub.c
@@ -306,7 +306,7 @@ dbl_fsub(
         if(Dbl_iszero_hidden(resultp1))
             {
             /* Handle normalization */
-            /* A straight foward algorithm would now shift the result
+            /* A straight forward algorithm would now shift the result
              * and extension left until the hidden bit becomes one.  Not
              * all of the extension bits need participate in the shift.
              * Only the two most significant bits (round and guard) are
diff --git a/arch/parisc/math-emu/fmpyfadd.c b/arch/parisc/math-emu/fmpyfadd.c
index 5dd7f93a89be..b067c45c872d 100644
--- a/arch/parisc/math-emu/fmpyfadd.c
+++ b/arch/parisc/math-emu/fmpyfadd.c
@@ -531,7 +531,7 @@ dbl_fmpyfadd(
                 sign_save = Dbl_signextendedsign(resultp1);
                 if (Dbl_iszero_hidden(resultp1)) {
                         /* Handle normalization */
-                /* A straight foward algorithm would now shift the
+                /* A straightforward algorithm would now shift the
                  * result and extension left until the hidden bit
                  * becomes one.  Not all of the extension bits need
                  * participate in the shift.  Only the two most 
@@ -1191,7 +1191,7 @@ unsigned int *status;
                 sign_save = Dbl_signextendedsign(resultp1);
                 if (Dbl_iszero_hidden(resultp1)) {
                         /* Handle normalization */
-                /* A straight foward algorithm would now shift the
+                /* A straightforward algorithm would now shift the
                  * result and extension left until the hidden bit
                  * becomes one.  Not all of the extension bits need
                  * participate in the shift.  Only the two most 
@@ -1841,7 +1841,7 @@ unsigned int *status;
                 sign_save = Sgl_signextendedsign(resultp1);
                 if (Sgl_iszero_hidden(resultp1)) {
                         /* Handle normalization */
-                /* A straight foward algorithm would now shift the
+                /* A straightforward algorithm would now shift the
                  * result and extension left until the hidden bit
                  * becomes one.  Not all of the extension bits need
                  * participate in the shift.  Only the two most 
@@ -2483,7 +2483,7 @@ unsigned int *status;
                 sign_save = Sgl_signextendedsign(resultp1);
                 if (Sgl_iszero_hidden(resultp1)) {
                         /* Handle normalization */
-                /* A straight foward algorithm would now shift the
+                /* A straightforward algorithm would now shift the
                  * result and extension left until the hidden bit
                  * becomes one.  Not all of the extension bits need
                  * participate in the shift.  Only the two most 
diff --git a/arch/parisc/math-emu/sfadd.c b/arch/parisc/math-emu/sfadd.c
index 008d721b5d22..f802cd6c7869 100644
--- a/arch/parisc/math-emu/sfadd.c
+++ b/arch/parisc/math-emu/sfadd.c
@@ -298,7 +298,7 @@ sgl_fadd(
         if(Sgl_iszero_hidden(result))
             {
             /* Handle normalization */
-            /* A straight foward algorithm would now shift the result
+            /* A straightforward algorithm would now shift the result
              * and extension left until the hidden bit becomes one.  Not
              * all of the extension bits need participate in the shift.
              * Only the two most significant bits (round and guard) are
diff --git a/arch/parisc/math-emu/sfsub.c b/arch/parisc/math-emu/sfsub.c
index 24eef61c8e3b..5f90d0f31a52 100644
--- a/arch/parisc/math-emu/sfsub.c
+++ b/arch/parisc/math-emu/sfsub.c
@@ -301,7 +301,7 @@ sgl_fsub(
         if(Sgl_iszero_hidden(result))
             {
             /* Handle normalization */
-            /* A straight foward algorithm would now shift the result
+            /* A straightforward algorithm would now shift the result
              * and extension left until the hidden bit becomes one.  Not
              * all of the extension bits need participate in the shift.
              * Only the two most significant bits (round and guard) are