Commit 1dbbfe25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fix from Helge Deller:

 - Drop redundant register definitions to fix build with latest binutils

* tag 'parisc-for-6.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Delete redundant register definitions in <asm/assembly.h>
parents 606c812e b5b2a02b

arch/parisc/include/asm/assembly.h

+0 −4
Original line number Diff line number Diff line
@@ -90,10 +90,6 @@ 
#include <asm/asmregs.h>

#include <asm/psw.h>



	sp	=	30

	gp	=	27

	ipsw	=	22



	/*

	 * We provide two versions of each macro to convert from physical

	 * to virtual and vice versa. The "_r1" versions take one argument