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/include/asm/timer.h | |
| 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/include/asm/timer.h')
| -rw-r--r-- | arch/x86/include/asm/timer.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index 5469630b27f5..fa7b9176b76c 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h | |||
| @@ -10,12 +10,6 @@ | |||
| 10 | unsigned long long native_sched_clock(void); | 10 | unsigned long long native_sched_clock(void); |
| 11 | extern int recalibrate_cpu_khz(void); | 11 | extern int recalibrate_cpu_khz(void); |
| 12 | 12 | ||
| 13 | #if defined(CONFIG_X86_32) && defined(CONFIG_X86_IO_APIC) | ||
| 14 | extern int timer_ack; | ||
| 15 | #else | ||
| 16 | # define timer_ack (0) | ||
| 17 | #endif | ||
| 18 | |||
| 19 | extern int no_timer_check; | 13 | extern int no_timer_check; |
| 20 | 14 | ||
| 21 | /* Accelerators for sched_clock() | 15 | /* Accelerators for sched_clock() |