diff options
author | Don Zickus <dzickus@redhat.com> | 2006-09-26 04:52:27 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:27 -0400 |
commit | 2fbe7b25c8edaf2d10e6c1a4cc9f8afe714c4764 (patch) | |
tree | e4012ae3cd4519cba1836668237f077c60fb1086 /kernel | |
parent | 957dc87c1bd849440f0eef27e2ade67387001e13 (diff) |
[PATCH] i386/x86-64: Remove un/set_nmi_callback and reserve/release_lapic_nmi functions
Removes the un/set_nmi_callback and reserve/release_lapic_nmi functions as
they are no longer needed. The various subsystems are modified to register
with the die_notifier instead.
Also includes compile fixes by Andrew Morton.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sysctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 362a0cc37138..83f168361624 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -76,8 +76,6 @@ extern int compat_log; | |||
76 | 76 | ||
77 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) | 77 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) |
78 | int unknown_nmi_panic; | 78 | int unknown_nmi_panic; |
79 | extern int proc_unknown_nmi_panic(ctl_table *, int, struct file *, | ||
80 | void __user *, size_t *, loff_t *); | ||
81 | #endif | 79 | #endif |
82 | 80 | ||
83 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ | 81 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ |
@@ -628,7 +626,7 @@ static ctl_table kern_table[] = { | |||
628 | .data = &unknown_nmi_panic, | 626 | .data = &unknown_nmi_panic, |
629 | .maxlen = sizeof (int), | 627 | .maxlen = sizeof (int), |
630 | .mode = 0644, | 628 | .mode = 0644, |
631 | .proc_handler = &proc_unknown_nmi_panic, | 629 | .proc_handler = &proc_dointvec, |
632 | }, | 630 | }, |
633 | #endif | 631 | #endif |
634 | #if defined(CONFIG_X86) | 632 | #if defined(CONFIG_X86) |