summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-19 14:41:02 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-19 08:41:19 -0700
commit0be421862b857e61964435ffcaa7499cf77a5e5a (patch)
tree86a69db86f9753d031ed2654f9769a910840d490 /arch
parent0bcc426b1defa6b629dfa722537cab38876a3ce4 (diff)
downloadop-kernel-dev-0be421862b857e61964435ffcaa7499cf77a5e5a.zip
op-kernel-dev-0be421862b857e61964435ffcaa7499cf77a5e5a.tar.gz
alpha: fix fpu.h usage in userspace
After commit ec2212088c42 ("Disintegrate asm/system.h for Alpha"), the fpu.h header which we install for userland started depending on special_insns.h which is not installed. However, fpu.h only uses that for __KERNEL__ code, so protect the inclusion the same way to avoid build breakage in glibc: /usr/include/asm/fpu.h:4:31: fatal error: asm/special_insns.h: No such file or directory Cc: stable@vger.kernel.org Reported-by: Matt Turner <mattst88@gentoo.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Michael Cree <mcree@orcon.net.nz> Acked-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/include/asm/fpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/fpu.h b/arch/alpha/include/asm/fpu.h
index db00f78..e477bcd 100644
--- a/arch/alpha/include/asm/fpu.h
+++ b/arch/alpha/include/asm/fpu.h
@@ -1,7 +1,9 @@
#ifndef __ASM_ALPHA_FPU_H
#define __ASM_ALPHA_FPU_H
+#ifdef __KERNEL__
#include <asm/special_insns.h>
+#endif
/*
* Alpha floating-point control register defines:
OpenPOWER on IntegriCloud