summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/system.h
diff options
context:
space:
mode:
authorLinus Torvalds2006-01-12 19:21:22 +0100
committerLinus Torvalds2006-01-12 19:21:22 +0100
commit45bfe98bd790b5ded00462cd582effcfb42263cc (patch)
treed4a1f2c5303dda106635b615f8f40ea9104bf25e /include/asm-powerpc/system.h
parentMerge git://oss.sgi.com:8090/oss/git/xfs-2.6 (diff)
parentpowerpc: make ARCH=ppc use arch/powerpc/kernel/process.c (diff)
downloadkernel-qcow2-linux-45bfe98bd790b5ded00462cd582effcfb42263cc.tar.gz
kernel-qcow2-linux-45bfe98bd790b5ded00462cd582effcfb42263cc.tar.xz
kernel-qcow2-linux-45bfe98bd790b5ded00462cd582effcfb42263cc.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's gone, gone, gone). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-powerpc/system.h')
-rw-r--r--include/asm-powerpc/system.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 1be629b4fb97..9b822afa7d0e 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -133,6 +133,14 @@ extern int fix_alignment(struct pt_regs *);
extern void cvt_fd(float *from, double *to, struct thread_struct *thread);
extern void cvt_df(double *from, float *to, struct thread_struct *thread);
+#ifndef CONFIG_SMP
+extern void discard_lazy_cpu_state(void);
+#else
+static inline void discard_lazy_cpu_state(void)
+{
+}
+#endif
+
#ifdef CONFIG_ALTIVEC
extern void flush_altivec_to_thread(struct task_struct *);
#else