diff options
author | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
---|---|---|
committer | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/powerpc/kernel/cacheinfo.c | |
parent | hrtimer: Use a bullet for the returns bullet list (diff) | |
parent | MAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff) | |
download | kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.zip |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/powerpc/kernel/cacheinfo.c')
-rw-r--r-- | arch/powerpc/kernel/cacheinfo.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c index 862e2890bd3d..9fbb9d12e0c0 100644 --- a/arch/powerpc/kernel/cacheinfo.c +++ b/arch/powerpc/kernel/cacheinfo.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Processor cache information made available to userspace via sysfs; * intended to be compatible with x86 intel_cacheinfo implementation. * * Copyright 2008 IBM Corporation * Author: Nathan Lynch - * - * 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 <linux/cpu.h> @@ -353,8 +350,6 @@ static int cache_is_unified_d(const struct device_node *np) CACHE_TYPE_UNIFIED_D : CACHE_TYPE_UNIFIED; } -/* - */ static struct cache *cache_do_one_devnode_unified(struct device_node *node, int level) { pr_debug("creating L%d ucache for %pOF\n", level, node); |