diff options
| author |   Don Zickus <dzickus@redhat.com> | 2010-12-13 10:31:58 -0500 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2010-12-13 18:23:23 +0100 |
| commit | 5f29805a4f4627e766f862ff9f10c14f5f314359 (patch) | |
| tree | 4feba54ee18763121e9b2424f47c880709cd68cd /tools/perf/scripts/python/syscall-counts.py | |
| parent | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core (diff) | |
| download | linux-rng-5f29805a4f4627e766f862ff9f10c14f5f314359.tar.xz linux-rng-5f29805a4f4627e766f862ff9f10c14f5f314359.zip | |
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 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions