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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
m68k
/
bvme6000
/
rtc.c
diff --git
a/arch/m68k/bvme6000/rtc.c
b/arch/m68k/bvme6000/rtc.c
index
e30fa33
..
c6b2a41
100644
(file)
--- a/
arch/m68k/bvme6000/rtc.c
+++ b/
arch/m68k/bvme6000/rtc.c
@@
-44,7
+44,7
@@
static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;
unsigned char msr;
unsigned long flags;
volatile RtcPtr_t rtc = (RtcPtr_t)BVME_RTC_BASE;
unsigned char msr;
unsigned long flags;
- struct rtc_time wtime;
+ struct rtc_time wtime;
switch (cmd) {
case RTC_RD_TIME: /* Read the time/date from RTC */
switch (cmd) {
case RTC_RD_TIME: /* Read the time/date from RTC */
@@
-105,7
+105,7
@@
static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
if (yrs >= 2070)
return -EINVAL;
if (yrs >= 2070)
return -EINVAL;
-
+
local_irq_save(flags);
/* Ensure clock and real-time-mode-register are accessible */
msr = rtc->msr & 0xc0;
local_irq_save(flags);
/* Ensure clock and real-time-mode-register are accessible */
msr = rtc->msr & 0xc0;