summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-19 14:41:02 +1200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:06 -0700
commitf998ff53548d95327b6b1543d7b524db26a54d89 (patch)
tree7768e16d0e545d32fcc6d080d1f63265ebfd21cb
parentb030a2c4a494ff09a9ca84a3280f6a327dd7a02f (diff)
downloadlinux-3.10-f998ff53548d95327b6b1543d7b524db26a54d89.tar.gz
linux-3.10-f998ff53548d95327b6b1543d7b524db26a54d89.tar.bz2
linux-3.10-f998ff53548d95327b6b1543d7b524db26a54d89.zip
alpha: fix fpu.h usage in userspace
commit 0be421862b857e61964435ffcaa7499cf77a5e5a upstream. 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 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 db00f7885fa..e477bcd5b94 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: