Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
  [POWERPC] Cell IOMMU fixed mapping support
  [POWERPC] Split out the ioid fetching/checking logic
  [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
  [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
  [POWERPC] Split cell_iommu_setup_hardware() into two parts
  [POWERPC] Split out the logic that allocates struct iommus
  [POWERPC] Allocate the hash table under 1G on cell
  [POWERPC] Add set_dma_ops() to match get_dma_ops()
  [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
  [POWERPC] 85xx: Only invalidate TLB0 and TLB1
  [POWERPC] 83xx: Fix typo in mpc837x compatible entries
  [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
  [POWERPC] 83xx: rework platform Kconfig
  [POWERPC] 85xx: rework platform Kconfig
  [POWERPC] 86xx: Remove unused IRQ defines
  [POWERPC] QE: Explicitly set address-cells and size cells for muram
  [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
  [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
  [PPC] Remove 85xx from arch/ppc
  [PPC] Remove 83xx from arch/ppc
  ...

1 files changed, 73 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 330c9dc7db86..7b9160220698 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -8,12 +8,17 @@
  * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)
  * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)
  *
+ * setjmp/longjmp code by Paul Mackerras.
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
 #include <asm/ppc_asm.h>
+#include <asm/unistd.h>
+#include <asm/asm-compat.h>
+#include <asm/asm-offsets.h>
 
         .text
 
@@ -43,3 +48,71 @@ _GLOBAL(add_reloc_offset)
         add     r3,r3,r5
         mtlr    r0
         blr
+
+_GLOBAL(kernel_execve)
+        li      r0,__NR_execve
+        sc
+        bnslr
+        neg     r3,r3
+        blr
+
+_GLOBAL(setjmp)
+        mflr    r0
+        PPC_STL r0,0(r3)
+        PPC_STL r1,SZL(r3)
+        PPC_STL r2,2*SZL(r3)
+        mfcr    r0
+        PPC_STL r0,3*SZL(r3)
+        PPC_STL r13,4*SZL(r3)
+        PPC_STL r14,5*SZL(r3)
+        PPC_STL r15,6*SZL(r3)
+        PPC_STL r16,7*SZL(r3)
+        PPC_STL r17,8*SZL(r3)
+        PPC_STL r18,9*SZL(r3)
+        PPC_STL r19,10*SZL(r3)
+        PPC_STL r20,11*SZL(r3)
+        PPC_STL r21,12*SZL(r3)
+        PPC_STL r22,13*SZL(r3)
+        PPC_STL r23,14*SZL(r3)
+        PPC_STL r24,15*SZL(r3)
+        PPC_STL r25,16*SZL(r3)
+        PPC_STL r26,17*SZL(r3)
+        PPC_STL r27,18*SZL(r3)
+        PPC_STL r28,19*SZL(r3)
+        PPC_STL r29,20*SZL(r3)
+        PPC_STL r30,21*SZL(r3)
+        PPC_STL r31,22*SZL(r3)
+        li      r3,0
+        blr
+
+_GLOBAL(longjmp)
+        PPC_LCMPI r4,0
+        bne     1f
+        li      r4,1
+1:      PPC_LL  r13,4*SZL(r3)
+        PPC_LL  r14,5*SZL(r3)
+        PPC_LL  r15,6*SZL(r3)
+        PPC_LL  r16,7*SZL(r3)
+        PPC_LL  r17,8*SZL(r3)
+        PPC_LL  r18,9*SZL(r3)
+        PPC_LL  r19,10*SZL(r3)
+        PPC_LL  r20,11*SZL(r3)
+        PPC_LL  r21,12*SZL(r3)
+        PPC_LL  r22,13*SZL(r3)
+        PPC_LL  r23,14*SZL(r3)
+        PPC_LL  r24,15*SZL(r3)
+        PPC_LL  r25,16*SZL(r3)
+        PPC_LL  r26,17*SZL(r3)
+        PPC_LL  r27,18*SZL(r3)
+        PPC_LL  r28,19*SZL(r3)
+        PPC_LL  r29,20*SZL(r3)
+        PPC_LL  r30,21*SZL(r3)
+        PPC_LL  r31,22*SZL(r3)
+        PPC_LL  r0,3*SZL(r3)
+        mtcrf   0x38,r0
+        PPC_LL  r0,0(r3)
+        PPC_LL  r1,SZL(r3)
+        PPC_LL  r2,2*SZL(r3)
+        mtlr    r0
+        mr      r3,r4
+        blr