commit: 0be421862b857e61964435ffcaa7499cf77a5e5a
From: Mike Frysinger <vap...@gentoo.org>
Date: Sun, 19 Aug 2012 14:41:02 +1200
Subject: 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 <matts...@gentoo.org>
Signed-off-by: Mike Frysinger <vap...@gentoo.org>
Signed-off-by: Michael Cree <mc...@orcon.net.nz>
Acked-by: Matt Turner <matts...@gmail.com>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
---
 arch/alpha/include/asm/fpu.h |    2 ++
 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:
-- 
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to