Skip to content

L
linux
Commit 19b97868 authored by Len Brown's avatar Len Brown
Browse files
Options

[ACPI] fix printk and build warning from previous csets

parent a5126d7d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
arch/i386/kernel/bootflag.c
View file @ 19b97868
...@@ -48,7 +48,7 @@ static void __init sbf_write(u8 v) ...@@ -48,7 +48,7 @@ static void __init sbf_write(u8 v)
if(!parity(v)) if(!parity(v))
v|=SBF_PARITY; 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); spin_lock_irqsave(&rtc_lock, flags);
CMOS_WRITE(v, sbf_port); CMOS_WRITE(v, sbf_port);
......
include/asm-i386/acpi.h
View file @ 19b97868
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/system.h> /* defines cmpxchg */
#define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_INT64 long long
#define COMPILER_DEPENDENT_UINT64 unsigned long long #define COMPILER_DEPENDENT_UINT64 unsigned long long
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7