diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /arch/arm/nwfpe/fpmodule.c | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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. */ |