git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc64
/
xmon
/
start.c
diff --git
a/arch/ppc64/xmon/start.c
b/arch/ppc64/xmon/start.c
index
c61770c
..
a9265bc
100644
(file)
--- a/
arch/ppc64/xmon/start.c
+++ b/
arch/ppc64/xmon/start.c
@@
-35,12
+35,12
@@
static struct sysrq_key_op sysrq_xmon_op =
{
.handler = sysrq_handle_xmon,
.help_msg = "Xmon",
{
.handler = sysrq_handle_xmon,
.help_msg = "Xmon",
- .action_msg = "Entering xmon
\n
",
+ .action_msg = "Entering xmon",
};
static int __init setup_xmon_sysrq(void)
{
};
static int __init setup_xmon_sysrq(void)
{
-
__sysrq_put_key_op
('x', &sysrq_xmon_op);
+
register_sysrq_key
('x', &sysrq_xmon_op);
return 0;
}
__initcall(setup_xmon_sysrq);
return 0;
}
__initcall(setup_xmon_sysrq);
@@
-173,7
+173,7
@@
xmon_fgets(char *str, int nb, void *f)
c = xmon_getchar();
if (c == -1) {
if (p == str)
c = xmon_getchar();
if (c == -1) {
if (p == str)
- return
0
;
+ return
NULL
;
break;
}
*p++ = c;
break;
}
*p++ = c;