summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/misc.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 13:53:16 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 13:53:16 +0200
commitcdbfc557c43ea1f1f9b7062300ecb1254969814b (patch)
tree255f1cf62cea2c3dec208799a00a116e714a6128 /arch/powerpc/kernel/misc.S
parent4d8cc874d7ed43eda72765e9c0e141e170fee4f3 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadop-kernel-dev-cdbfc557c43ea1f1f9b7062300ecb1254969814b.zip
op-kernel-dev-cdbfc557c43ea1f1f9b7062300ecb1254969814b.tar.gz
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/powerpc/kernel/misc.S')
-rw-r--r--arch/powerpc/kernel/misc.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 7b91602..85cb6f3 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -116,3 +116,8 @@ _GLOBAL(longjmp)
mtlr r0
mr r3,r4
blr
+
+_GLOBAL(__setup_cpu_power7)
+_GLOBAL(__restore_cpu_power7)
+ /* place holder */
+ blr
OpenPOWER on IntegriCloud