diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
| commit | 24e8a2ca1f74574ad2ed1ac7af0260dd90fd911e (patch) | |
| tree | c863dd43c84579d853f3a2ae0ee6ead46c967703 /arch/sparc/kernel | |
| parent | 66f61c92889ff3ca365161fb29dd36d6354682ba (diff) | |
| parent | d724c9e54939a597592de3659541da11fc7aa112 (diff) | |
Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
PPC KVM fixes for 5.2
- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/chmc.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/ds.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/helpers.S | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/led.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/nmi.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/of_device_common.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/pcr.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/ptrace_64.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/stacktrace.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/traps_64.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/uprobes.c | 14 |
11 files changed, 11 insertions, 13 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 61fe1b951ba3..6ff43df740e0 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* chmc.c: Driver for UltraSPARC-III memory controller. | 2 | /* chmc.c: Driver for UltraSPARC-III memory controller. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2001, 2007, 2008 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 2001, 2007, 2008 David S. Miller (davem@davemloft.net) |
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index cad08ccce625..bbf59b3b4af8 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* ds.c: Domain Services driver for Logical Domains | 2 | /* ds.c: Domain Services driver for Logical Domains |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net> | 4 | * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net> |
diff --git a/arch/sparc/kernel/helpers.S b/arch/sparc/kernel/helpers.S index e4e5b832fcb6..9b3f74706cfb 100644 --- a/arch/sparc/kernel/helpers.S +++ b/arch/sparc/kernel/helpers.S | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | .align 32 | 2 | .align 32 |
| 2 | .globl __flushw_user | 3 | .globl __flushw_user |
| 3 | .type __flushw_user,#function | 4 | .type __flushw_user,#function |
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 519f5ba7ed7e..a6292f8ed180 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 2 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 3 | #include <linux/init.h> | 4 | #include <linux/init.h> |
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index 8babbeb30adf..060fff95a305 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* Pseudo NMI support on sparc64 systems. | 2 | /* Pseudo NMI support on sparc64 systems. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2009 David S. Miller <davem@davemloft.net> | 4 | * Copyright (C) 2009 David S. Miller <davem@davemloft.net> |
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c index b186b7f0f6c4..b32cc5610712 100644 --- a/arch/sparc/kernel/of_device_common.c +++ b/arch/sparc/kernel/of_device_common.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | #include <linux/string.h> | 2 | #include <linux/string.h> |
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/of.h> | 4 | #include <linux/of.h> |
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c index eb978c77c76a..c0886b400dad 100644 --- a/arch/sparc/kernel/pcr.c +++ b/arch/sparc/kernel/pcr.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* pcr.c: Generic sparc64 performance counter infrastructure. | 2 | /* pcr.c: Generic sparc64 performance counter infrastructure. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 2009 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 2009 David S. Miller (davem@davemloft.net) |
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c index e1d965e90e16..c9d41a96468f 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* ptrace.c: Sparc process tracing support. | 2 | /* ptrace.c: Sparc process tracing support. |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net) |
diff --git a/arch/sparc/kernel/stacktrace.c b/arch/sparc/kernel/stacktrace.c index dd654e651500..d8eb1d149f9f 100644 --- a/arch/sparc/kernel/stacktrace.c +++ b/arch/sparc/kernel/stacktrace.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | #include <linux/sched.h> | 2 | #include <linux/sched.h> |
| 2 | #include <linux/sched/debug.h> | 3 | #include <linux/sched/debug.h> |
| 3 | #include <linux/stacktrace.h> | 4 | #include <linux/stacktrace.h> |
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 0cd02a64a451..04aa588d5dd1 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* arch/sparc64/kernel/traps.c | 2 | /* arch/sparc64/kernel/traps.c |
| 2 | * | 3 | * |
| 3 | * Copyright (C) 1995,1997,2008,2009,2012 David S. Miller (davem@davemloft.net) | 4 | * Copyright (C) 1995,1997,2008,2009,2012 David S. Miller (davem@davemloft.net) |
diff --git a/arch/sparc/kernel/uprobes.c b/arch/sparc/kernel/uprobes.c index c44bf5b85de8..1a0600206bf5 100644 --- a/arch/sparc/kernel/uprobes.c +++ b/arch/sparc/kernel/uprobes.c | |||
| @@ -1,21 +1,9 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * User-space Probes (UProbes) for sparc | 3 | * User-space Probes (UProbes) for sparc |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2013 Oracle Inc. | 5 | * Copyright (C) 2013 Oracle Inc. |
| 5 | * | 6 | * |
| 6 | * This program is free software: you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation, either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | * | ||
| 19 | * Authors: | 7 | * Authors: |
| 20 | * Jose E. Marchesi <jose.marchesi@oracle.com> | 8 | * Jose E. Marchesi <jose.marchesi@oracle.com> |
| 21 | * Eric Saint Etienne <eric.saint.etienne@oracle.com> | 9 | * Eric Saint Etienne <eric.saint.etienne@oracle.com> |
