Commit b18a9909 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://lia64.bkbits.net/to-linus-2.5

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 9df1b883 0b375cdb
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
extern void ia64_bad_param_for_setreg (void); extern void ia64_bad_param_for_setreg (void);
extern void ia64_bad_param_for_getreg (void); extern void ia64_bad_param_for_getreg (void);
register unsigned long ia64_r13 asm ("r13");
#define ia64_setreg(regnum, val) \ #define ia64_setreg(regnum, val) \
({ \ ({ \
switch (regnum) { \ switch (regnum) { \
...@@ -67,10 +69,7 @@ extern void ia64_bad_param_for_getreg (void); ...@@ -67,10 +69,7 @@ extern void ia64_bad_param_for_getreg (void);
asm volatile ("mov %0=psr" : "=r"(ia64_intri_res)); \ asm volatile ("mov %0=psr" : "=r"(ia64_intri_res)); \
break; \ break; \
case _IA64_REG_TP: /* for current() */ \ case _IA64_REG_TP: /* for current() */ \
{ \
register __u64 ia64_r13 asm ("r13"); \
ia64_intri_res = ia64_r13; \ ia64_intri_res = ia64_r13; \
} \
break; \ break; \
case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC: \ case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC: \
asm volatile ("mov %0=ar%1" : "=r" (ia64_intri_res) \ asm volatile ("mov %0=ar%1" : "=r" (ia64_intri_res) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment