x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog

[deliverable/linux.git] / arch / x86 / oprofile / nmi_timer_int.c

diff --git a/arch/x86/oprofile/nmi_timer_int.c b/arch/x86/oprofile/nmi_timer_int.c
index 1418e36ae7aba63e0274b45618370142ceb4b53d..0636dd93cef8d64a718124ddfa7c5a02edd2174f 100644 (file)
--- a/arch/x86/oprofile/nmi_timer_int.c
+++ b/arch/x86/oprofile/nmi_timer_int.c
@@ -17,14 +17,14 @@
 #include <asm/nmi.h>
 #include <asm/apic.h>
 #include <asm/ptrace.h>
- 
+
 static int profile_timer_exceptions_notify(struct notifier_block *self,
                                           unsigned long val, void *data)
 {
        struct die_args *args = (struct die_args *)data;
        int ret = NOTIFY_DONE;
 
-       switch(val) {
+       switch (val) {
        case DIE_NMI:
                oprofile_add_sample(args->regs, 0);
                ret = NOTIFY_STOP;
@@ -56,11 +56,8 @@ static void timer_stop(void)
 }
 
 
-int __init op_nmi_timer_init(struct oprofile_operations * ops)
+int __init op_nmi_timer_init(struct oprofile_operations *ops)
 {
-       if ((nmi_watchdog != NMI_IO_APIC) || (atomic_read(&nmi_active) <= 0))
-               return -ENODEV;
-
        ops->start = timer_start;
        ops->stop = timer_stop;
        ops->cpu_type = "timer";