summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-21 13:02:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-21 13:02:00 -0700
commit3488007afc139929cfd16ab98670f87749d4f6fd (patch)
treeb3beca26b87b869eb824baf68002b3b968978c59 /include
parent47c317a7aaa2fbac03811a569829fa954e641520 (diff)
parentcfc1b9a6a683c835a20d5b565ade55baf639f72f (diff)
downloadlinux-3488007afc139929cfd16ab98670f87749d4f6fd.tar.gz
linux-3488007afc139929cfd16ab98670f87749d4f6fd.tar.bz2
linux-3488007afc139929cfd16ab98670f87749d4f6fd.zip
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: convert Dprintk to pr_debug
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/apic.h2
-rw-r--r--include/asm-x86/mach-default/smpboot_hooks.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index b96460a7190d..133c998161ca 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -12,8 +12,6 @@
#define ARCH_APICTIMER_STOPS_ON_C3 1
-#define Dprintk printk
-
/*
* Debugging macros
*/
diff --git a/include/asm-x86/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h
index 56d001b9dce4..dbab36d64d48 100644
--- a/include/asm-x86/mach-default/smpboot_hooks.h
+++ b/include/asm-x86/mach-default/smpboot_hooks.h
@@ -12,11 +12,11 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
{
CMOS_WRITE(0xa, 0xf);
local_flush_tlb();
- Dprintk("1.\n");
+ pr_debug("1.\n");
*((volatile unsigned short *) TRAMPOLINE_HIGH) = start_eip >> 4;
- Dprintk("2.\n");
+ pr_debug("2.\n");
*((volatile unsigned short *) TRAMPOLINE_LOW) = start_eip & 0xf;
- Dprintk("3.\n");
+ pr_debug("3.\n");
}
static inline void smpboot_restore_warm_reset_vector(void)