git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
traps.c
diff --git
a/arch/x86_64/kernel/traps.c
b/arch/x86_64/kernel/traps.c
index aac1c0be54c6b8f99c032f61f6b29f904d91977d..7fa155c394d934548df7fedce29d9a554fa5bfbc 100644
(file)
--- a/
arch/x86_64/kernel/traps.c
+++ b/
arch/x86_64/kernel/traps.c
@@
-531,7
+531,7
@@
void die(const char * str, struct pt_regs * regs, long err)
unsigned long flags = oops_begin();
if (!user_mode(regs))
- report_bug(regs->rip);
+ report_bug(regs->rip
, regs
);
__die(str, regs, err);
oops_end(flags);