Merge commit 'v2.6.27-rc1' into x86/core

Conflicts:

	include/asm-x86/dma-mapping.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 11 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 81c8324a4a3c..1cbbf7033641 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -148,7 +148,7 @@ transfer_to_handler:
         /* Check to see if the dbcr0 register is set up to debug.  Use the
            internal debug mode bit to do this. */
         lwz     r12,THREAD_DBCR0(r12)
-        andis.  r12,r12,(DBCR0_IDM  | DBSR_DAC1R | DBSR_DAC1W)@h
+        andis.  r12,r12,DBCR0_IDM@h
         beq+    3f
         /* From user and task is ptraced - load up global dbcr0 */
         li      r12,-1                  /* clear all pending debug events */
@@ -292,7 +292,7 @@ syscall_exit_cont:
         /* If the process has its own DBCR0 value, load it up.  The internal
            debug mode bit tells us that dbcr0 should be loaded. */
         lwz     r0,THREAD+THREAD_DBCR0(r2)
-        andis.  r10,r0,(DBCR0_IDM  | DBSR_DAC1R | DBSR_DAC1W)@h
+        andis.  r10,r0,DBCR0_IDM@h
         bnel-   load_dbcr0
 #endif
 #ifdef CONFIG_44x
@@ -343,7 +343,12 @@ syscall_dotrace:
         stw     r0,_TRAP(r1)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      do_syscall_trace_enter
-        lwz     r0,GPR0(r1)     /* Restore original registers */
+        /*
+         * Restore argument registers possibly just changed.
+         * We use the return value of do_syscall_trace_enter
+         * for call number to look up in the table (r0).
+         */
+        mr      r0,r3
         lwz     r3,GPR3(r1)
         lwz     r4,GPR4(r1)
         lwz     r5,GPR5(r1)
@@ -720,7 +725,7 @@ restore_user:
         /* Check whether this process has its own DBCR0 value.  The internal
            debug mode bit tells us that dbcr0 should be loaded. */
         lwz     r0,THREAD+THREAD_DBCR0(r2)
-        andis.  r10,r0,(DBCR0_IDM  | DBSR_DAC1R | DBSR_DAC1W)@h
+        andis.  r10,r0,DBCR0_IDM@h
         bnel-   load_dbcr0
 #endif
 
@@ -1055,8 +1060,8 @@ do_user_signal:			/* r10 contains MSR_KERNEL here */
         SAVE_NVGPRS(r1)
         rlwinm  r3,r3,0,0,30
         stw     r3,_TRAP(r1)
-2:      li      r3,0
-        addi    r4,r1,STACK_FRAME_OVERHEAD
+2:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        mr      r4,r9
         bl      do_signal
         REST_NVGPRS(r1)
         b       recheck