summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/atomic64.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2019-06-19 12:04:55 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2019-06-19 12:07:29 +0200
commit52d2d44eee8091e740d0d275df1311fb8373c9a9 (patch)
tree4aff282e84b3469f18cf9717490b892f6f39198f /include/asm-generic/atomic64.h
parent2454fcea338ad821a39d471bc7db5a58ba41b742 (diff)
parent9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff)
downloadtalos-op-linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.tar.gz
talos-op-linux-52d2d44eee8091e740d0d275df1311fb8373c9a9.zip
Merge v5.2-rc5 into drm-next
Maarten needs -rc4 backmerged so he can pull in the fbcon notifier removal topic branch into drm-misc-next. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/asm-generic/atomic64.h')
-rw-r--r--include/asm-generic/atomic64.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
index 97b28b7f1f29..d7a15096fb3b 100644
--- a/include/asm-generic/atomic64.h
+++ b/include/asm-generic/atomic64.h
@@ -1,13 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Generic implementation of 64-bit atomics using spinlocks,
* useful on processors that don't have 64-bit atomic instructions.
*
* Copyright © 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
*/
#ifndef _ASM_GENERIC_ATOMIC64_H
#define _ASM_GENERIC_ATOMIC64_H
OpenPOWER on IntegriCloud