Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0b4a8a789a328af6aac613734c362cf6aad72201

Authored by Roland McGrath
Committed by Linus Torvalds
1 parent 3171a0305d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] kexec warning fix 

This fixes a couple of compiler warnings, and adds paranoia checks as well.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -995,7 +995,8 @@
995 995 image = xchg(dest_image, image);
996 996  
997 997 out:
998   - xchg(&kexec_lock, 0); /* Release the mutex */
  998 + locked = xchg(&kexec_lock, 0); /* Release the mutex */
  999 + BUG_ON(!locked);
999 1000 kimage_free(image);
1000 1001  
1001 1002 return result;
... ... @@ -1061,7 +1062,8 @@
1061 1062 machine_crash_shutdown(&fixed_regs);
1062 1063 machine_kexec(kexec_crash_image);
1063 1064 }
1064   - xchg(&kexec_lock, 0);
  1065 + locked = xchg(&kexec_lock, 0);
  1066 + BUG_ON(!locked);
1065 1067 }
1066 1068 }
1067 1069