Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb039161 authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Michael Ellerman
Browse files

powerpc/asm: Convert .llong directives to .8byte 



.llong is an undocumented PPC specific directive. The generic
equivalent is .quad, but even better (because it's self describing) is
.8byte.

Convert all .llong directives to .8byte.

Signed-off-by: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5b593949

arch/powerpc/boot/crt0.S

+10 −10
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@ _zimage_start_opd: 


#ifdef __powerpc64__

.balign 8

p_start:	.llong	_start

p_etext:	.llong	_etext

p_bss_start:	.llong	__bss_start

p_end:		.llong	_end



p_toc:		.llong	__toc_start + 0x8000 - p_base

p_dyn:		.llong	__dynamic_start - p_base

p_rela:		.llong	__rela_dyn_start - p_base

p_prom:		.llong	0

p_start:	.8byte	_start

p_etext:	.8byte	_etext

p_bss_start:	.8byte	__bss_start

p_end:		.8byte	_end



p_toc:		.8byte	__toc_start + 0x8000 - p_base

p_dyn:		.8byte	__dynamic_start - p_base

p_rela:		.8byte	__rela_dyn_start - p_base

p_prom:		.8byte	0

	.weak	_platform_stack_top

p_pstack:	.llong	_platform_stack_top

p_pstack:	.8byte	_platform_stack_top

#else

p_start:	.long	_start

p_etext:	.long	_etext

arch/powerpc/include/asm/asm-compat.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define PPC_LCMPI	stringify_in_c(cmpdi)

#define PPC_LCMPLI	stringify_in_c(cmpldi)

#define PPC_LCMP	stringify_in_c(cmpd)

#define PPC_LONG	stringify_in_c(.llong)

#define PPC_LONG	stringify_in_c(.8byte)

#define PPC_LONG_ALIGN	stringify_in_c(.balign 8)

#define PPC_TLNEI	stringify_in_c(tdnei)

#define PPC_LLARX(t, a, b, eh)	PPC_LDARX(t, a, b, eh)

arch/powerpc/include/asm/feature-fixups.h

+3 −3
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 
 */

#if defined(CONFIG_PPC64) && !defined(__powerpc64__)

/* 64 bits kernel, 32 bits code (ie. vdso32) */

#define FTR_ENTRY_LONG		.llong

#define FTR_ENTRY_LONG		.8byte

#define FTR_ENTRY_OFFSET	.long 0xffffffff; .long

#elif defined(CONFIG_PPC64)

#define FTR_ENTRY_LONG		.llong

#define FTR_ENTRY_OFFSET	.llong

#define FTR_ENTRY_LONG		.8byte

#define FTR_ENTRY_OFFSET	.8byte

#else

#define FTR_ENTRY_LONG		.long

#define FTR_ENTRY_OFFSET	.long

arch/powerpc/include/asm/reg.h

+6 −6
Original line number Diff line number Diff line
@@ -1344,12 +1344,12 @@ static inline void msr_check_and_clear(unsigned long bits) 
				".section __ftr_fixup,\"a\"\n"		\

				".align 3\n"				\

				"98:\n"					\

				"	.llong %1\n"			\

				"	.llong %1\n"			\

				"	.llong 97b-98b\n"		\

				"	.llong 99b-98b\n"		\

				"	.llong 0\n"			\

				"	.llong 0\n"			\

				"	.8byte %1\n"			\

				"	.8byte %1\n"			\

				"	.8byte 97b-98b\n"		\

				"	.8byte 99b-98b\n"		\

				"	.8byte 0\n"			\

				"	.8byte 0\n"			\

				".previous"				\

			: "=r" (rval) \

			: "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL) : "cr0"); \

arch/powerpc/kernel/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ _ASM_NOKPROBE_SYMBOL(__enter_rtas) 
_ASM_NOKPROBE_SYMBOL(rtas_return_loc)



	.align	3

1:	.llong	rtas_restore_regs

1:	.8byte	rtas_restore_regs



rtas_restore_regs:

	/* relocation is on at this point */