From: Andrew Morton <akpm@linux-foundation.org>

Cc: Huang Ying <ying.huang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 lib/debug_locks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN lib/debug_locks.c~fix-a-race-condtion-of-oops_in_progress-fix lib/debug_locks.c
--- a/lib/debug_locks.c~fix-a-race-condtion-of-oops_in_progress-fix
+++ a/lib/debug_locks.c
@@ -38,7 +38,7 @@ int debug_locks_off(void)
 {
 	if (xchg(&debug_locks, 0)) {
 		if (!debug_locks_silent) {
-			oops_in_progress = 1;
+			atomic_set(&oops_in_progress, 1);
 			console_verbose();
 			return 1;
 		}
_