The patch titled
lockdep: fix possible race while disabling lock-debugging, restore fix
has been removed from the -mm tree. Its filename was
lockdep-fix-possible-race-while-disabling-lock-debugging-restore-fix.patch
This patch was dropped because it was folded into lockdep-fix-possible-races-while-disabling-lock-debugging.patch
------------------------------------------------------
Subject: lockdep: fix possible race while disabling lock-debugging, restore fix
From: Ingo Molnar <mingo@xxxxxxx>
Restore flags in failure branch, pointed out by Jarek Poplawski.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Jarek Poplawski <jarkao2@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/lockdep.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN kernel/lockdep.c~lockdep-fix-possible-race-while-disabling-lock-debugging-restore-fix kernel/lockdep.c
--- a/kernel/lockdep.c~lockdep-fix-possible-race-while-disabling-lock-debugging-restore-fix
+++ a/kernel/lockdep.c
@@ -1229,8 +1229,10 @@ register_lock_class(struct lockdep_map *
hash_head = classhashentry(key);
raw_local_irq_save(flags);
- if (!graph_lock())
+ if (!graph_lock()) {
+ raw_local_irq_restore(flags);
return NULL;
+ }
/*
* We have to do the hash-walk again, to avoid races
* with another CPU:
_
Patches currently in -mm which might be from mingo@xxxxxxx are
origin.patch
debug-add-sysrq_always_enabled-boot-option.patch
lockdep-filter-off-by-default.patch
lockdep-improve-verbose-messages.patch
lockdep-improve-lockdep_reset.patch
lockdep-clean-up-very_verbose-define.patch
lockdep-use-chain-hash-on-config_debug_lockdep-too.patch
lockdep-print-irq-trace-info-on-asserts.patch
lockdep-fix-possible-races-while-disabling-lock-debugging.patch
lockdep-fix-possible-race-while-disabling-lock-debugging-restore-fix.patch
lockdep-fix-possible-race-while-disabling-lock-debugging-restore-fix-fix.patch
workqueue-dont-hold-workqueue_mutex-in-flush_scheduled_work.patch
optimize-calc_load.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching.patch
mm-implement-swap-prefetching-use-ctl_unnumbered.patch
sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-i386.patch
time-uninline-jiffiesh.patch
time-uninline-jiffiesh-fix.patch
time-fix-msecs_to_jiffies-bug.patch
time-fix-timeout-overflow.patch
cleanup-uninline-irq_enter-and-move-it-into-a-function.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-remove-incorrect-warning-in-kernel-timerc.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-clean-up-locking-fix.patch
updated-hrtimers-state-tracking.patch
updated-hrtimers-clean-up-callback-tracking.patch
updated-hrtimers-move-and-add-documentation.patch
updated-add-a-framework-to-manage-clock-event-devices.patch
updated-add-a-framework-to-manage-clock-event-devices-next_event-calculation-fix.patch
updated-add-a-framework-to-manage-clock-event-devices-pit-broadcasting-fix.patch
updated-acpi-include-apich.patch
updated-acpi-keep-track-of-timer-broadcast.patch
updated-acpi-add-state-propagation-for-dynamic-broadcasting.patch
updated-i386-cleanup-apic-code.patch
updated-i386-convert-to-clock-event-devices.patch
updated-i386-convert-to-clock-event-devices-i8253c-remove-hpet-dependencies.patch
updated-pm_timer-allow-early-access-and-move-externs-to-a-header-file.patch
updated-i386-rework-local-apic-calibration.patch
updated-high-res-timers-core.patch
updated-high-res-timers-core-high-res-timers-do-itimer-rearming-in-process-context.patch
updated-high-res-timers-core-cleanup-state-tracking-update.patch
updated-gtod-mark-tsc-unusable-for-highres-timers.patch
high-res-timers-utilize-tsc-clocksource-again.patch
high-res-timers-utilize-tsc-clocksource-again-fix.patch
updated-dynticks-core-code.patch
updated-dynticks-core-code-fix-resume-bug.patch
updated-dyntick-add-nohz-stats-to-proc-stat.patch
updated-dynticks-i386-arch-code.patch
updated-dynticks-fix-nmi-watchdog.patch
updated-high-res-timers-dynticks-enable-i386-support.patch
updated-debugging-feature-timer-stats.patch
updated-debugging-feature-timer-stats-fixes.patch
debugging-feature-proc-timer_list.patch
debugging-feature-proc-timer_list-fix.patch
debugging-feature-proc-timer_list-fix-2.patch
clockevents-core-check-for-clock-event-device-handler-being-non-null-before-calling-it.patch
clockevents-convert-hpet-to-clockevents.patch
clockevents-make-apicc-exports-gpl-remove-fastcall-attributes.patch
clockevents-remove-ptregs-argument-from-handlers.patch
detect-atomic-counter-underflows.patch
debug-shared-irqs.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch
vdso-print-fatal-signals.patch
vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch
vdso-print-fatal-signals-use-ctl_unnumbered.patch
lockdep-show-held-locks-when-showing-a-stackdump.patch
lockdep-show-held-locks-when-showing-a-stackdump-fix.patch
lockdep-show-held-locks-when-showing-a-stackdump-fix-2.patch
kmap_atomic-debugging.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
