aboutsummaryrefslogtreecommitdiff
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorDoug Chapman <doug.chapman@hp.com>2008-01-28 15:33:28 -0800
committerTony Luck <tony.luck@intel.com>2008-02-04 15:08:25 -0800
commit0df29025fd0379d5950d206314d0b10a2c8a9607 (patch)
tree2b2c49b9da5cf3580e8f244771578cc2b77f8881 /include/asm-ia64
parentd2fc0bacd5c438cb459fdf531eff00ab18422a00 (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>
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/gcc_intrin.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/gcc_intrin.h b/include/asm-ia64/gcc_intrin.h
index 5b6665c754c..de2ed2cbdd8 100644
--- a/include/asm-ia64/gcc_intrin.h
+++ b/include/asm-ia64/gcc_intrin.h
@@ -24,7 +24,9 @@
extern void ia64_bad_param_for_setreg (void);
extern void ia64_bad_param_for_getreg (void);
+#ifdef __KERNEL__
register unsigned long ia64_r13 asm ("r13") __used;
+#endif
#define ia64_setreg(regnum, val) \
({ \