From 2f99028c6a91bc92775b0d5bf29e760e774a38d5 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 31 Jan 2011 11:07:54 +0100 Subject: [PATCH] --- yaml --- r: 234571 b: refs/heads/master c: 79ecaf0d15344d78904becf0f25de3fc9b49d430 h: refs/heads/master i: 234569: 441fac0d32a32b9c74089c36444b22cf2e1e3241 234567: 92e5dd776db2692bc47808c8924d5af5e5d8d21f v: v3 --- [refs] | 2 +- trunk/include/linux/time.h | 1 - trunk/kernel/time/timekeeping.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1d36bcce18e8..30e9efb5315a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48cf76f7104f655bbd48a75c7759dce82c3e1ab6 +refs/heads/master: 79ecaf0d15344d78904becf0f25de3fc9b49d430 diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h index 4007a12a1b50..ce29c86882b1 100644 --- a/trunk/include/linux/time.h +++ b/trunk/include/linux/time.h @@ -125,7 +125,6 @@ extern int timekeeping_suspended; unsigned long get_seconds(void); struct timespec current_kernel_time(void); struct timespec __current_kernel_time(void); /* does not take xtime_lock */ -struct timespec __get_wall_to_monotonic(void); /* does not take xtime_lock */ struct timespec get_monotonic_coarse(void); void get_xtime_and_monotonic_offset(struct timespec *xtim, struct timespec *wtom); diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index c50aaf6cd01d..8da35d1b9e16 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -910,11 +910,6 @@ struct timespec __current_kernel_time(void) return xtime; } -struct timespec __get_wall_to_monotonic(void) -{ - return wall_to_monotonic; -} - struct timespec current_kernel_time(void) { struct timespec now;