From 981210e24836070610ebe2f0fbcb596a831e1125 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 1 Jun 2010 11:45:45 +0200
Subject: [PATCH] --- yaml --- r: 199757 b: refs/heads/master c:
 c8fcb14fecac72bb2cd2974cf133fba6c4b4a13d h: refs/heads/master i:   199755:
 382cc39150df2d27eafcc0df28324ee22e7b0f63 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/setup_percpu.c | 6 ------
 trunk/arch/x86/mm/numa.c             | 6 ------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index f7fd4b7f8447..c3e31fe80b76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7f0776975334070a93370ae048fda0c31a91c38
+refs/heads/master: c8fcb14fecac72bb2cd2974cf133fba6c4b4a13d
diff --git a/trunk/arch/x86/kernel/setup_percpu.c b/trunk/arch/x86/kernel/setup_percpu.c
index a867940a6dfc..401ff1085a4d 100644
--- a/trunk/arch/x86/kernel/setup_percpu.c
+++ b/trunk/arch/x86/kernel/setup_percpu.c
@@ -21,12 +21,6 @@
 #include <asm/cpu.h>
 #include <asm/stackprotector.h>
 
-#ifdef CONFIG_DEBUG_PER_CPU_MAPS
-# define DBG(fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)
-#else
-# define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)
-#endif
-
 DEFINE_PER_CPU(int, cpu_number);
 EXPORT_PER_CPU_SYMBOL(cpu_number);
 
diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c
index 550df481accd..787c52ca49c3 100644
--- a/trunk/arch/x86/mm/numa.c
+++ b/trunk/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
  */