- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / ppc64 / kernel / udbg.c

diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c
index 7d5f518..d4ccd6f 100644 (file)
--- a/arch/ppc64/kernel/udbg.c
+++ b/arch/ppc64/kernel/udbg.c
@@ -15,7 +15,6 @@
 #include <linux/types.h>
 #include <asm/ppcdebug.h>
 #include <asm/processor.h>
-#include <asm/naca.h>
 #include <asm/uaccess.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
@@ -323,7 +322,7 @@ void udbg_printf(const char *fmt, ...)
 /* Special print used by PPCDBG() macro */
 void udbg_ppcdbg(unsigned long debug_flags, const char *fmt, ...)
 {
-       unsigned long active_debugs = debug_flags & naca->debug_switch;
+       unsigned long active_debugs = debug_flags & ppc64_debug_switch;
 
        if (active_debugs) {
                va_list ap;
@@ -357,5 +356,5 @@ void udbg_ppcdbg(unsigned long debug_flags, const char *fmt, ...)
 
 unsigned long udbg_ifdebug(unsigned long flags)
 {
-       return (flags & naca->debug_switch);
+       return (flags & ppc64_debug_switch);
 }