diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
| commit | 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 (patch) | |
| tree | 47fcfdba6a17a02cf6745146ebb2ae435405ab1a /arch/alpha/kernel/traps.c | |
| parent | rcu: make rcutorture more vicious: reinstate boot-time testing (diff) | |
| parent | Slab: Fix memory leak in fallback_alloc() (diff) | |
| download | linux-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.tar.xz linux-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.zip | |
Merge branch 'linus' into core/rcu
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++; |