Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

Do arch/ia64/defconfig by hand.

5 files changed, 24 insertions, 13 deletions

diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h
index 6d4ecec989b5..78eeb0793419 100644
--- a/arch/ia64/kernel/entry.h
+++ b/arch/ia64/kernel/entry.h
@@ -60,7 +60,7 @@
         .spillsp @priunat,SW(AR_UNAT)+16+(off);                                 \
         .spillsp ar.rnat,SW(AR_RNAT)+16+(off);                                  \
         .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off);                          \
-        .spillsp pr,SW(PR)+16+(off))
+        .spillsp pr,SW(PR)+16+(off)
 
 #define DO_SAVE_SWITCH_STACK                    \
         movl r28=1f;                            \
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index d9c05d53435b..2bc085a73e30 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -405,17 +405,22 @@ ENTRY(nested_dtlb_miss)
          *              r30:    continuation address
          *              r31:    saved pr
          *
-         * Clobbered:   b0, r18, r19, r21, psr.dt (cleared)
+         * Clobbered:   b0, r18, r19, r21, r22, psr.dt (cleared)
          */
         rsm psr.dt                              // switch to using physical data addressing
         mov r19=IA64_KR(PT_BASE)                // get the page table base address
         shl r21=r16,3                           // shift bit 60 into sign bit
+        mov r18=cr.itir
         ;;
         shr.u r17=r16,61                        // get the region number into r17
+        extr.u r18=r18,2,6                      // get the faulting page size
         ;;
         cmp.eq p6,p7=5,r17                      // is faulting address in region 5?
-        shr.u r18=r16,PGDIR_SHIFT               // get bits 33-63 of faulting address
+        add r22=-PAGE_SHIFT,r18                 // adjustment for hugetlb address
+        add r18=PGDIR_SHIFT-PAGE_SHIFT,r18
         ;;
+        shr.u r22=r16,r22
+        shr.u r18=r16,r18
 (p7)    dep r17=r17,r19,(PAGE_SHIFT-3),3        // put region number bits in place
 
         srlz.d
@@ -428,7 +433,7 @@ ENTRY(nested_dtlb_miss)
 (p6)    dep r17=r18,r19,3,(PAGE_SHIFT-3)        // r17=PTA + IFA(33,42)*8
 (p7)    dep r17=r18,r17,3,(PAGE_SHIFT-6)        // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)
         cmp.eq p7,p6=0,r21                      // unused address bits all zeroes?
-        shr.u r18=r16,PMD_SHIFT                 // shift L2 index into position
+        shr.u r18=r22,PMD_SHIFT                 // shift L2 index into position
         ;;
         ld8 r17=[r17]                           // fetch the L1 entry (may be 0)
         ;;
@@ -436,7 +441,7 @@ ENTRY(nested_dtlb_miss)
         dep r17=r18,r17,3,(PAGE_SHIFT-3)        // compute address of L2 page table entry
         ;;
 (p7)    ld8 r17=[r17]                           // fetch the L2 entry (may be 0)
-        shr.u r19=r16,PAGE_SHIFT                // shift L3 index into position
+        shr.u r19=r22,PAGE_SHIFT                // shift L3 index into position
         ;;
 (p7)    cmp.eq.or.andcm p6,p7=r17,r0            // was L2 entry NULL?
         dep r17=r19,r17,3,(PAGE_SHIFT-3)        // compute address of L3 page table entry
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 575a8f657b31..6d57aebad485 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -945,6 +945,13 @@ access_uarea (struct task_struct *child, unsigned long addr,
                                 *data = (pt->cr_ipsr & IPSR_MASK);
                         return 0;
 
+                      case PT_AR_RSC:
+                        if (write_access)
+                                pt->ar_rsc = *data | (3 << 2); /* force PL3 */
+                        else
+                                *data = pt->ar_rsc;
+                        return 0;
+
                       case PT_AR_RNAT:
                         urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
                         rnat_addr = (long) ia64_rse_rnat_addr((long *)
@@ -996,9 +1003,6 @@ access_uarea (struct task_struct *child, unsigned long addr,
                       case PT_AR_BSPSTORE:
                         ptr = pt_reg_addr(pt, ar_bspstore);
                         break;
-                      case PT_AR_RSC:
-                        ptr = pt_reg_addr(pt, ar_rsc);
-                        break;
                       case PT_AR_UNAT:
                         ptr = pt_reg_addr(pt, ar_unat);
                         break;
@@ -1234,7 +1238,7 @@ ptrace_getregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
 static long
 ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
 {
-        unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
+        unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
         struct unw_frame_info info;
         struct switch_stack *sw;
         struct ia64_fpreg fpval;
@@ -1267,7 +1271,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
         /* app regs */
 
         retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
-        retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);
+        retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
         retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
         retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
         retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
@@ -1365,6 +1369,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
         retval |= __get_user(nat_bits, &ppr->nat);
 
         retval |= access_uarea(child, PT_CR_IPSR, &psr, 1);
+        retval |= access_uarea(child, PT_AR_RSC, &rsc, 1);
         retval |= access_uarea(child, PT_AR_EC, &ec, 1);
         retval |= access_uarea(child, PT_AR_LC, &lc, 1);
         retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 499b7e5317cf..edd9f07860b2 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -94,7 +94,7 @@ sys_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, long arg2,
 static long
 restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
 {
-        unsigned long ip, flags, nat, um, cfm;
+        unsigned long ip, flags, nat, um, cfm, rsc;
         long err;
 
         /* Always make any pending restarted system calls return -EINTR */
@@ -106,7 +106,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
         err |= __get_user(ip, &sc->sc_ip);                      /* instruction pointer */
         err |= __get_user(cfm, &sc->sc_cfm);
         err |= __get_user(um, &sc->sc_um);                      /* user mask */
-        err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
+        err |= __get_user(rsc, &sc->sc_ar_rsc);
         err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
         err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
         err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
@@ -119,6 +119,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
         err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8);       /* r15 */
 
         scr->pt.cr_ifs = cfm | (1UL << 63);
+        scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
 
         /* establish new instruction pointer: */
         scr->pt.cr_iip = ip & ~0x3UL;
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 953095e2ce15..b49d4ddaab93 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -269,7 +269,7 @@ smp_call_function_single (int cpuid, void (*func) (void *info), void *info, int
         int me = get_cpu(); /* prevent preemption and reschedule on another processor */
 
         if (cpuid == me) {
-                printk("%s: trying to call self\n", __FUNCTION__);
+                printk(KERN_INFO "%s: trying to call self\n", __FUNCTION__);
                 put_cpu();
                 return -EBUSY;
         }