diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 23:38:43 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 23:38:43 +0200 |
| commit | de9ea203d105f760e8e995c07aa80e855a9aedba (patch) | |
| tree | 75e4702e98a0b3ea9ed6d085f74474a70642909b /arch/powerpc/kernel/misc_32.S | |
| parent | ARM: Ensure PTE modifications via dma_alloc_coherent are visible (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-de9ea203d105f760e8e995c07aa80e855a9aedba.tar.xz linux-de9ea203d105f760e8e995c07aa80e855a9aedba.zip | |
Merge branch 'origin'
Diffstat (limited to 'arch/powerpc/kernel/misc_32.S')
| -rw-r--r-- | arch/powerpc/kernel/misc_32.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 6bbd7a604d24..a7a570dcdd57 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -810,6 +810,9 @@ relocate_new_kernel: isync sync + mfspr r3, SPRN_PIR /* current core we are running on */ + mr r4, r5 /* load physical address of chunk called */ + /* jump to the entry point, usually the setup routine */ mtlr r5 blrl |