Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932092AbWBXQ1d (ORCPT ); Fri, 24 Feb 2006 11:27:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932241AbWBXQ1d (ORCPT ); Fri, 24 Feb 2006 11:27:33 -0500 Received: from mo01.po.2iij.Net ([210.130.202.205]:1478 "EHLO mo01.po.2iij.net") by vger.kernel.org with ESMTP id S932092AbWBXQ1c (ORCPT ); Fri, 24 Feb 2006 11:27:32 -0500 Date: Sat, 25 Feb 2006 01:27:21 +0900 From: Yoichi Yuasa To: Andrew Morton Cc: yoichi_yuasa@tripeaks.co.jp, linux-kernel@vger.kernel.org, Ralf Baechle Subject: [-mm PATCH] mips: fixed collision of rtc function name Message-Id: <20060225012721.52c4827b.yoichi_yuasa@tripeaks.co.jp> In-Reply-To: <20060224031002.0f7ff92a.akpm@osdl.org> References: <20060224031002.0f7ff92a.akpm@osdl.org> Organization: TriPeaks Corporation X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 14287 Lines: 341 Hi, This patch has fixed the collision of rtc function name on 2.6.16-rc4-mm2. Yoichi Signed-off-by: Yoichi Yuasa diff -pruN -X dontdiff mm2-orig/arch/mips/ddb5xxx/common/rtc_ds1386.c mm2/arch/mips/ddb5xxx/common/rtc_ds1386.c --- mm2-orig/arch/mips/ddb5xxx/common/rtc_ds1386.c 2006-02-25 01:08:51.063134250 +0900 +++ mm2/arch/mips/ddb5xxx/common/rtc_ds1386.c 2006-02-25 00:58:31.150596000 +0900 @@ -165,6 +165,6 @@ rtc_ds1386_init(unsigned long base) WRITE_RTC(0xB, byte); /* set the function pointers */ - rtc_get_time = rtc_ds1386_get_time; - rtc_set_time = rtc_ds1386_set_time; + rtc_mips_get_time = rtc_ds1386_get_time; + rtc_mips_set_time = rtc_ds1386_set_time; } diff -pruN -X dontdiff mm2-orig/arch/mips/dec/time.c mm2/arch/mips/dec/time.c --- mm2-orig/arch/mips/dec/time.c 2006-02-25 01:08:51.211143500 +0900 +++ mm2/arch/mips/dec/time.c 2006-02-25 00:59:33.010462000 +0900 @@ -193,8 +193,8 @@ static void dec_ioasic_hpt_init(unsigned void __init dec_time_init(void) { - rtc_get_time = dec_rtc_get_time; - rtc_set_mmss = dec_rtc_set_mmss; + rtc_mips_get_time = dec_rtc_get_time; + rtc_mips_set_mmss = dec_rtc_set_mmss; mips_timer_state = dec_timer_state; mips_timer_ack = dec_timer_ack; diff -pruN -X dontdiff mm2-orig/arch/mips/ite-boards/generic/time.c mm2/arch/mips/ite-boards/generic/time.c --- mm2-orig/arch/mips/ite-boards/generic/time.c 2006-02-25 01:08:51.315150000 +0900 +++ mm2/arch/mips/ite-boards/generic/time.c 2006-02-25 00:59:57.503992750 +0900 @@ -227,8 +227,8 @@ void __init it8172_time_init(void) local_irq_restore(flags); - rtc_get_time = it8172_rtc_get_time; - rtc_set_time = it8172_rtc_set_time; + rtc_mips_get_time = it8172_rtc_get_time; + rtc_mips_set_time = it8172_rtc_set_time; } #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5) diff -pruN -X dontdiff mm2-orig/arch/mips/jmr3927/common/rtc_ds1742.c mm2/arch/mips/jmr3927/common/rtc_ds1742.c --- mm2-orig/arch/mips/jmr3927/common/rtc_ds1742.c 2006-02-25 01:08:51.319150250 +0900 +++ mm2/arch/mips/jmr3927/common/rtc_ds1742.c 2006-02-25 01:01:59.797301250 +0900 @@ -159,8 +159,8 @@ rtc_ds1742_init(unsigned long base) db_assert((rtc_base & 0xe0000000) == KSEG1); /* set the function pointers */ - rtc_get_time = rtc_ds1742_get_time; - rtc_set_time = rtc_ds1742_set_time; + rtc_mips_get_time = rtc_ds1742_get_time; + rtc_mips_set_time = rtc_ds1742_set_time; /* clear oscillator stop bit */ CMOS_WRITE(RTC_READ, RTC_CONTROL); diff -pruN -X dontdiff mm2-orig/arch/mips/kernel/time.c mm2/arch/mips/kernel/time.c --- mm2-orig/arch/mips/kernel/time.c 2006-02-25 01:08:51.471159750 +0900 +++ mm2/arch/mips/kernel/time.c 2006-02-25 00:53:17.975023750 +0900 @@ -65,9 +65,9 @@ static int null_rtc_set_time(unsigned lo return 0; } -unsigned long (*rtc_get_time)(void) = null_rtc_get_time; -int (*rtc_set_time)(unsigned long) = null_rtc_set_time; -int (*rtc_set_mmss)(unsigned long); +unsigned long (*rtc_mips_get_time)(void) = null_rtc_get_time; +int (*rtc_mips_set_time)(unsigned long) = null_rtc_set_time; +int (*rtc_mips_set_mmss)(unsigned long); /* usecs per counter cycle, shifted to left by 32 bits */ @@ -437,7 +437,7 @@ irqreturn_t timer_interrupt(int irq, voi /* * If we have an externally synchronized Linux clock, then update - * CMOS clock accordingly every ~11 minutes. rtc_set_time() has to be + * CMOS clock accordingly every ~11 minutes. rtc_mips_set_time() has to be * called as close as possible to 500 ms before the new second starts. */ write_seqlock(&xtime_lock); @@ -445,7 +445,7 @@ irqreturn_t timer_interrupt(int irq, voi xtime.tv_sec > last_rtc_update + 660 && (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { - if (rtc_set_mmss(xtime.tv_sec) == 0) { + if (rtc_mips_set_mmss(xtime.tv_sec) == 0) { last_rtc_update = xtime.tv_sec; } else { /* do it again in 60 s */ @@ -562,7 +562,7 @@ asmlinkage void ll_local_timer_interrupt * b) (optional) calibrate and set the mips_hpt_frequency * (only needed if you intended to use fixed_rate_gettimeoffset * or use cpu counter as timer interrupt source) - * 2) setup xtime based on rtc_get_time(). + * 2) setup xtime based on rtc_mips_get_time(). * 3) choose a appropriate gettimeoffset routine. * 4) calculate a couple of cached variables for later usage * 5) board_timer_setup() - @@ -630,10 +630,10 @@ void __init time_init(void) if (board_time_init) board_time_init(); - if (!rtc_set_mmss) - rtc_set_mmss = rtc_set_time; + if (!rtc_mips_set_mmss) + rtc_mips_set_mmss = rtc_mips_set_time; - xtime.tv_sec = rtc_get_time(); + xtime.tv_sec = rtc_mips_get_time(); xtime.tv_nsec = 0; set_normalized_timespec(&wall_to_monotonic, @@ -769,8 +769,8 @@ void to_tm(unsigned long tim, struct rtc EXPORT_SYMBOL(rtc_lock); EXPORT_SYMBOL(to_tm); -EXPORT_SYMBOL(rtc_set_time); -EXPORT_SYMBOL(rtc_get_time); +EXPORT_SYMBOL(rtc_mips_set_time); +EXPORT_SYMBOL(rtc_mips_get_time); unsigned long long sched_clock(void) { diff -pruN -X dontdiff mm2-orig/arch/mips/lasat/setup.c mm2/arch/mips/lasat/setup.c --- mm2-orig/arch/mips/lasat/setup.c 2006-02-25 01:08:51.479160250 +0900 +++ mm2/arch/mips/lasat/setup.c 2006-02-25 01:02:31.199556750 +0900 @@ -175,8 +175,8 @@ void __init plat_setup(void) #ifdef CONFIG_DS1603 ds1603 = &ds_defs[mips_machtype]; - rtc_get_time = ds1603_read; - rtc_set_time = ds1603_set; + rtc_mips_get_time = ds1603_read; + rtc_mips_set_time = ds1603_set; #endif #ifdef DYNAMIC_SERIAL_INIT diff -pruN -X dontdiff mm2-orig/arch/mips/mips-boards/atlas/atlas_setup.c mm2/arch/mips/mips-boards/atlas/atlas_setup.c --- mm2-orig/arch/mips/mips-boards/atlas/atlas_setup.c 2006-02-25 01:08:51.555165000 +0900 +++ mm2/arch/mips/mips-boards/atlas/atlas_setup.c 2006-02-25 01:05:47.797507500 +0900 @@ -65,7 +65,7 @@ void __init plat_setup(void) board_time_init = mips_time_init; board_timer_setup = mips_timer_setup; - rtc_get_time = mips_rtc_get_time; + rtc_mips_get_time = mips_rtc_get_time; } static void __init serial_init(void) diff -pruN -X dontdiff mm2-orig/arch/mips/mips-boards/malta/malta_setup.c mm2/arch/mips/mips-boards/malta/malta_setup.c --- mm2-orig/arch/mips/mips-boards/malta/malta_setup.c 2006-02-25 01:08:51.559165250 +0900 +++ mm2/arch/mips/mips-boards/malta/malta_setup.c 2006-02-25 01:06:28.555668000 +0900 @@ -225,5 +225,5 @@ void __init plat_setup(void) board_time_init = mips_time_init; board_timer_setup = mips_timer_setup; - rtc_get_time = mips_rtc_get_time; + rtc_mips_get_time = mips_rtc_get_time; } diff -pruN -X dontdiff mm2-orig/arch/mips/momentum/jaguar_atx/setup.c mm2/arch/mips/momentum/jaguar_atx/setup.c --- mm2-orig/arch/mips/momentum/jaguar_atx/setup.c 2006-02-25 01:08:51.607168250 +0900 +++ mm2/arch/mips/momentum/jaguar_atx/setup.c 2006-02-25 01:03:37.534522500 +0900 @@ -228,8 +228,8 @@ void momenco_time_init(void) mips_hpt_frequency = cpu_clock / 2; board_timer_setup = momenco_timer_setup; - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; } static struct resource mv_pci_io_mem0_resource = { diff -pruN -X dontdiff mm2-orig/arch/mips/momentum/ocelot_3/setup.c mm2/arch/mips/momentum/ocelot_3/setup.c --- mm2-orig/arch/mips/momentum/ocelot_3/setup.c 2006-02-25 01:08:51.611168500 +0900 +++ mm2/arch/mips/momentum/ocelot_3/setup.c 2006-02-25 01:04:05.526270750 +0900 @@ -215,8 +215,8 @@ void momenco_time_init(void) mips_hpt_frequency = cpu_clock / 2; board_timer_setup = momenco_timer_setup; - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; } /* diff -pruN -X dontdiff mm2-orig/arch/mips/momentum/ocelot_c/setup.c mm2/arch/mips/momentum/ocelot_c/setup.c --- mm2-orig/arch/mips/momentum/ocelot_c/setup.c 2006-02-25 01:08:51.639170250 +0900 +++ mm2/arch/mips/momentum/ocelot_c/setup.c 2006-02-25 01:04:30.779217750 +0900 @@ -226,8 +226,8 @@ void momenco_time_init(void) printk("momenco_time_init cpu_clock=%d\n", cpu_clock); board_timer_setup = momenco_timer_setup; - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; } void __init plat_setup(void) diff -pruN -X dontdiff mm2-orig/arch/mips/pmc-sierra/yosemite/setup.c mm2/arch/mips/pmc-sierra/yosemite/setup.c --- mm2-orig/arch/mips/pmc-sierra/yosemite/setup.c 2006-02-25 01:08:51.835182500 +0900 +++ mm2/arch/mips/pmc-sierra/yosemite/setup.c 2006-02-25 01:02:57.907866750 +0900 @@ -198,8 +198,8 @@ static void __init py_rtc_setup(void) if (!m48t37_base) printk(KERN_ERR "Mapping the RTC failed\n"); - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; write_seqlock(&xtime_lock); xtime.tv_sec = m48t37y_get_time(); diff -pruN -X dontdiff mm2-orig/arch/mips/sgi-ip22/ip22-time.c mm2/arch/mips/sgi-ip22/ip22-time.c --- mm2-orig/arch/mips/sgi-ip22/ip22-time.c 2006-02-25 01:08:51.863184250 +0900 +++ mm2/arch/mips/sgi-ip22/ip22-time.c 2006-02-25 00:58:00.360671750 +0900 @@ -212,8 +212,8 @@ static void indy_timer_setup(struct irqa void __init ip22_time_init(void) { /* setup hookup functions */ - rtc_get_time = indy_rtc_get_time; - rtc_set_time = indy_rtc_set_time; + rtc_mips_get_time = indy_rtc_get_time; + rtc_mips_set_time = indy_rtc_set_time; board_time_init = indy_time_init; board_timer_setup = indy_timer_setup; diff -pruN -X dontdiff mm2-orig/arch/mips/sgi-ip32/ip32-setup.c mm2/arch/mips/sgi-ip32/ip32-setup.c --- mm2-orig/arch/mips/sgi-ip32/ip32-setup.c 2006-02-25 01:08:51.991192250 +0900 +++ mm2/arch/mips/sgi-ip32/ip32-setup.c 2006-02-25 00:57:36.283167000 +0900 @@ -91,8 +91,8 @@ void __init plat_setup(void) { board_be_init = ip32_be_init; - rtc_get_time = mc146818_get_cmos_time; - rtc_set_mmss = mc146818_set_rtc_mmss; + rtc_mips_get_time = mc146818_get_cmos_time; + rtc_mips_set_mmss = mc146818_set_rtc_mmss; board_time_init = ip32_time_init; board_timer_setup = ip32_timer_setup; diff -pruN -X dontdiff mm2-orig/arch/mips/sibyte/swarm/setup.c mm2/arch/mips/sibyte/swarm/setup.c --- mm2-orig/arch/mips/sibyte/swarm/setup.c 2006-02-25 01:08:52.031194750 +0900 +++ mm2/arch/mips/sibyte/swarm/setup.c 2006-02-25 00:56:45.591999000 +0900 @@ -114,14 +114,14 @@ void __init plat_setup(void) if (xicor_probe()) { printk("swarm setup: Xicor 1241 RTC detected.\n"); - rtc_get_time = xicor_get_time; - rtc_set_time = xicor_set_time; + rtc_mips_get_time = xicor_get_time; + rtc_mips_set_time = xicor_set_time; } if (m41t81_probe()) { printk("swarm setup: M41T81 RTC detected.\n"); - rtc_get_time = m41t81_get_time; - rtc_set_time = m41t81_set_time; + rtc_mips_get_time = m41t81_get_time; + rtc_mips_set_time = m41t81_set_time; } printk("This kernel optimized for " diff -pruN -X dontdiff mm2-orig/arch/mips/sni/setup.c mm2/arch/mips/sni/setup.c --- mm2-orig/arch/mips/sni/setup.c 2006-02-25 01:08:52.035195000 +0900 +++ mm2/arch/mips/sni/setup.c 2006-02-25 00:56:12.565935000 +0900 @@ -164,8 +164,8 @@ static struct pci_controller sni_control static inline void sni_pcimt_time_init(void) { - rtc_get_time = mc146818_get_cmos_time; - rtc_set_time = mc146818_set_rtc_mmss; + rtc_mips_get_time = mc146818_get_cmos_time; + rtc_mips_set_time = mc146818_set_rtc_mmss; } void __init plat_setup(void) diff -pruN -X dontdiff mm2-orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c mm2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c --- mm2-orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2006-02-25 01:08:52.039195250 +0900 +++ mm2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2006-02-25 00:55:37.163722500 +0900 @@ -1036,8 +1036,8 @@ toshiba_rbtx4927_time_init(void) #ifdef CONFIG_RTC_DS1742 - rtc_get_time = rtc_ds1742_get_time; - rtc_set_time = rtc_ds1742_set_time; + rtc_mips_get_time = rtc_ds1742_get_time; + rtc_mips_set_time = rtc_ds1742_set_time; TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, ":rtc_ds1742_init()-\n"); diff -pruN -X dontdiff mm2-orig/arch/mips/tx4938/common/rtc_rx5c348.c mm2/arch/mips/tx4938/common/rtc_rx5c348.c --- mm2-orig/arch/mips/tx4938/common/rtc_rx5c348.c 2006-02-25 01:08:52.043195500 +0900 +++ mm2/arch/mips/tx4938/common/rtc_rx5c348.c 2006-02-25 00:55:01.897518500 +0900 @@ -197,6 +197,6 @@ rtc_rx5c348_init(int chipid) srtc_24h = 1; /* set the function pointers */ - rtc_get_time = rtc_rx5c348_get_time; - rtc_set_time = rtc_rx5c348_set_time; + rtc_mips_get_time = rtc_rx5c348_get_time; + rtc_mips_set_time = rtc_rx5c348_set_time; } diff -pruN -X dontdiff mm2-orig/include/asm-mips/time.h mm2/include/asm-mips/time.h --- mm2-orig/include/asm-mips/time.h 2006-02-25 01:10:21.548789250 +0900 +++ mm2/include/asm-mips/time.h 2006-02-25 00:52:13.330983750 +0900 @@ -26,14 +26,14 @@ extern spinlock_t rtc_lock; /* * RTC ops. By default, they point to no-RTC functions. - * rtc_get_time - mktime(year, mon, day, hour, min, sec) in seconds. - * rtc_set_time - reverse the above translation and set time to RTC. - * rtc_set_mmss - similar to rtc_set_time, but only min and sec need + * rtc_mips_get_time - mktime(year, mon, day, hour, min, sec) in seconds. + * rtc_mips_set_time - reverse the above translation and set time to RTC. + * rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need * to be set. Used by RTC sync-up. */ -extern unsigned long (*rtc_get_time)(void); -extern int (*rtc_set_time)(unsigned long); -extern int (*rtc_set_mmss)(unsigned long); +extern unsigned long (*rtc_mips_get_time)(void); +extern int (*rtc_mips_set_time)(unsigned long); +extern int (*rtc_mips_set_mmss)(unsigned long); /* * Timer interrupt functions. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/