12257 resync smatch to 0.6.1-rc1-il-4

@@ -28,12 +28,11 @@
 /*
  * check-name: Smatch locking #2
  * check-command: smatch --project=kernel sm_locking2.c
  *
  * check-output-start
-sm_locking2.c:21 func() error: double unlock 'spin_lock:mylock'
-sm_locking2.c:26 func() warn: inconsistent returns 'spin_lock:mylock3'.
-  Locked on:   line 26
-  Unlocked on: line 14
-               line 25
+sm_locking2.c:21 func() error: double unlocked 'mylock' (orig line 17)
+sm_locking2.c:26 func() warn: inconsistent returns 'mylock3'.
+  Locked on  : 26
+  Unlocked on: 25
  * check-output-end
  */