Commit 07eecff8 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Mark jump_table naturally aligned 



The jump_table stores two 32-bit words and one 32- (on 32-bit kernel)
or one 64-bit word (on 64-bit kernel).
Ensure that the last word is always 64-bit aligned on a 64-bit kernel
by aligning the whole structure on sizeof(long).

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org   # v6.0+
parent 33f806da

arch/parisc/include/asm/jump_label.h

+6 −2
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran 
	asm_volatile_goto("1:\n\t"

		 "nop\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align %1\n\t"

		 ".word 1b - ., %l[l_yes] - .\n\t"

		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"

		 ".popsection\n\t"

		 : :  "i" (&((char *)key)[branch]) :  : l_yes);

		 : : "i" (&((char *)key)[branch]), "i" (sizeof(long))

		 : : l_yes);



	return false;

l_yes:
@@ -30,10 +32,12 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool 
	asm_volatile_goto("1:\n\t"

		 "b,n %l[l_yes]\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align %1\n\t"

		 ".word 1b - ., %l[l_yes] - .\n\t"

		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"

		 ".popsection\n\t"

		 : :  "i" (&((char *)key)[branch]) :  : l_yes);

		 : : "i" (&((char *)key)[branch]), "i" (sizeof(long))

		 : : l_yes);



	return false;

l_yes: