aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2010-12-13 10:31:58 -0500
committerIngo Molnar <mingo@elte.hu>2010-12-13 12:23:23 -0500
commit5f29805a4f4627e766f862ff9f10c14f5f314359 (patch)
tree4feba54ee18763121e9b2424f47c880709cd68cd /kernel/perf_event.c
parent67b96c182c36c83cd6881122b4a7922b2634047b (diff)
x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled
When adjusting the code to handle removing the old nmi watchdog, I forgot to consider the compile case when the local apic is not enabled. This change fixes the following build error: arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of ‘touch_nmi_watchdog’ Signed-off-by: Don Zickus <dzickus@redhat.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Rakib Mullick <rakib.mullick@gmail.com> LKML-Reference: <20101213153719.GD18577@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions