core kernel fixes
Subsystems (2)
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------>
H Hartley Sweeten (1):
kernel/posix-cpu-timers.c: fix sparse warning
Joerg Roedel (1):
dma-debug: remove broken dma memory leak detection for 2.6.30
Ming Lei (1):
locking: Documentation: lockdep-design.txt, fix note of state bits
Documentation/lockdep-design.txt | 6 ++-- kernel/posix-cpu-timers.c | 8 +++--- lib/dma-debug.c | 53 +------------------------------------- 3 files changed, 8 insertions(+), 59 deletions(-)
Documentation/lockdep-design.txt +3 -3
@@ -54,9 +54,9 @@ locking error messages, inside curlies. A contrived example: The bit position indicates STATE, STATE-read, for each of the states listed above, and the character displayed in each indicates: - '.' acquired while irqs disabled - '+' acquired in irq context - '-' acquired with irqs enabled + '.' acquired while irqs disabled and not in irq context + '-' acquired in irq context + '+' acquired with irqs enabled '?' acquired in irq context with irqs enabled. Unused mutexes cannot be part of the cause of an error.
kernel/posix-cpu-timers.c +4 -4
@@ -1420,19 +1420,19 @@ void run_posix_cpu_timers(struct task_struct *tsk)* timer call will interfere. */ list_for_each_entry_safe (timer, next, &firing, it.cpu.entry) { -int firing; +int cpu_firing; +spin_lock (&timer->it_lock);list_del_init (&timer->it.cpu.entry); - firing = timer->it.cpu.firing; + cpu_firing = timer->it.cpu.firing; timer->it.cpu.firing =0 ;/* * The firing flag is -1 if we collided with a reset * of the timer, which already reported this * almost-firing as an overrun. So don't generate an event. */ -if (likely (firing >=0 )) { +if (likely (cpu_firing >=0 ))cpu_timer_fire (timer); - }spin_unlock (&timer->it_lock); } }
lib/dma-debug.c +1 -52
61 lines not on this page · raw message