git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
acpi
/
sleep
/
proc.c
diff --git
a/drivers/acpi/sleep/proc.c
b/drivers/acpi/sleep/proc.c
index
607cfdd
..
fd7c5a0
100644
(file)
--- a/
drivers/acpi/sleep/proc.c
+++ b/
drivers/acpi/sleep/proc.c
@@
-84,10
+84,11
@@
static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
u32 sec, min, hr;
u32 day, mo, yr;
unsigned char rtc_control = 0;
u32 sec, min, hr;
u32 day, mo, yr;
unsigned char rtc_control = 0;
+ unsigned long flags;
ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
- spin_lock
(&rtc_lock
);
+ spin_lock
_irqsave(&rtc_lock, flags
);
sec = CMOS_READ(RTC_SECONDS_ALARM);
min = CMOS_READ(RTC_MINUTES_ALARM);
sec = CMOS_READ(RTC_SECONDS_ALARM);
min = CMOS_READ(RTC_MINUTES_ALARM);
@@
-109,7
+110,7
@@
static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
else
yr = CMOS_READ(RTC_YEAR);
else
yr = CMOS_READ(RTC_YEAR);
- spin_unlock
(&rtc_lock
);
+ spin_unlock
_irqrestore(&rtc_lock, flags
);
if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
BCD_TO_BIN(sec);
if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
BCD_TO_BIN(sec);