Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0f61dbcd
Commit
0f61dbcd
authored
Jan 30, 2004
by
Andrew Morton
Committed by
Linus Torvalds
Jan 30, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] ppc64: use CONFIG_MAGIC_SYSRQ around xmon sysrq code
From: Anton Blanchard <anton@samba.org>
parent
326f372c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
arch/ppc64/xmon/start.c
arch/ppc64/xmon/start.c
+8
-0
No files found.
arch/ppc64/xmon/start.c
View file @
0f61dbcd
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
#include <linux/config.h>
#include <linux/config.h>
#include <linux/string.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/sysrq.h>
#include <linux/sysrq.h>
#include <asm/machdep.h>
#include <asm/machdep.h>
#include <asm/io.h>
#include <asm/io.h>
...
@@ -29,11 +30,14 @@ static inline unsigned int readtb(void)
...
@@ -29,11 +30,14 @@ static inline unsigned int readtb(void)
return
ret
;
return
ret
;
}
}
#ifdef CONFIG_MAGIC_SYSRQ
static
void
sysrq_handle_xmon
(
int
key
,
struct
pt_regs
*
pt_regs
,
static
void
sysrq_handle_xmon
(
int
key
,
struct
pt_regs
*
pt_regs
,
struct
tty_struct
*
tty
)
struct
tty_struct
*
tty
)
{
{
xmon
(
pt_regs
);
xmon
(
pt_regs
);
}
}
static
struct
sysrq_key_op
sysrq_xmon_op
=
static
struct
sysrq_key_op
sysrq_xmon_op
=
{
{
.
handler
=
sysrq_handle_xmon
,
.
handler
=
sysrq_handle_xmon
,
...
@@ -41,11 +45,15 @@ static struct sysrq_key_op sysrq_xmon_op =
...
@@ -41,11 +45,15 @@ static struct sysrq_key_op sysrq_xmon_op =
.
action_msg
=
"Entering xmon
\n
"
,
.
action_msg
=
"Entering xmon
\n
"
,
};
};
#endif
/* CONFIG_MAGIC_SYSRQ */
void
void
xmon_map_scc
(
void
)
xmon_map_scc
(
void
)
{
{
#ifdef CONFIG_MAGIC_SYSRQ
/* This maybe isn't the best place to register sysrq 'x' */
/* This maybe isn't the best place to register sysrq 'x' */
__sysrq_put_key_op
(
'x'
,
&
sysrq_xmon_op
);
__sysrq_put_key_op
(
'x'
,
&
sysrq_xmon_op
);
#endif
/* CONFIG_MAGIC_SYSRQ */
}
}
int
int
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment