diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:34:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:34:07 +1100 |
| commit | 051bc26320414918b69a4513614c3987f3e29bc6 (patch) | |
| tree | 5de5d4d62e305da4e44a65f5b4602c7165e2f92f /arch/sparc/kernel/nmi.c | |
| parent | cdcecfd45dfcaf35b11b9870ba75615992d2288f (diff) | |
| parent | 753999f751ab57630f368a73a465cb8a7b5b99b6 (diff) | |
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'arch/sparc/kernel/nmi.c')
| -rw-r--r-- | arch/sparc/kernel/nmi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index a4bd7ba74c89..300f810142f5 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c @@ -270,8 +270,6 @@ int __init nmi_init(void) atomic_set(&nmi_active, -1); } } - if (!err) - init_hw_perf_events(); return err; } |