diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 02:47:22 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 02:47:22 +0400 |
commit | 167b7129042a4b4c09bb4ede5482ff79340a3999 (patch) | |
tree | f47e59a99feaa32a625fb0e720c9914d2e364444 /arch/x86/mm/numa.c | |
parent | 39059cceeda478cd040d521b9541d1113035c908 (diff) | |
parent | 4adc8b71cc142f9a7b44b13b99aab38ba897c56f (diff) | |
download | linux-167b7129042a4b4c09bb4ede5482ff79340a3999.tar.xz |
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:
x86, smpboot: Fix cores per node printing on boot
x86/amd-iommu: Fall back to GART if initialization fails
x86/amd-iommu: Fix crash when request_mem_region fails
x86/mm: Remove unused DBG() macro
arch/x86/kernel: Add missing spin_unlock
Diffstat (limited to 'arch/x86/mm/numa.c')
-rw-r--r-- | arch/x86/mm/numa.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 550df481accd..787c52ca49c3 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -3,12 +3,6 @@ #include <linux/module.h> #include <linux/bootmem.h> -#ifdef CONFIG_DEBUG_PER_CPU_MAPS -# define DBG(x...) printk(KERN_DEBUG x) -#else -# define DBG(x...) -#endif - /* * Which logical CPUs are on which nodes */ |