diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 14:41:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 14:41:20 -0700 |
| commit | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e (patch) | |
| tree | 8b2142b2ed4a4951b4d7fc13739b6207730e6b04 /arch/x86/kernel/setup.c | |
| parent | 57675e6e75c18f279b944dc2397cc9fd0053845e (diff) | |
| parent | a4928cffe6435caf427ae673131a633c1329dbf3 (diff) | |
| download | kernel_samsung_smdk4412-b69d3987f4360a5e7e9e55465b3cdd0cc204b79e.tar.gz kernel_samsung_smdk4412-b69d3987f4360a5e7e9e55465b3cdd0cc204b79e.tar.bz2 kernel_samsung_smdk4412-b69d3987f4360a5e7e9e55465b3cdd0cc204b79e.zip | |
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 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0d1f44ae6ee..c0c68c18a78 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -18,8 +18,6 @@ unsigned disabled_cpus __cpuinitdata; unsigned int boot_cpu_physical_apicid = -1U; EXPORT_SYMBOL(boot_cpu_physical_apicid); -physid_mask_t phys_cpu_present_map; - DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID; EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); |