[ACPI] fix printk and build warning from previous csets

19b97868 · Len Brown · a5126d7d · 19b97868 · 19b97868
Commit 19b97868 authored Mar 10, 2004 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

arch/i386/kernel/bootflag.c arch/i386/kernel/bootflag.c +1 -1

include/asm-i386/acpi.h include/asm-i386/acpi.h +2 -0

No files found.
--- a/arch/i386/kernel/bootflag.c
+++ b/arch/i386/kernel/bootflag.c
@@ -48,7 +48,7 @@ static void __init sbf_write(u8 v)
 		if(!parity(v))
 			v|=SBF_PARITY;

-		printk(KERN_INFO "Simple Boot Flag 0x%x\n", v);
+		printk(KERN_INFO "Simple Boot Flag at 0x%x set to 0x%x\n", sbf_port, v);

 		spin_lock_irqsave(&rtc_lock, flags);
 		CMOS_WRITE(v, sbf_port);

--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -28,6 +28,8 @@

 #ifdef __KERNEL__

+#include <asm/system.h>		/* defines cmpxchg */
+
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long