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
03b4f20
..
3f2bb4f
100644
(file)
--- a/
drivers/char/rtc.c
+++ b/
drivers/char/rtc.c
@@
-97,6
+97,10
@@
static unsigned long rtc_port;
static int rtc_irq = PCI_IRQ_NONE;
#endif
static int rtc_irq = PCI_IRQ_NONE;
#endif
+#ifdef CONFIG_HPET_RTC_IRQ
+#undef RTC_IRQ
+#endif
+
#ifdef RTC_IRQ
static int rtc_has_irq = 1;
#endif
#ifdef RTC_IRQ
static int rtc_has_irq = 1;
#endif
@@
-173,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
@@
-504,7
+508,7
@@
static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
unsigned char mon, day, hrs, min, sec, leap_yr;
unsigned char save_control, save_freq_select;
unsigned int yrs;
unsigned char mon, day, hrs, min, sec, leap_yr;
unsigned char save_control, save_freq_select;
unsigned int yrs;
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
unsigned int real_yrs;
#endif
unsigned int real_yrs;
#endif
@@
-540,7
+544,7
@@
static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
return -EINVAL;
spin_lock_irq(&rtc_lock);
return -EINVAL;
spin_lock_irq(&rtc_lock);
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
real_yrs = yrs;
yrs = 72;
real_yrs = yrs;
yrs = 72;
@@
-579,7
+583,7
@@
static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
#endif
CMOS_WRITE(yrs, RTC_YEAR);
CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
#endif
CMOS_WRITE(yrs, RTC_YEAR);
@@
-874,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
@@
-970,7
+974,7
@@
no_irq:
release_region(RTC_PORT(0), RTC_IO_EXTENT);
return -ENODEV;
}
release_region(RTC_PORT(0), RTC_IO_EXTENT);
return -ENODEV;
}
- if (
create_proc_read_entry ("driver/rtc", 0, 0, rtc_read_proc, NULL) == NULL
) {
+ if (
!create_proc_read_entry ("driver/rtc", 0, NULL, rtc_read_proc, NULL)
) {
#ifdef RTC_IRQ
free_irq(RTC_IRQ, NULL);
#endif
#ifdef RTC_IRQ
free_irq(RTC_IRQ, NULL);
#endif
@@
-1209,7
+1213,7
@@
void rtc_get_rtc_time(struct rtc_time *rtc_tm)
{
unsigned long uip_watchdog = jiffies;
unsigned char ctrl;
{
unsigned long uip_watchdog = jiffies;
unsigned char ctrl;
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
unsigned int real_year;
#endif
unsigned int real_year;
#endif
@@
-1242,7
+1246,7
@@
void rtc_get_rtc_time(struct rtc_time *rtc_tm)
rtc_tm->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
rtc_tm->tm_mon = CMOS_READ(RTC_MONTH);
rtc_tm->tm_year = CMOS_READ(RTC_YEAR);
rtc_tm->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
rtc_tm->tm_mon = CMOS_READ(RTC_MONTH);
rtc_tm->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
real_year = CMOS_READ(RTC_DEC_YEAR);
#endif
ctrl = CMOS_READ(RTC_CONTROL);
real_year = CMOS_READ(RTC_DEC_YEAR);
#endif
ctrl = CMOS_READ(RTC_CONTROL);
@@
-1258,7
+1262,7
@@
void rtc_get_rtc_time(struct rtc_time *rtc_tm)
BCD_TO_BIN(rtc_tm->tm_year);
}
BCD_TO_BIN(rtc_tm->tm_year);
}
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
rtc_tm->tm_year += real_year - 72;
#endif
rtc_tm->tm_year += real_year - 72;
#endif