The following commit has been merged into the perf/kprobes branch of tip:

Commit-ID:     a70a04b3844f59c29573a8581d5c263225060dd6
Gitweb:        
https://git.kernel.org/tip/a70a04b3844f59c29573a8581d5c263225060dd6
Author:        Ingo Molnar <mi...@kernel.org>
AuthorDate:    Sat, 07 Nov 2020 12:54:49 +01:00
Committer:     Ingo Molnar <mi...@kernel.org>
CommitterDate: Sat, 07 Nov 2020 13:20:41 +01:00

locking/atomics: Regenerate the atomics-check SHA1's

The include/asm-generic/atomic-instrumented.h checksum got out
of sync, so regenerate it. (No change to actual code.)

Also make scripts/atomic/gen-atomics.sh executable, to make
it easier to use.

The auto-generated atomic header signatures are now fine:

  thule:~/tip> scripts/atomic/check-atomics.sh
  thule:~/tip>

Signed-off-by: Ingo Molnar <mi...@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Paul E. McKenney <paul...@kernel.org>
Cc: Will Deacon <will.dea...@arm.com>
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 include/asm-generic/atomic-instrumented.h | 2 +-
 scripts/atomic/gen-atomics.sh             | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 scripts/atomic/gen-atomics.sh

diff --git a/include/asm-generic/atomic-instrumented.h 
b/include/asm-generic/atomic-instrumented.h
index 492cc95..888b6cf 100644
--- a/include/asm-generic/atomic-instrumented.h
+++ b/include/asm-generic/atomic-instrumented.h
@@ -1830,4 +1830,4 @@ atomic64_dec_if_positive(atomic64_t *v)
 })
 
 #endif /* _ASM_GENERIC_ATOMIC_INSTRUMENTED_H */
-// 9d5e6a315fb1335d02f0ccd3655a91c3dafcc63e
+// 4bec382e44520f4d8267e42620054db26a659ea3
diff --git a/scripts/atomic/gen-atomics.sh b/scripts/atomic/gen-atomics.sh
old mode 100644
new mode 100755

Reply via email to