From 7d651021b2ee1444615fcc7637b9cae0a75a7e50 Mon Sep 17 00:00:00 2001
From: Li-Ta Lo <ollie@lanl.gov>
Date: Sat, 2 Dec 2000 03:33:36 +0000
Subject: [PATCH] l2_cache.c works fine, put DBG back to printk.h

---
 src/cpu/p6/l2_cache.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/cpu/p6/l2_cache.c b/src/cpu/p6/l2_cache.c
index 0c3c281363..9c421e79c8 100644
--- a/src/cpu/p6/l2_cache.c
+++ b/src/cpu/p6/l2_cache.c
@@ -31,10 +31,10 @@
 #include <cpu/p6/msr.h>
 #include <cpu/p6/mtrr.h>
 #include <cpu/p5/cpuid.h>
-#include <printk.h>
 
 /* Include debugging code and outputs */
 #define DEBUG
+#include <printk.h>
 
 static int signal_l2(unsigned int address_high,
 		     unsigned int address_low,
@@ -54,12 +54,6 @@ static int calculate_l2_cache_size(void);
 static int calculate_l2_physical_address_range(void);
 static int calculate_l2_ecc(void);
 
-#ifdef DEBUG
-#define DBG(x...) printk(KERN_DEBUG x)
-#else
-#define DBG(x...)
-#endif
-
 static void cache_disable(void)
 {
 	unsigned int tmp;
@@ -135,8 +129,7 @@ int intel_l2_configure()
 		/* Mask out [22-24] Clock frequency ratio */
 		eax &= 0x1c00000;
 		if (eax == 0xc00000 || eax == 0x1000000) {
-			printk(KERN_ERR
-			       "Incorrect clock frequency ratio %x\n",
+			printk(KERN_ERR "Incorrect clock frequency ratio %x\n",
 			       eax);
 			goto bad;
 		}
@@ -176,8 +169,7 @@ int intel_l2_configure()
 		/* Mask out [22-24] Clock frequency ratio */
 		eax &= 0x3c00000;
 		if (eax == 0xc00000 || eax == 0x3000000) {
-			printk(KERN_ERR
-			       "Incorrect clock frequency ratio %x\n",
+			printk(KERN_ERR "Incorrect clock frequency ratio %x\n",
 			       eax);
 			goto bad;
 		}