Commit c82357a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Don't use r30 in VDSO code, to avoid breaking existing Go lang
   programs.

 - Change an export symbol to allow non-GPL modules to use spinlocks
   again.

Thanks to Paul Menzel, and Srikar Dronamraju.

* tag 'powerpc-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/vdso: Don't use r30 to avoid breaking Go lang
  powerpc/pseries: Fix regression while building external modules
parents aa660326 a88603f4

arch/powerpc/kernel/vdso64/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ KASAN_SANITIZE := n 


ccflags-y := -shared -fno-common -fno-builtin -nostdlib \

	-Wl,-soname=linux-vdso64.so.1 -Wl,--hash-style=both



# Go prior to 1.16.x assumes r30 is not clobbered by any VDSO code. That used to be true

# by accident when the VDSO was hand-written asm code, but may not be now that the VDSO is

# compiler generated. To avoid breaking Go tell GCC not to use r30. Impact on code

# generation is minimal, it will just use r29 instead.

ccflags-y += $(call cc-option, -ffixed-r30)



asflags-y := -D__VDSO64__ -s



targets += vdso64.lds

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
#include "../../../../drivers/pci/pci.h"



DEFINE_STATIC_KEY_FALSE(shared_processor);

EXPORT_SYMBOL_GPL(shared_processor);

EXPORT_SYMBOL(shared_processor);



int CMO_PrPSP = -1;

int CMO_SecPSP = -1;