diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 11:50:21 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-03 11:50:21 +0300 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /tools/perf/arch/arm64/util | |
| parent | 516337048fa40496ae5ca9863c367ec991a44d9a (diff) | |
| parent | 4a8f81b8c053aad250ee247b219904ada72df9a4 (diff) | |
| download | linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz | |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'tools/perf/arch/arm64/util')
| -rw-r--r-- | tools/perf/arch/arm64/util/dwarf-regs.c | 5 | ||||
| -rw-r--r-- | tools/perf/arch/arm64/util/sym-handling.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tools/perf/arch/arm64/util/dwarf-regs.c b/tools/perf/arch/arm64/util/dwarf-regs.c index cd764a9fd098..b047b882c5b1 100644 --- a/tools/perf/arch/arm64/util/dwarf-regs.c +++ b/tools/perf/arch/arm64/util/dwarf-regs.c @@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Mapping of DWARF debug register numbers into register names. * * Copyright (C) 2010 Will Deacon, ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <errno.h> diff --git a/tools/perf/arch/arm64/util/sym-handling.c b/tools/perf/arch/arm64/util/sym-handling.c index 0051b1ee8450..27fcf24d6850 100644 --- a/tools/perf/arch/arm64/util/sym-handling.c +++ b/tools/perf/arch/arm64/util/sym-handling.c @@ -1,7 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. * * Copyright (C) 2015 Naveen N. Rao, IBM Corporation */ |