Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b62ad9ab authored Aug 06, 2010 by Linus Torvalds

Merge branch 'timers-timekeeping-for-linus' of...

Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Fix read_persistent_clock fallout
  kgdb: Do not access xtime directly
  powerpc: Clean up obsolete code relating to decrementer and timebase
  powerpc: Rework VDSO gettimeofday to prevent time going backwards
  clocksource: Add __clocksource_updatefreq_hz/khz methods
  x86: Convert common clocksources to use clocksource_register_hz/khz
  timekeeping: Make xtime and wall_to_monotonic static
  hrtimer: Cleanup direct access to wall_to_monotonic
  um: Convert to use read_persistent_clock
  timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
  powerpc: Cleanup xtime usage
  powerpc: Simplify update_vsyscall
  time: Kill off CONFIG_GENERIC_TIME
  time: Implement timespec_add
  x86: Fix vtime/file timestamp inconsistencies

Trivial conflicts in Documentation/feature-removal-schedule.txt

Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as
per Thomas' earlier merge commit 47916be4 ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")

parents af390084 b2923076

Documentation/feature-removal-schedule.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -445,16 +445,6 @@ Who: Jan Kiszka <jan.kiszka@web.de>

		----------------------------

		What: xtime, wall_to_monotonic
		When: 2.6.36+
		Files: kernel/time/timekeeping.c include/linux/time.h
		Why: Cleaning up timekeeping internal values. Please use
		existing timekeeping accessor functions to access
		the equivalent functionality.
		Who: John Stultz <johnstul@us.ibm.com>

		----------------------------

		What: KVM paravirt mmu host support
		When: January 2011
		Why: The paravirt mmu host support is slower than non-paravirt mmu, both

Documentation/kernel-parameters.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,6 @@ parameter is applicable:
		MTD MTD (Memory Technology Device) support is enabled.
		NET Appropriate network support is enabled.
		NUMA NUMA support is enabled.
		GENERIC_TIME The generic timeofday code is enabled.
		NFS Appropriate NFS support is enabled.
		OSS OSS sound support is enabled.
		PV_OPS A paravirtualized kernel is enabled.
		@@ -470,7 +469,7 @@ and is between 256 and 4096 characters. It is defined in the file
		clocksource is not available, it defaults to PIT.
		Format: { pit \| tsc \| cyclone \| pmtmr }

		clocksource= [GENERIC_TIME] Override the default clocksource
		clocksource= Override the default clocksource
		Format: <string>
		Override the default clocksource and use the clocksource
		with the name specified.

arch/alpha/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,10 +47,6 @@ config GENERIC_CALIBRATE_DELAY
		bool
		default y

		config GENERIC_TIME
		bool
		default y

		config GENERIC_CMOS_UPDATE
		def_bool y

arch/arm/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -43,10 +43,6 @@ config SYS_SUPPORTS_APM_EMULATION
		config GENERIC_GPIO
		bool

		config GENERIC_TIME
		bool
		default y

		config ARCH_USES_GETTIMEOFFSET
		bool
		default n

arch/avr32/Kconfig

+0 −3

Original line number	Diff line number	Diff line
		@@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE
		config RWSEM_GENERIC_SPINLOCK
		def_bool y

		config GENERIC_TIME
		def_bool y

		config GENERIC_CLOCKEVENTS
		def_bool y