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 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
rtc.c
diff --git
a/drivers/char/rtc.c
b/drivers/char/rtc.c
index
1b3b258
..
3f2bb4f
100644
(file)
--- a/
drivers/char/rtc.c
+++ b/
drivers/char/rtc.c
@@
-177,7
+177,7
@@
static unsigned long rtc_max_user_freq = 64; /* > this, need CAP_SYS_RESOURCE */
/*
* rtc_task_lock nests inside rtc_lock.
*/
/*
* rtc_task_lock nests inside rtc_lock.
*/
-static
spinlock_t rtc_task_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(rtc_task_lock)
;
static rtc_task_t *rtc_callback = NULL;
#endif
static rtc_task_t *rtc_callback = NULL;
#endif
@@
-878,7
+878,7
@@
static struct miscdevice rtc_dev=
&rtc_fops
};
&rtc_fops
};
-#if
def RTC_IRQ
+#if
defined(RTC_IRQ) && !defined(__sparc__)
static irqreturn_t (*rtc_int_handler_ptr)(int irq, void *dev_id, struct pt_regs *regs);
#endif
static irqreturn_t (*rtc_int_handler_ptr)(int irq, void *dev_id, struct pt_regs *regs);
#endif