Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  latencytop: Change Kconfig dependency.
  futex: Add bitset conditional wait/wakeup functionality
  futex: Remove warn on in return fixup path
  x86: replace LOCK_PREFIX in futex.h
  tick-sched: add more debug information
  timekeeping: update xtime_cache when time(zone) changes
  hrtimer: fix hrtimer_init_sleeper() users

...

This commit is contained in:

Linus Torvalds 2008-02-02 08:27:00 +11:00

parent e30ec4525d aa7d93506c

commit 45f37e86f1

14 changed files with 68 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/Kconfig

View file

6

include/asm-x86/futex.h

View file

10

include/linux/futex.h

View file

1

include/linux/thread_info.h

View file

4

include/linux/tick.h

View file

1

include/linux/time.h

View file

42

kernel/futex.c

View file

3

kernel/futex_compat.c

View file

2

kernel/hrtimer.c

View file

1

kernel/time.c

View file

2

kernel/time/tick-sched.c

View file

6

kernel/time/timekeeping.c

View file

2

kernel/time/timer_list.c

View file

2

lib/Kconfig.debug

View file