The patch titled clocksource: update kernel parameters has been added to the -mm tree. Its filename is clocksource-update-kernel-parameters.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: update kernel parameters From: Daniel Walker <dwalker@xxxxxxxxxx> Documents two new kernel parameters, timeofday_clocksource sched_clocksource Removed old ones, clocksource clock 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> --- Documentation/kernel-parameters.txt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff -puN Documentation/kernel-parameters.txt~clocksource-update-kernel-parameters Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt~clocksource-update-kernel-parameters +++ a/Documentation/kernel-parameters.txt @@ -351,13 +351,6 @@ and is between 256 and 4096 characters. Value can be changed at runtime via /selinux/checkreqprot. - clock= [BUGS=IA-32, HW] gettimeofday clocksource override. - [Deprecated] - Forces specified clocksource (if available) to be used - when calculating gettimeofday(). If specified - clocksource is not available, it defaults to PIT. - Format: { pit | tsc | cyclone | pmtmr } - disable_8254_timer enable_8254_timer [IA32/X86_64] Disable/Enable interrupt 0 timer routing @@ -1645,9 +1638,13 @@ and is between 256 and 4096 characters. time Show timing data prefixed to each printk message line - clocksource= [GENERIC_TIME] Override the default clocksource - Override the default clocksource and use the clocksource - with the name specified. + timeofday_clocksource= [GENERIC_TIME] + Override the default time of day clocksource and use + the clocksource with the name specified. + + sched_clocksource= [GENERIC_TIME] + Override the default scheduler clocksource. Used for + timing only inside the scheduler. tipar.timeout= [HW,PPT] Set communications timeout in tenths of a second _ 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