* [sparc32] [4/4] rtc warnings and link errors
@ 2004-12-21 11:42 William Lee Irwin III
2004-12-22 4:07 ` Bob Breuer
2004-12-22 9:06 ` William Lee Irwin III
0 siblings, 2 replies; 3+ messages in thread
From: William Lee Irwin III @ 2004-12-21 11:42 UTC (permalink / raw)
To: sparclinux
The RTC code is throwing off warnings and link errors. This patch
fixes them up.
Index: sparc32-2.6.10-rc3/drivers/char/rtc.c
=================================--- sparc32-2.6.10-rc3.orig/drivers/char/rtc.c 2004-10-07 04:01:30.000000000 -0700
+++ sparc32-2.6.10-rc3/drivers/char/rtc.c 2004-12-21 03:27:52.060875306 -0800
@@ -878,7 +878,7 @@
&rtc_fops
};
-#ifdef 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
Index: sparc32-2.6.10-rc3/drivers/sbus/char/rtc.c
=================================--- sparc32-2.6.10-rc3.orig/drivers/sbus/char/rtc.c 2004-10-07 04:01:41.000000000 -0700
+++ sparc32-2.6.10-rc3/drivers/sbus/char/rtc.c 2004-12-21 03:29:32.959536378 -0800
@@ -20,6 +20,7 @@
#include <linux/poll.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
+#include <asm/io.h>
#include <asm/mostek.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@ -30,7 +31,7 @@
/* Retrieve the current date and time from the real time clock. */
static void get_rtc_time(struct rtc_time *t)
{
- unsigned long regs = mstk48t02_regs;
+ void * __iomem regs = mstk48t02_regs;
u8 tmp;
spin_lock_irq(&mostek_lock);
@@ -57,7 +58,7 @@
/* Set the current date and time inthe real time clock. */
void set_rtc_time(struct rtc_time *t)
{
- unsigned long regs = mstk48t02_regs;
+ void * __iomem regs = mstk48t02_regs;
u8 tmp;
spin_lock_irq(&mostek_lock);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [sparc32] [4/4] rtc warnings and link errors
2004-12-21 11:42 [sparc32] [4/4] rtc warnings and link errors William Lee Irwin III
@ 2004-12-22 4:07 ` Bob Breuer
2004-12-22 9:06 ` William Lee Irwin III
1 sibling, 0 replies; 3+ messages in thread
From: Bob Breuer @ 2004-12-22 4:07 UTC (permalink / raw)
To: sparclinux
William Lee Irwin III wrote:
> --- sparc32-2.6.10-rc3.orig/drivers/sbus/char/rtc.c 2004-10-07 04:01:41.000000000 -0700
> +++ sparc32-2.6.10-rc3/drivers/sbus/char/rtc.c 2004-12-21 03:29:32.959536378 -0800
> @@ -20,6 +20,7 @@
> #include <linux/poll.h>
> #include <linux/init.h>
> #include <linux/smp_lock.h>
> +#include <asm/io.h>
> #include <asm/mostek.h>
In the bk snapshots, this is already fixed but in an alternate way by
including asm/io.h from asm/mostek.h.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [sparc32] [4/4] rtc warnings and link errors
2004-12-21 11:42 [sparc32] [4/4] rtc warnings and link errors William Lee Irwin III
2004-12-22 4:07 ` Bob Breuer
@ 2004-12-22 9:06 ` William Lee Irwin III
1 sibling, 0 replies; 3+ messages in thread
From: William Lee Irwin III @ 2004-12-22 9:06 UTC (permalink / raw)
To: sparclinux
William Lee Irwin III wrote:
>>--- sparc32-2.6.10-rc3.orig/drivers/sbus/char/rtc.c 2004-10-07 04:01:41.000000000 -0700
>>+++ sparc32-2.6.10-rc3/drivers/sbus/char/rtc.c 2004-12-21 03:29:32.959536378 -0800
>>@@ -20,6 +20,7 @@
>> #include <linux/poll.h>
>> #include <linux/init.h>
>> #include <linux/smp_lock.h>
>>+#include <asm/io.h>
>> #include <asm/mostek.h>
On Tue, Dec 21, 2004 at 10:07:06PM -0600, Bob Breuer wrote:
> In the bk snapshots, this is already fixed but in an alternate way by
> including asm/io.h from asm/mostek.h.
Brilliant... this is getting messy already. I may need to start some
kind of -mm -style tree to keep based off a current enough bk snapshot
while having everyone synchronized.
-- wli
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-12-22 9:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-12-21 11:42 [sparc32] [4/4] rtc warnings and link errors William Lee Irwin III
2004-12-22 4:07 ` Bob Breuer
2004-12-22 9:06 ` William Lee Irwin III
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.