The patch titled
ntp-move-all-the-ntp-related-code-to-ntpc-fix
has been removed from the -mm tree. Its filename is
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
This patch was dropped because it was folded into ntp-move-all-the-ntp-related-code-to-ntpc.patch
------------------------------------------------------
Subject: ntp-move-all-the-ntp-related-code-to-ntpc-fix
From: Andrew Morton <akpm@xxxxxxxx>
Forgot to make time_interpolator_update non-static.
Please, don't put extern decls in C. How often must this be said?
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Acked-by: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/timex.h | 8 ++++++--
kernel/time/ntp.c | 6 ------
kernel/timer.c | 8 +-------
3 files changed, 7 insertions(+), 15 deletions(-)
diff -puN include/linux/timex.h~ntp-move-all-the-ntp-related-code-to-ntpc-fix include/linux/timex.h
--- a/include/linux/timex.h~ntp-move-all-the-ntp-related-code-to-ntpc-fix
+++ a/include/linux/timex.h
@@ -294,11 +294,15 @@ extern void register_time_interpolator(s
extern void unregister_time_interpolator(struct time_interpolator *);
extern void time_interpolator_reset(void);
extern unsigned long time_interpolator_get_offset(void);
+extern void time_interpolator_update(long delta_nsec);
#else /* !CONFIG_TIME_INTERPOLATION */
-static inline void
-time_interpolator_reset(void)
+static inline void time_interpolator_reset(void)
+{
+}
+
+static inline void time_interpolator_update(long delta_nsec)
{
}
diff -puN kernel/time/ntp.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix kernel/time/ntp.c
--- a/kernel/time/ntp.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix
+++ a/kernel/time/ntp.c
@@ -15,12 +15,6 @@
#include <asm/div64.h>
#include <asm/timex.h>
-#ifdef CONFIG_TIME_INTERPOLATION
-void time_interpolator_update(long delta_nsec);
-#else
-#define time_interpolator_update(x)
-#endif
-
/* Don't completely fail for HZ > 500. */
int tickadj = 500/HZ ? : 1; /* microsecs */
diff -puN kernel/timer.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix kernel/timer.c
--- a/kernel/timer.c~ntp-move-all-the-ntp-related-code-to-ntpc-fix
+++ a/kernel/timer.c
@@ -41,12 +41,6 @@
#include <asm/timex.h>
#include <asm/io.h>
-#ifdef CONFIG_TIME_INTERPOLATION
-static void time_interpolator_update(long delta_nsec);
-#else
-#define time_interpolator_update(x)
-#endif
-
u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
@@ -1572,7 +1566,7 @@ unsigned long time_interpolator_get_offs
#define INTERPOLATOR_ADJUST 65536
#define INTERPOLATOR_MAX_SKIP 10*INTERPOLATOR_ADJUST
-static void time_interpolator_update(long delta_nsec)
+void time_interpolator_update(long delta_nsec)
{
u64 counter;
unsigned long offset;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list_del-debug-fix.patch
arch-i386-pci-mmconfigc-tlb-flush-fix-tweaks.patch
maximum-latency-tracking-infrastructure.patch
submit-checklist-mention-headers_check.patch
ntp-move-all-the-ntp-related-code-to-ntpc.patch
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
reiserfs-on-demand-bitmap-loading.patch
add-vector-aio-support-fix.patch
csa-basic-accounting-over-taskstats-fix.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
generic-ioremap_page_range-x86_64-conversion-fix.patch
some-cleanup-in-the-pipe-code-tidy.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-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
