From: John Stultz <john.stultz@linaro.org>
Date: Fri, 3 Dec 2010 00:47:52 +0000 (-0800)
Subject: Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
X-Git-Tag: v2.6.38-rc1~480^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0f969009f647cd473c5e559aeec9c4229d12f87;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc

Conflicts:
	Documentation/kernel-parameters.txt
---

b0f969009f647cd473c5e559aeec9c4229d12f87
diff --cc Documentation/kernel-parameters.txt
index 92e83e5,4c6b415..c7c8eca
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -2462,21 -2480,17 +2462,22 @@@ and is between 256 and 4096 characters
  	trace_buf_size=nn[KMG]
  			[FTRACE] will set tracing buffer size.
  
 -	trix=		[HW,OSS] MediaTrix AudioTrix Pro
 -			Format:
 -			<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
 +	trace_event=[event-list]
 +			[FTRACE] Set and start specified trace events in order
 +			to facilitate early boot debugging.
 +			See also Documentation/trace/events.txt
  
- 	tsc=		Disable clocksource-must-verify flag for TSC.
+ 	tsc=		Disable clocksource stability checks for TSC.
  			Format: <string>
  			[x86] reliable: mark tsc clocksource as reliable, this
- 			disables clocksource verification at runtime.
- 			Used to enable high-resolution timer mode on older
- 			hardware, and in virtualized environment.
+ 			disables clocksource verification at runtime, as well
+ 			as the stability checks done at bootup.	Used to enable
+ 			high-resolution timer mode on older hardware, and in
+ 			virtualized environment.
 +			[x86] noirqtime: Do not use TSC to do irq accounting.
 +			Used to run time disable IRQ_TIME_ACCOUNTING on any
 +			platforms where RDTSC is slow and this accounting
 +			can add overhead.
  
  	turbografx.map[2|3]=	[HW,JOY]
  			TurboGraFX parallel port interface