Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

268a3dcf

Commit 268a3dcf authored 16 years ago by Thomas Gleixner

Downloads
- Plain Diff

Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2


Conflicts:

	kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parents c4bd822e 592aa999

No related branches found

No related tags found

Loading

Changes 30

Hide whitespace changes

Inline Side-by-side

Showing

arch/alpha/kernel/osf_sys.c 7 additions, 6 deletions

arch/alpha/kernel/osf_sys.c
arch/ia64/kvm/kvm-ia64.c 1 addition, 1 deletion

arch/ia64/kvm/kvm-ia64.c
arch/powerpc/oprofile/cell/spu_profiler.c 1 addition, 1 deletion

arch/powerpc/oprofile/cell/spu_profiler.c
arch/x86/kvm/i8254.c 4 additions, 4 deletions

arch/x86/kvm/i8254.c
arch/x86/kvm/lapic.c 2 additions, 4 deletions

arch/x86/kvm/lapic.c
drivers/cpuidle/cpuidle.c 7 additions, 0 deletions

drivers/cpuidle/cpuidle.c
drivers/s390/crypto/ap_bus.c 3 additions, 3 deletions

drivers/s390/crypto/ap_bus.c
fs/compat.c 71 additions, 116 deletions

fs/compat.c
fs/select.c 223 additions, 173 deletions

fs/select.c
fs/timerfd.c 3 additions, 5 deletions

fs/timerfd.c
include/linux/hrtimer.h 101 additions, 4 deletions

include/linux/hrtimer.h
include/linux/init_task.h 1 addition, 0 deletions

include/linux/init_task.h
include/linux/poll.h 5 additions, 3 deletions

include/linux/poll.h
include/linux/prctl.h 7 additions, 0 deletions

include/linux/prctl.h
include/linux/sched.h 6 additions, 0 deletions

include/linux/sched.h
include/linux/thread_info.h 8 additions, 0 deletions

include/linux/thread_info.h
include/linux/time.h 4 additions, 0 deletions

include/linux/time.h
kernel/fork.c 2 additions, 0 deletions

kernel/fork.c
kernel/futex.c 7 additions, 4 deletions

kernel/futex.c
kernel/hrtimer.c 185 additions, 21 deletions

kernel/hrtimer.c

with 648 additions and 345 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment