From: Andrew Morton With everything modular, the linker has no reason to include lib/rtc.o, so: WARNING: "rtc_time_to_tm" [drivers/rtc/rtc-test.ko] undefined! WARNING: "rtc_tm_to_time" [drivers/rtc/rtc-sysfs.ko] undefined! WARNING: "rtc_valid_tm" [drivers/rtc/rtc-pcf8563.ko] undefined! WARNING: "rtc_tm_to_time" [drivers/rtc/rtc-ds1672.ko] undefined! WARNING: "rtc_time_to_tm" [drivers/rtc/rtc-ds1672.ko] undefined! WARNING: "rtc_valid_tm" [drivers/rtc/rtc-core.ko] undefined! I don't really see a lot of point in putting rtc library functions into lib/, so move the file to drivers/rtc/rtc-lib.c Cc: Alessandro Zummo Cc: Greg Kroah-Hartman Signed-off-by: Andrew Morton --- dev/null | 98 ---------------------------------------- drivers/rtc/Makefile | 1 drivers/rtc/rtc-lib.c | 98 ++++++++++++++++++++++++++++++++++++++++ lib/Makefile | 2 4 files changed, 100 insertions(+), 99 deletions(-) diff -puN lib/Makefile~rtc-subsystem-class-fix lib/Makefile --- devel/lib/Makefile~rtc-subsystem-class-fix 2006-02-28 01:09:51.000000000 -0800 +++ devel-akpm/lib/Makefile 2006-02-28 01:09:51.000000000 -0800 @@ -5,7 +5,7 @@ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \ bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \ idr.o div64.o int_sqrt.o bitmap.o extable.o prio_tree.o \ - sha1.o rtc.o + sha1.o lib-y += kobject.o kref.o kobject_uevent.o klist.o diff -L lib/rtc.c -puN lib/rtc.c~rtc-subsystem-class-fix /dev/null --- devel/lib/rtc.c +++ /dev/null 2003-09-15 06:40:47.000000000 -0700 @@ -1,98 +0,0 @@ -/* - * rtc and date/time utility functions - * - * Copyright (C) 2005-06 Tower Technologies - * Author: Alessandro Zummo - * - * based on arch/arm/common/rtctime.c and other bits - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. -*/ - -#include -#include - -static const unsigned char rtc_days_in_month[] = { - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 -}; - -#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400) -#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400)) - -int rtc_month_days(unsigned int month, unsigned int year) -{ - return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1); -} -EXPORT_SYMBOL(rtc_month_days); - -/* - * Convert seconds since 01-01-1970 00:00:00 to Gregorian date. - */ -void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) -{ - int days, month, year; - - days = time / 86400; - time -= days * 86400; - - tm->tm_wday = (days + 4) % 7; - - year = 1970 + days / 365; - days -= (year - 1970) * 365 - + LEAPS_THRU_END_OF(year - 1) - - LEAPS_THRU_END_OF(1970 - 1); - if (days < 0) { - year -= 1; - days += 365 + LEAP_YEAR(year); - } - tm->tm_year = year - 1900; - tm->tm_yday = days + 1; - - for (month = 0; month < 11; month++) { - int newdays; - - newdays = days - rtc_month_days(month, year); - if (newdays < 0) - break; - days = newdays; - } - tm->tm_mon = month; - tm->tm_mday = days + 1; - - tm->tm_hour = time / 3600; - time -= tm->tm_hour * 3600; - tm->tm_min = time / 60; - tm->tm_sec = time - tm->tm_min * 60; -} -EXPORT_SYMBOL(rtc_time_to_tm); - -/* - * Does the rtc_time represent a valid date/time? - */ -int rtc_valid_tm(struct rtc_time *tm) -{ - if (tm->tm_year < 70 || - tm->tm_mon >= 12 || - tm->tm_mday < 1 || - tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900) || - tm->tm_hour >= 24 || - tm->tm_min >= 60 || - tm->tm_sec >= 60) - return -EINVAL; - - return 0; -} -EXPORT_SYMBOL(rtc_valid_tm); - -/* - * Convert Gregorian date to seconds since 01-01-1970 00:00:00. - */ -int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time) -{ - *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - return 0; -} -EXPORT_SYMBOL(rtc_tm_to_time); diff -puN /dev/null drivers/rtc/rtc-lib.c --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ devel-akpm/drivers/rtc/rtc-lib.c 2006-02-28 01:09:51.000000000 -0800 @@ -0,0 +1,98 @@ +/* + * rtc and date/time utility functions + * + * Copyright (C) 2005-06 Tower Technologies + * Author: Alessandro Zummo + * + * based on arch/arm/common/rtctime.c and other bits + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. +*/ + +#include +#include + +static const unsigned char rtc_days_in_month[] = { + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +}; + +#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400) +#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400)) + +int rtc_month_days(unsigned int month, unsigned int year) +{ + return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1); +} +EXPORT_SYMBOL(rtc_month_days); + +/* + * Convert seconds since 01-01-1970 00:00:00 to Gregorian date. + */ +void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) +{ + int days, month, year; + + days = time / 86400; + time -= days * 86400; + + tm->tm_wday = (days + 4) % 7; + + year = 1970 + days / 365; + days -= (year - 1970) * 365 + + LEAPS_THRU_END_OF(year - 1) + - LEAPS_THRU_END_OF(1970 - 1); + if (days < 0) { + year -= 1; + days += 365 + LEAP_YEAR(year); + } + tm->tm_year = year - 1900; + tm->tm_yday = days + 1; + + for (month = 0; month < 11; month++) { + int newdays; + + newdays = days - rtc_month_days(month, year); + if (newdays < 0) + break; + days = newdays; + } + tm->tm_mon = month; + tm->tm_mday = days + 1; + + tm->tm_hour = time / 3600; + time -= tm->tm_hour * 3600; + tm->tm_min = time / 60; + tm->tm_sec = time - tm->tm_min * 60; +} +EXPORT_SYMBOL(rtc_time_to_tm); + +/* + * Does the rtc_time represent a valid date/time? + */ +int rtc_valid_tm(struct rtc_time *tm) +{ + if (tm->tm_year < 70 || + tm->tm_mon >= 12 || + tm->tm_mday < 1 || + tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900) || + tm->tm_hour >= 24 || + tm->tm_min >= 60 || + tm->tm_sec >= 60) + return -EINVAL; + + return 0; +} +EXPORT_SYMBOL(rtc_valid_tm); + +/* + * Convert Gregorian date to seconds since 01-01-1970 00:00:00. + */ +int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time) +{ + *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); + return 0; +} +EXPORT_SYMBOL(rtc_tm_to_time); diff -puN drivers/rtc/Makefile~rtc-subsystem-class-fix drivers/rtc/Makefile --- devel/drivers/rtc/Makefile~rtc-subsystem-class-fix 2006-02-28 01:09:51.000000000 -0800 +++ devel-akpm/drivers/rtc/Makefile 2006-02-28 01:09:51.000000000 -0800 @@ -2,6 +2,7 @@ # Makefile for RTC class/drivers. # +obj-$(CONFIG_RTC) += rtc-lib.o obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o obj-$(CONFIG_RTC_CLASS) += rtc-core.o rtc-core-y := class.o interface.o _