diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 19:59:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 19:59:55 -0400 |
| commit | c94c0d201f1c1a62184f4f220c1615347aafbee7 (patch) | |
| tree | ac2fe13e5686091ab9c3789cb40d50371ca270ef /arch/arm/nwfpe/fpmodule.c | |
| parent | 8ed693d29b25bbd88471ec043cc01581419d0481 (diff) | |
| parent | 53776eb4acdd3ec576d75b61b656ef8d51e430ea (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/nwfpe/fpmodule.c')
| -rw-r--r-- | arch/arm/nwfpe/fpmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c index a8efcf34888e..12885f31d347 100644 --- a/arch/arm/nwfpe/fpmodule.c +++ b/arch/arm/nwfpe/fpmodule.c | |||
| @@ -132,7 +132,7 @@ void float_raise(signed char flags) | |||
| 132 | printk(KERN_DEBUG | 132 | printk(KERN_DEBUG |
| 133 | "NWFPE: %s[%d] takes exception %08x at %p from %08lx\n", | 133 | "NWFPE: %s[%d] takes exception %08x at %p from %08lx\n", |
| 134 | current->comm, current->pid, flags, | 134 | current->comm, current->pid, flags, |
| 135 | __builtin_return_address(0), GET_USERREG()[15]); | 135 | __builtin_return_address(0), GET_USERREG()->ARM_pc); |
| 136 | #endif | 136 | #endif |
| 137 | 137 | ||
| 138 | /* Keep SoftFloat exception flags up to date. */ | 138 | /* Keep SoftFloat exception flags up to date. */ |