Skip to content

Commit 21d2f68

Browse files
committed
Merge tag 'powerpc-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: - A fix for a crash in nested KVM when CONFIG_DEBUG_VIRTUAL=y. - Two minor build fixes. Thanks to: Aneesh Kumar K.V, Arseny Solokha, Harish. * tag 'powerpc-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: selftests/powerpc: Fix build failure in ebb tests powerpc/kvm/book3s64: Fix kernel crash with nested kvm & DEBUG_VIRTUAL powerpc/fsl_booke/32: Fix build with CONFIG_RANDOMIZE_BASE
2 parents 3b6ab10 + 896066a commit 21d2f68

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

arch/powerpc/kvm/book3s_64_mmu_radix.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid,
4040
/* Can't access quadrants 1 or 2 in non-HV mode, call the HV to do it */
4141
if (kvmhv_on_pseries())
4242
return plpar_hcall_norets(H_COPY_TOFROM_GUEST, lpid, pid, eaddr,
43-
__pa(to), __pa(from), n);
43+
(to != NULL) ? __pa(to): 0,
44+
(from != NULL) ? __pa(from): 0, n);
4445

4546
quadrant = 1;
4647
if (!pid)

arch/powerpc/mm/nohash/kaslr_booke.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/memblock.h>
1515
#include <linux/libfdt.h>
1616
#include <linux/crash_core.h>
17+
#include <asm/cacheflush.h>
1718
#include <asm/pgalloc.h>
1819
#include <asm/prom.h>
1920
#include <asm/kdump.h>

tools/testing/selftests/powerpc/pmu/ebb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ noarg:
77
# The EBB handler is 64-bit code and everything links against it
88
CFLAGS += -m64
99

10-
TMPOUT = $(OUTPUT)/
10+
TMPOUT = $(OUTPUT)/TMPDIR/
1111
# Toolchains may build PIE by default which breaks the assembly
1212
no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \
1313
$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)

0 commit comments

Comments
 (0)