diff options
| author | Don Zickus <dzickus@redhat.com> | 2006-09-26 04:52:26 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:26 -0400 |
| commit | b7471c6da94d30d3deadc55986cc38d1ff57f9ca (patch) | |
| tree | 6aa23314273763acccbe9ddd0b8bd442edde0509 /arch/i386/oprofile | |
| parent | f2802e7f571c05f9a901b1f5bd144aa730ccc88e (diff) | |
[PATCH] i386: Add SMP support on i386 to reservation framework
This patch includes the changes to make the nmi watchdog on i386 SMP aware.
A bunch of code was moved around to make it simpler to read. In addition,
it is now possible to determine if a particular NMI was the result of the
watchdog or not. This feature allows the kernel to filter out unknown NMIs
easier.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/oprofile')
| -rw-r--r-- | arch/i386/oprofile/nmi_timer_int.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/oprofile/nmi_timer_int.c b/arch/i386/oprofile/nmi_timer_int.c index 930a1127bb30..a33a73bb502d 100644 --- a/arch/i386/oprofile/nmi_timer_int.c +++ b/arch/i386/oprofile/nmi_timer_int.c | |||
| @@ -42,9 +42,7 @@ static void timer_stop(void) | |||
| 42 | 42 | ||
| 43 | int __init op_nmi_timer_init(struct oprofile_operations * ops) | 43 | int __init op_nmi_timer_init(struct oprofile_operations * ops) |
| 44 | { | 44 | { |
| 45 | extern int nmi_active; | 45 | if (atomic_read(&nmi_active) <= 0) |
| 46 | |||
| 47 | if (nmi_active <= 0) | ||
| 48 | return -ENODEV; | 46 | return -ENODEV; |
| 49 | 47 | ||
| 50 | ops->start = timer_start; | 48 | ops->start = timer_start; |