summaryrefslogtreecommitdiff
path: root/tools/include/asm-generic/barrier.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 08:25:25 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 08:25:25 +0300
commit119a7fdfeecefa5a4062256ac2dcd3b69eaa8414 (patch)
tree40d834b32ce97857f3f974c95b64b6b48d415e6e /tools/include/asm-generic/barrier.h
parent086ebf92aa791b6cc8805decffca7b8898d99a4e (diff)
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff)
downloadlinux-119a7fdfeecefa5a4062256ac2dcd3b69eaa8414.tar.xz
Merge 5.2-rc3 into usb-next
we want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/include/asm-generic/barrier.h')
-rw-r--r--tools/include/asm-generic/barrier.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/include/asm-generic/barrier.h b/tools/include/asm-generic/barrier.h
index 52278d880a61..6ef36e920ea8 100644
--- a/tools/include/asm-generic/barrier.h
+++ b/tools/include/asm-generic/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Copied from the kernel sources to tools/perf/:
*
@@ -8,11 +9,6 @@
*
* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
* Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
*/
#ifndef __TOOLS_LINUX_ASM_GENERIC_BARRIER_H
#define __TOOLS_LINUX_ASM_GENERIC_BARRIER_H