summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/misc.S
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-27 16:11:07 +0300
committerTakashi Iwai <tiwai@suse.de>2014-10-27 16:11:07 +0300
commit85c24cd8d3676cbae9e8809e894e68025c6d497e (patch)
tree024c4b655c1a8e6943ed8e75b64be38980508cfe /arch/powerpc/kernel/misc.S
parent49d776ffb50f2e428aafb6a6576e58e80f1e886c (diff)
parentd1d0b6b668818571122d30d68a0b3f768bd83a52 (diff)
downloadlinux-85c24cd8d3676cbae9e8809e894e68025c6d497e.tar.xz
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier (and avoid conflicts earlier). Conflicts: sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'arch/powerpc/kernel/misc.S')
-rw-r--r--arch/powerpc/kernel/misc.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 7ce26d45777e..0d432194c018 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -114,3 +114,7 @@ _GLOBAL(longjmp)
mtlr r0
mr r3,r4
blr
+
+_GLOBAL(current_stack_pointer)
+ PPC_LL r3,0(r1)
+ blr