diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 13:29:16 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 13:29:16 +0300 |
commit | bddb3636737f658886a0a02b64db5366bba3428e (patch) | |
tree | 8f7ffcb42803fa0bb3378ef969545e4a5e57262c /tools/perf/arch/s390/util/header.c | |
parent | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (diff) | |
parent | cbb99c0f588737ec98c333558922ce47e9a95827 (diff) | |
download | linux-bddb3636737f658886a0a02b64db5366bba3428e.tar.xz |
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch/s390/util/header.c')
-rw-r--r-- | tools/perf/arch/s390/util/header.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util/header.c index 163b92f33998..3db85cd2069e 100644 --- a/tools/perf/arch/s390/util/header.c +++ b/tools/perf/arch/s390/util/header.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Implementation of get_cpuid(). * * Copyright IBM Corp. 2014, 2018 * Author(s): Alexander Yarygin <yarygin@linux.vnet.ibm.com> * Thomas Richter <tmricht@linux.vnet.ibm.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <sys/types.h> |