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

Merge tag 'powerpc-6.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fix from Michael Ellerman:

 - Allow r30 to be used in vDSO code generation of getrandom

Thanks to Jason A. Donenfeld

* tag 'powerpc-6.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/vdso: allow r30 in vDSO code generation of getrandom
parents 8f602276 4b058c9f

arch/powerpc/kernel/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ endif 


ifneq ($(c-getrandom-y),)

  CFLAGS_vgetrandom-32.o += -include $(c-getrandom-y)

  CFLAGS_vgetrandom-64.o += -include $(c-getrandom-y) $(call cc-option, -ffixed-r30)

  CFLAGS_vgetrandom-64.o += -include $(c-getrandom-y)

endif



# Build rules