diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 10:52:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 10:52:59 +0200 |
commit | a60b33cf59d1c9e0e363287fce799cb23d45660c (patch) | |
tree | 85eb8feea5717cf472a2549e53f59183a95617c5 /arch/alpha/kernel/traps.c | |
parent | 0f476b6d91a1395bda6464e653ce66ea9bea7167 (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
download | linux-a60b33cf59d1c9e0e363287fce799cb23d45660c.tar.gz linux-a60b33cf59d1c9e0e363287fce799cb23d45660c.tar.bz2 linux-a60b33cf59d1c9e0e363287fce799cb23d45660c.zip |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'arch/alpha/kernel/traps.c')
-rw-r--r-- | arch/alpha/kernel/traps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index dc57790250d2..c778779007fc 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -447,7 +447,7 @@ struct unaligned_stat { /* Macro for exception fixup code to access integer registers. */ -#define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) +#define una_reg(r) (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) asmlinkage void @@ -456,6 +456,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, { long error, tmp1, tmp2, tmp3, tmp4; unsigned long pc = regs->pc - 4; + unsigned long *_regs = regs->regs; const struct exception_table_entry *fixup; unaligned[0].count++; |