diff options
author | Doug Chapman <doug.chapman@hp.com> | 2008-01-28 18:33:28 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-02-04 18:08:25 -0500 |
commit | 0df29025fd0379d5950d206314d0b10a2c8a9607 (patch) | |
tree | 2b2c49b9da5cf3580e8f244771578cc2b77f8881 | |
parent | d2fc0bacd5c438cb459fdf531eff00ab18422a00 (diff) |
[IA64] fix userspace compile error in gcc_intrin.h
Fixes userspace build errors when linux/ipv6.h is included such as in the
dhcpv6 package under fedora. Likely causes other userspace build errors as
well. I found this in akpm's tree from 2.6.18 but could not find any case
of anyone proposing it for the main tree.
Signed-off-by: Doug Chapman <doug.chapman@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | include/asm-ia64/gcc_intrin.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/gcc_intrin.h b/include/asm-ia64/gcc_intrin.h index 5b6665c754c9..de2ed2cbdd84 100644 --- a/include/asm-ia64/gcc_intrin.h +++ b/include/asm-ia64/gcc_intrin.h | |||
@@ -24,7 +24,9 @@ | |||
24 | extern void ia64_bad_param_for_setreg (void); | 24 | extern void ia64_bad_param_for_setreg (void); |
25 | extern void ia64_bad_param_for_getreg (void); | 25 | extern void ia64_bad_param_for_getreg (void); |
26 | 26 | ||
27 | #ifdef __KERNEL__ | ||
27 | register unsigned long ia64_r13 asm ("r13") __used; | 28 | register unsigned long ia64_r13 asm ("r13") __used; |
29 | #endif | ||
28 | 30 | ||
29 | #define ia64_setreg(regnum, val) \ | 31 | #define ia64_setreg(regnum, val) \ |
30 | ({ \ | 32 | ({ \ |