diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 01:41:20 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 01:41:20 +0400 |
| commit | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e (patch) | |
| tree | 8b2142b2ed4a4951b4d7fc13739b6207730e6b04 /include | |
| parent | 57675e6e75c18f279b944dc2397cc9fd0053845e (diff) | |
| parent | a4928cffe6435caf427ae673131a633c1329dbf3 (diff) | |
| download | linux-b69d3987f4360a5e7e9e55465b3cdd0cc204b79e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
"make namespacecheck" fixes
x86: fix compilation error in VisWS
x86: voyager fix
x86: Drop duplicate from setup.c
intel-iommu.c: dma ops fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/smp.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/tsc.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 62ebdec394b9..1ebaa5cd3112 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -199,7 +199,6 @@ static inline int hard_smp_processor_id(void) #ifdef CONFIG_HOTPLUG_CPU extern void cpu_exit_clear(void); extern void cpu_uninit(void); -extern void remove_siblinginfo(int cpu); #endif extern void smp_alloc_memory(void); diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h index 0434bd8349a7..d2d8eb5b55f5 100644 --- a/include/asm-x86/tsc.h +++ b/include/asm-x86/tsc.h @@ -18,7 +18,6 @@ extern unsigned int cpu_khz; extern unsigned int tsc_khz; extern void disable_TSC(void); -extern void enable_TSC(void); static inline cycles_t get_cycles(void) { |