The patch titled
mips: moved to GENERIC_TIME
has been added to the -mm tree. Its filename is
mips-moved-to-generic_time.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mips: moved to GENERIC_TIME
From: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
Move MIPS to GENERIC_TIME and remove MIPS specific
do_gettimeofday()/do_settimeofday(). MIPS specific
do_gettimeofday()/do_settimeofday() in 2.6.18-rc4-mm3 have undefined
reference problem.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/mips/Kconfig | 4 ++
arch/mips/kernel/time.c | 74 --------------------------------------
2 files changed, 4 insertions(+), 74 deletions(-)
diff -puN arch/mips/Kconfig~mips-moved-to-generic_time arch/mips/Kconfig
--- a/arch/mips/Kconfig~mips-moved-to-generic_time
+++ a/arch/mips/Kconfig
@@ -860,6 +860,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
bool
default y
+config GENERIC_TIME
+ bool
+ default y
+
#
# Select some configuration options automatically based on user selections.
#
diff -puN arch/mips/kernel/time.c~mips-moved-to-generic_time arch/mips/kernel/time.c
--- a/arch/mips/kernel/time.c~mips-moved-to-generic_time
+++ a/arch/mips/kernel/time.c
@@ -149,80 +149,6 @@ void (*mips_timer_ack)(void);
unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int);
-
-/*
- * This version of gettimeofday has microsecond resolution and better than
- * microsecond precision on fast machines with cycle counter.
- */
-void do_gettimeofday(struct timeval *tv)
-{
- unsigned long seq;
- unsigned long usec, sec;
- unsigned long max_ntp_tick;
-
- do {
- seq = read_seqbegin(&xtime_lock);
-
- usec = do_gettimeoffset();
-
- /*
- * If time_adjust is negative then NTP is slowing the clock
- * so make sure not to go into next possible interval.
- * Better to lose some accuracy than have time go backwards..
- */
- if (unlikely(time_adjust < 0)) {
- max_ntp_tick = (USEC_PER_SEC / HZ) - tickadj;
- usec = min(usec, max_ntp_tick);
- }
-
- sec = xtime.tv_sec;
- usec += (xtime.tv_nsec / 1000);
-
- } while (read_seqretry(&xtime_lock, seq));
-
- while (usec >= 1000000) {
- usec -= 1000000;
- sec++;
- }
-
- tv->tv_sec = sec;
- tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
-int do_settimeofday(struct timespec *tv)
-{
- time_t wtm_sec, sec = tv->tv_sec;
- long wtm_nsec, nsec = tv->tv_nsec;
-
- if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
- return -EINVAL;
-
- write_seqlock_irq(&xtime_lock);
-
- /*
- * This is revolting. We need to set "xtime" correctly. However,
- * the value in this location is the value at the most recent update
- * of wall time. Discover what correction gettimeofday() would have
- * made, and then undo it!
- */
- nsec -= do_gettimeoffset() * NSEC_PER_USEC;
-
- wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
- wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
- set_normalized_timespec(&xtime, sec, nsec);
- set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
- ntp_clear();
- write_sequnlock_irq(&xtime_lock);
- clock_was_set();
- return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
/*
* Gettimeoffset routines. These routines returns the time duration
* since last timer interrupt in usecs.
_
Patches currently in -mm which might be from yoichi_yuasa@xxxxxxxxxxxxxx are
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h-fix.patch
mips-moved-to-generic_time.patch
irq-fixed-coding-style.patch
irq-removed-a-extra-line.patch
generic-ioremap_page_range-mips-conversion-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
