git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
char
/
sysrq.c
diff --git
a/drivers/char/sysrq.c
b/drivers/char/sysrq.c
index
50eecfe
..
44203ff
100644
(file)
--- a/
drivers/char/sysrq.c
+++ b/
drivers/char/sysrq.c
@@
-26,7
+26,7
@@
#include <linux/proc_fs.h>
#include <linux/nmi.h>
#include <linux/quotaops.h>
#include <linux/proc_fs.h>
#include <linux/nmi.h>
#include <linux/quotaops.h>
-#include <linux/perf_
counter
.h>
+#include <linux/perf_
event
.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/suspend.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/suspend.h>
@@
-252,7
+252,7
@@
static void sysrq_handle_showregs(int key, struct tty_struct *tty)
struct pt_regs *regs = get_irq_regs();
if (regs)
show_regs(regs);
struct pt_regs *regs = get_irq_regs();
if (regs)
show_regs(regs);
- perf_
counter
_print_debug();
+ perf_
event
_print_debug();
}
static struct sysrq_key_op sysrq_showregs_op = {
.handler = sysrq_handle_showregs,
}
static struct sysrq_key_op sysrq_showregs_op = {
.handler = sysrq_handle_showregs,