diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 12:47:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 12:47:28 -0500 |
| commit | 810ee58de26c9c1255d716b1db7344c4a1093fec (patch) | |
| tree | 176531e4e4989ec7a8996a356b1a79ae7b647568 /arch/x86/include/asm/timex.h | |
| parent | 2927fceafc91afe744e0d1d33f8bbf98c42668fc (diff) | |
| parent | e88a0faae5baaaa3bdc6f23a55ad6bc7a7b4aa77 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (29 commits)
xen: unitialised return value in xenbus_write_transaction
x86: fix section mismatch warning
x86: unmask CPUID levels on Intel CPUs, fix
x86: work around PAGE_KERNEL_WC not getting WC in iomap_atomic_prot_pfn.
x86: use standard PIT frequency
xen: handle highmem pages correctly when shrinking a domain
x86, mm: fix pte_free()
xen: actually release memory when shrinking domain
x86: unmask CPUID levels on Intel CPUs
x86: add MSR_IA32_MISC_ENABLE bits to <asm/msr-index.h>
x86: fix PTE corruption issue while mapping RAM using /dev/mem
x86: mtrr fix debug boot parameter
x86: fix page attribute corruption with cpa()
Revert "x86: signal: change type of paramter for sys_rt_sigreturn()"
x86: use early clobbers in usercopy*.c
x86: remove kernel_physical_mapping_init() from init section
fix: crash: IP: __bitmap_intersects+0x48/0x73
cpufreq: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write
work_on_cpu: Use our own workqueue.
work_on_cpu: don't try to get_online_cpus() in work_on_cpu.
...
Diffstat (limited to 'arch/x86/include/asm/timex.h')
| -rw-r--r-- | arch/x86/include/asm/timex.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/x86/include/asm/timex.h b/arch/x86/include/asm/timex.h index 1287dc1347d6..b5c9d45c981f 100644 --- a/arch/x86/include/asm/timex.h +++ b/arch/x86/include/asm/timex.h | |||
| @@ -1,18 +1,13 @@ | |||
| 1 | /* x86 architecture timex specifications */ | ||
| 2 | #ifndef _ASM_X86_TIMEX_H | 1 | #ifndef _ASM_X86_TIMEX_H |
| 3 | #define _ASM_X86_TIMEX_H | 2 | #define _ASM_X86_TIMEX_H |
| 4 | 3 | ||
| 5 | #include <asm/processor.h> | 4 | #include <asm/processor.h> |
| 6 | #include <asm/tsc.h> | 5 | #include <asm/tsc.h> |
| 7 | 6 | ||
| 8 | #ifdef CONFIG_X86_ELAN | 7 | /* The PIT ticks at this frequency (in HZ): */ |
| 9 | # define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */ | 8 | #define PIT_TICK_RATE 1193182 |
| 10 | #elif defined(CONFIG_X86_RDC321X) | 9 | |
| 11 | # define PIT_TICK_RATE 1041667 /* Underlying HZ for R8610 */ | 10 | #define CLOCK_TICK_RATE PIT_TICK_RATE |
| 12 | #else | ||
| 13 | # define PIT_TICK_RATE 1193182 /* Underlying HZ */ | ||
| 14 | #endif | ||
| 15 | #define CLOCK_TICK_RATE PIT_TICK_RATE | ||
| 16 | 11 | ||
| 17 | #define ARCH_HAS_READ_CURRENT_TIMER | 12 | #define ARCH_HAS_READ_CURRENT_TIMER |
| 18 | 13 | ||