diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2019-08-23 14:08:04 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2019-08-23 14:08:04 +1000 |
| commit | 75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 (patch) | |
| tree | 1817fd08e5cf8a65e7958711c4e8b15554b4d5a2 /arch/powerpc/platforms/cell/cpufreq_spudemand.c | |
| parent | 3bda7f0ae0f786b202c0c5124c208be067acca30 (diff) | |
| parent | da15c03b047dca891d37b9f4ef9ca14d84a6484f (diff) | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in fixes for the XIVE interrupt controller which touch both
generic powerpc and PPC KVM code. To avoid merge conflicts, these
commits will go upstream via the powerpc tree as well as the KVM tree.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/platforms/cell/cpufreq_spudemand.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/cpufreq_spudemand.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c index 5d8e8b6bb1cc..55b31eadb3c8 100644 --- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c +++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c @@ -1,23 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * spu aware cpufreq governor for the cell processor * * © Copyright IBM Corporation 2006-2008 * * Author: Christian Krafft <krafft@de.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, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <linux/cpufreq.h> |