diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-16 01:04:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:47 -0400 |
commit | f40cbaa5b0a4719489e6e7947351c99a159aca30 (patch) | |
tree | 3e5ce20d5f56acabe588344dd187228d12343541 /fs | |
parent | ac0d86f5809598ddcd6bfa0ea8245ccc910e9eac (diff) |
proc: move sysrq-trigger out of fs/proc/
Move it into sysrq.c, along with the rest of the sysrq implementation.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/proc_misc.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index b675a49c1823..59ea42e1ef03 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <linux/blkdev.h> | 45 | #include <linux/blkdev.h> |
46 | #include <linux/hugetlb.h> | 46 | #include <linux/hugetlb.h> |
47 | #include <linux/jiffies.h> | 47 | #include <linux/jiffies.h> |
48 | #include <linux/sysrq.h> | ||
49 | #include <linux/vmalloc.h> | 48 | #include <linux/vmalloc.h> |
50 | #include <linux/crash_dump.h> | 49 | #include <linux/crash_dump.h> |
51 | #include <linux/pid_namespace.h> | 50 | #include <linux/pid_namespace.h> |
@@ -704,28 +703,6 @@ static int execdomains_read_proc(char *page, char **start, off_t off, | |||
704 | return proc_calc_metrics(page, start, off, count, eof, len); | 703 | return proc_calc_metrics(page, start, off, count, eof, len); |
705 | } | 704 | } |
706 | 705 | ||
707 | #ifdef CONFIG_MAGIC_SYSRQ | ||
708 | /* | ||
709 | * writing 'C' to /proc/sysrq-trigger is like sysrq-C | ||
710 | */ | ||
711 | static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, | ||
712 | size_t count, loff_t *ppos) | ||
713 | { | ||
714 | if (count) { | ||
715 | char c; | ||
716 | |||
717 | if (get_user(c, buf)) | ||
718 | return -EFAULT; | ||
719 | __handle_sysrq(c, NULL, 0); | ||
720 | } | ||
721 | return count; | ||
722 | } | ||
723 | |||
724 | static const struct file_operations proc_sysrq_trigger_operations = { | ||
725 | .write = write_sysrq_trigger, | ||
726 | }; | ||
727 | #endif | ||
728 | |||
729 | #ifdef CONFIG_PROC_PAGE_MONITOR | 706 | #ifdef CONFIG_PROC_PAGE_MONITOR |
730 | #define KPMSIZE sizeof(u64) | 707 | #define KPMSIZE sizeof(u64) |
731 | #define KPMMASK (KPMSIZE - 1) | 708 | #define KPMMASK (KPMSIZE - 1) |
@@ -934,7 +911,4 @@ void __init proc_misc_init(void) | |||
934 | #ifdef CONFIG_PROC_VMCORE | 911 | #ifdef CONFIG_PROC_VMCORE |
935 | proc_vmcore = proc_create("vmcore", S_IRUSR, NULL, &proc_vmcore_operations); | 912 | proc_vmcore = proc_create("vmcore", S_IRUSR, NULL, &proc_vmcore_operations); |
936 | #endif | 913 | #endif |
937 | #ifdef CONFIG_MAGIC_SYSRQ | ||
938 | proc_create("sysrq-trigger", S_IWUSR, NULL, &proc_sysrq_trigger_operations); | ||
939 | #endif | ||
940 | } | 914 | } |