diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/oprofile/nmi_timer_int.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/oprofile/nmi_timer_int.c')
| -rw-r--r-- | arch/x86/oprofile/nmi_timer_int.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/oprofile/nmi_timer_int.c b/arch/x86/oprofile/nmi_timer_int.c index e3ecb71b5790..720bf5a53c51 100644 --- a/arch/x86/oprofile/nmi_timer_int.c +++ b/arch/x86/oprofile/nmi_timer_int.c | |||
| @@ -38,7 +38,7 @@ static int profile_timer_exceptions_notify(struct notifier_block *self, | |||
| 38 | static struct notifier_block profile_timer_exceptions_nb = { | 38 | static struct notifier_block profile_timer_exceptions_nb = { |
| 39 | .notifier_call = profile_timer_exceptions_notify, | 39 | .notifier_call = profile_timer_exceptions_notify, |
| 40 | .next = NULL, | 40 | .next = NULL, |
| 41 | .priority = 0 | 41 | .priority = NMI_LOW_PRIOR, |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | static int timer_start(void) | 44 | static int timer_start(void) |
| @@ -58,9 +58,6 @@ static void timer_stop(void) | |||
| 58 | 58 | ||
| 59 | int __init op_nmi_timer_init(struct oprofile_operations *ops) | 59 | int __init op_nmi_timer_init(struct oprofile_operations *ops) |
| 60 | { | 60 | { |
| 61 | if ((nmi_watchdog != NMI_IO_APIC) || (atomic_read(&nmi_active) <= 0)) | ||
| 62 | return -ENODEV; | ||
| 63 | |||
| 64 | ops->start = timer_start; | 61 | ops->start = timer_start; |
| 65 | ops->stop = timer_stop; | 62 | ops->stop = timer_stop; |
| 66 | ops->cpu_type = "timer"; | 63 | ops->cpu_type = "timer"; |