diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 15:07:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 15:07:40 -0800 |
| commit | 906430a99ec8ca48f264e835a264df89fc50dfd4 (patch) | |
| tree | 58ed30debffc01a06df2a6a617daa6d33683441b /arch/ia64/include/asm/intrinsics.h | |
| parent | ba721d318b24154eb7806a8673d3fc030fd39f7e (diff) | |
| parent | 0090d481ee4c5d9a54ae2c457ab3ef9111dd4a91 (diff) | |
| download | blackbird-op-linux-906430a99ec8ca48f264e835a264df89fc50dfd4.tar.gz blackbird-op-linux-906430a99ec8ca48f264e835a264df89fc50dfd4.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen: fix xen_get_eflags.
[IA64] ia64/pv_ops/pv_cpu_ops: fix _IA64_REG_IP case.
[IA64] remove duplicate include iommu.h
[IA64] use mprintk instead of printk, in ia64_mca_modify_original_stack
[IA64] Rationalize kernel mode alignment checking
Diffstat (limited to 'arch/ia64/include/asm/intrinsics.h')
| -rw-r--r-- | arch/ia64/include/asm/intrinsics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h index 47d686dba1eb..a3e44a5ed497 100644 --- a/arch/ia64/include/asm/intrinsics.h +++ b/arch/ia64/include/asm/intrinsics.h @@ -226,7 +226,7 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); /************************************************/ #define ia64_ssm IA64_INTRINSIC_MACRO(ssm) #define ia64_rsm IA64_INTRINSIC_MACRO(rsm) -#define ia64_getreg IA64_INTRINSIC_API(getreg) +#define ia64_getreg IA64_INTRINSIC_MACRO(getreg) #define ia64_setreg IA64_INTRINSIC_API(setreg) #define ia64_set_rr IA64_INTRINSIC_API(set_rr) #define ia64_get_rr IA64_INTRINSIC_API(get_rr) |
