diff options
| author | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-29 17:47:33 -0400 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /drivers/char/sysrq.c | |
| parent | 7f366784f5c2b8fc0658b5b374f4c63ee42c789f (diff) | |
| parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 50eecfe1d724..44203ff599da 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/proc_fs.h> | 26 | #include <linux/proc_fs.h> |
| 27 | #include <linux/nmi.h> | 27 | #include <linux/nmi.h> |
| 28 | #include <linux/quotaops.h> | 28 | #include <linux/quotaops.h> |
| 29 | #include <linux/perf_counter.h> | 29 | #include <linux/perf_event.h> |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/suspend.h> | 32 | #include <linux/suspend.h> |
| @@ -252,7 +252,7 @@ static void sysrq_handle_showregs(int key, struct tty_struct *tty) | |||
| 252 | struct pt_regs *regs = get_irq_regs(); | 252 | struct pt_regs *regs = get_irq_regs(); |
| 253 | if (regs) | 253 | if (regs) |
| 254 | show_regs(regs); | 254 | show_regs(regs); |
| 255 | perf_counter_print_debug(); | 255 | perf_event_print_debug(); |
| 256 | } | 256 | } |
| 257 | static struct sysrq_key_op sysrq_showregs_op = { | 257 | static struct sysrq_key_op sysrq_showregs_op = { |
| 258 | .handler = sysrq_handle_showregs, | 258 | .handler = sysrq_handle_showregs, |