The patch titled
clocksource: move old API calls
has been added to the -mm tree. Its filename is
clocksource-move-old-api-calls.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: clocksource: move old API calls
From: Daniel Walker <dwalker@xxxxxxxxxx>
I added this to make the next few patches cleaner. The mixing of code removal
and code addition can make a patchset harder to read.
There's nothing new here from the first patchset, it just moves some code out
of the way.
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/time/clocksource.c | 120 ++++++++++++++++++------------------
1 file changed, 61 insertions(+), 59 deletions(-)
diff -puN kernel/time/clocksource.c~clocksource-move-old-api-calls kernel/time/clocksource.c
--- a/kernel/time/clocksource.c~clocksource-move-old-api-calls
+++ a/kernel/time/clocksource.c
@@ -31,6 +31,8 @@
/* XXX - Would like a better way for initializing curr_clocksource */
extern struct clocksource clocksource_jiffies;
+static int is_registered_source(struct clocksource *c);
+static struct clocksource *select_clocksource(void);
/*[Clocksource internal variables]---------
* curr_clocksource:
@@ -70,65 +72,6 @@ struct clocksource *clocksource_get_next
}
/**
- * select_clocksource - Finds the best registered clocksource.
- *
- * Private function. Must hold clocksource_lock when called.
- *
- * Looks through the list of registered clocksources, returning
- * the one with the highest rating value. If there is a clocksource
- * name that matches the override string, it returns that clocksource.
- */
-static struct clocksource *select_clocksource(void)
-{
- struct clocksource *best = NULL;
- struct list_head *tmp;
-
- list_for_each(tmp, &clocksource_list) {
- struct clocksource *src;
-
- src = list_entry(tmp, struct clocksource, list);
- if (!best)
- best = src;
-
- /* check for override: */
- if (strlen(src->name) == strlen(override_name) &&
- !strcmp(src->name, override_name)) {
- best = src;
- break;
- }
- /* pick the highest rating: */
- if (src->rating > best->rating)
- best = src;
- }
-
- return best;
-}
-
-/**
- * is_registered_source - Checks if clocksource is registered
- * @c: pointer to a clocksource
- *
- * Private helper function. Must hold clocksource_lock when called.
- *
- * Returns one if the clocksource is already registered, zero otherwise.
- */
-static int is_registered_source(struct clocksource *c)
-{
- int len = strlen(c->name);
- struct list_head *tmp;
-
- list_for_each(tmp, &clocksource_list) {
- struct clocksource *src;
-
- src = list_entry(tmp, struct clocksource, list);
- if (strlen(src->name) == len && !strcmp(src->name, c->name))
- return 1;
- }
-
- return 0;
-}
-
-/**
* clocksource_register - Used to install new clocksources
* @t: clocksource to be registered
*
@@ -334,3 +277,62 @@ static int __init boot_override_clock(ch
}
__setup("clock=", boot_override_clock);
+
+/**
+ * select_clocksource - Finds the best registered clocksource.
+ *
+ * Private function. Must hold clocksource_lock when called.
+ *
+ * Looks through the list of registered clocksources, returning
+ * the one with the highest rating value. If there is a clocksource
+ * name that matches the override string, it returns that clocksource.
+ */
+static struct clocksource *select_clocksource(void)
+{
+ struct clocksource *best = NULL;
+ struct list_head *tmp;
+
+ list_for_each(tmp, &clocksource_list) {
+ struct clocksource *src;
+
+ src = list_entry(tmp, struct clocksource, list);
+ if (!best)
+ best = src;
+
+ /* check for override: */
+ if (strlen(src->name) == strlen(override_name) &&
+ !strcmp(src->name, override_name)) {
+ best = src;
+ break;
+ }
+ /* pick the highest rating: */
+ if (src->rating > best->rating)
+ best = src;
+ }
+
+ return best;
+}
+
+/**
+ * is_registered_source - Checks if clocksource is registered
+ * @c: pointer to a clocksource
+ *
+ * Private helper function. Must hold clocksource_lock when called.
+ *
+ * Returns one if the clocksource is already registered, zero otherwise.
+ */
+static int is_registered_source(struct clocksource *c)
+{
+ int len = strlen(c->name);
+ struct list_head *tmp;
+
+ list_for_each(tmp, &clocksource_list) {
+ struct clocksource *src;
+
+ src = list_entry(tmp, struct clocksource, list);
+ if (strlen(src->name) == len && !strcmp(src->name, c->name))
+ return 1;
+ }
+
+ return 0;
+}
_
Patches currently in -mm which might be from dwalker@xxxxxxxxxx are
sched-likely-profiling.patch
clocksource-increase-initcall-priority.patch
clocksource-small-cleanup.patch
clocksource-move-old-api-calls.patch
clocksource-add-some-new-api-calls.patch
clocksource-convert-generic-timeofday.patch
clocksource-add-block-notifier.patch
clocksource-remove-update_callback.patch
clocksource-initialize-list-value.patch
clocksource-add-generic-sched_clock.patch
clocksource-update-kernel-parameters.patch
profile-likely-unlikely-macros.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
