projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
include
/
asm-i386
/
kdebug.h
diff --git
a/include/asm-i386/kdebug.h
b/include/asm-i386/kdebug.h
index
b3f8d5f
..
316138e
100644
(file)
--- a/
include/asm-i386/kdebug.h
+++ b/
include/asm-i386/kdebug.h
@@
-41,9
+41,16
@@
enum die_val {
DIE_PAGE_FAULT,
};
DIE_PAGE_FAULT,
};
-static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)
+static inline int notify_die(enum die_val val, const char *str,
+ struct pt_regs *regs, long err, int trap, int sig)
{
{
- struct die_args args = { .regs=regs, .str=str, .err=err, .trapnr=trap,.signr=sig };
+ struct die_args args = {
+ .regs = regs,
+ .str = str,
+ .err = err,
+ .trapnr = trap,
+ .signr = sig
+ };
return notifier_call_chain(&i386die_chain, val, &args);
}
return notifier_call_chain(&i386die_chain, val, &args);
}