diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:18:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:18:29 -0400 |
| commit | b62ad9ab181a67207a4c8c373461b587c4861a68 (patch) | |
| tree | ace1572964d81f5f9bbc10b7960c1f742832d744 /Documentation/feature-removal-schedule.txt | |
| parent | af390084359a5de20046c901529b2b6a50b941cb (diff) | |
| parent | b29230769e3482bbd62a07d6d9485371ee66a18f (diff) | |
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 47916be4e28c ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 6fdb837d940b..71f0fea1058f 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -445,16 +445,6 @@ Who: Jan Kiszka <jan.kiszka@web.de> | |||
| 445 | 445 | ||
| 446 | ---------------------------- | 446 | ---------------------------- |
| 447 | 447 | ||
| 448 | What: xtime, wall_to_monotonic | ||
| 449 | When: 2.6.36+ | ||
| 450 | Files: kernel/time/timekeeping.c include/linux/time.h | ||
| 451 | Why: Cleaning up timekeeping internal values. Please use | ||
| 452 | existing timekeeping accessor functions to access | ||
| 453 | the equivalent functionality. | ||
| 454 | Who: John Stultz <johnstul@us.ibm.com> | ||
| 455 | |||
| 456 | ---------------------------- | ||
| 457 | |||
| 458 | What: KVM paravirt mmu host support | 448 | What: KVM paravirt mmu host support |
| 459 | When: January 2011 | 449 | When: January 2011 |
| 460 | Why: The paravirt mmu host support is slower than non-paravirt mmu, both | 450 | Why: The paravirt mmu host support is slower than non-paravirt mmu, both |