Skip to content

Commit eb03916

Browse files
tchardingmpe
authored andcommitted
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: Tobin C. Harding <me@tobin.cc> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent 5b59394 commit eb03916

File tree

12 files changed

+40
-40
lines changed

12 files changed

+40
-40
lines changed

arch/powerpc/boot/crt0.S

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ _zimage_start_opd:
2626

2727
#ifdef __powerpc64__
2828
.balign 8
29-
p_start: .llong _start
30-
p_etext: .llong _etext
31-
p_bss_start: .llong __bss_start
32-
p_end: .llong _end
33-
34-
p_toc: .llong __toc_start + 0x8000 - p_base
35-
p_dyn: .llong __dynamic_start - p_base
36-
p_rela: .llong __rela_dyn_start - p_base
37-
p_prom: .llong 0
29+
p_start: .8byte _start
30+
p_etext: .8byte _etext
31+
p_bss_start: .8byte __bss_start
32+
p_end: .8byte _end
33+
34+
p_toc: .8byte __toc_start + 0x8000 - p_base
35+
p_dyn: .8byte __dynamic_start - p_base
36+
p_rela: .8byte __rela_dyn_start - p_base
37+
p_prom: .8byte 0
3838
.weak _platform_stack_top
39-
p_pstack: .llong _platform_stack_top
39+
p_pstack: .8byte _platform_stack_top
4040
#else
4141
p_start: .long _start
4242
p_etext: .long _etext

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define PPC_LCMPI stringify_in_c(cmpdi)
2626
#define PPC_LCMPLI stringify_in_c(cmpldi)
2727
#define PPC_LCMP stringify_in_c(cmpd)
28-
#define PPC_LONG stringify_in_c(.llong)
28+
#define PPC_LONG stringify_in_c(.8byte)
2929
#define PPC_LONG_ALIGN stringify_in_c(.balign 8)
3030
#define PPC_TLNEI stringify_in_c(tdnei)
3131
#define PPC_LLARX(t, a, b, eh) PPC_LDARX(t, a, b, eh)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
*/
2020
#if defined(CONFIG_PPC64) && !defined(__powerpc64__)
2121
/* 64 bits kernel, 32 bits code (ie. vdso32) */
22-
#define FTR_ENTRY_LONG .llong
22+
#define FTR_ENTRY_LONG .8byte
2323
#define FTR_ENTRY_OFFSET .long 0xffffffff; .long
2424
#elif defined(CONFIG_PPC64)
25-
#define FTR_ENTRY_LONG .llong
26-
#define FTR_ENTRY_OFFSET .llong
25+
#define FTR_ENTRY_LONG .8byte
26+
#define FTR_ENTRY_OFFSET .8byte
2727
#else
2828
#define FTR_ENTRY_LONG .long
2929
#define FTR_ENTRY_OFFSET .long

arch/powerpc/include/asm/reg.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,12 +1344,12 @@ static inline void msr_check_and_clear(unsigned long bits)
13441344
".section __ftr_fixup,\"a\"\n" \
13451345
".align 3\n" \
13461346
"98:\n" \
1347-
" .llong %1\n" \
1348-
" .llong %1\n" \
1349-
" .llong 97b-98b\n" \
1350-
" .llong 99b-98b\n" \
1351-
" .llong 0\n" \
1352-
" .llong 0\n" \
1347+
" .8byte %1\n" \
1348+
" .8byte %1\n" \
1349+
" .8byte 97b-98b\n" \
1350+
" .8byte 99b-98b\n" \
1351+
" .8byte 0\n" \
1352+
" .8byte 0\n" \
13531353
".previous" \
13541354
: "=r" (rval) \
13551355
: "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL) : "cr0"); \

arch/powerpc/kernel/entry_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ _ASM_NOKPROBE_SYMBOL(__enter_rtas)
11041104
_ASM_NOKPROBE_SYMBOL(rtas_return_loc)
11051105

11061106
.align 3
1107-
1: .llong rtas_restore_regs
1107+
1: .8byte rtas_restore_regs
11081108

11091109
rtas_restore_regs:
11101110
/* relocation is on at this point */

arch/powerpc/kernel/head_64.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ END_FTR_SECTION(0, 1)
9292
.balign 8
9393
.globl __secondary_hold_spinloop
9494
__secondary_hold_spinloop:
95-
.llong 0x0
95+
.8byte 0x0
9696

9797
/* Secondary processors write this value with their cpu # */
9898
/* after they enter the spin loop immediately below. */
9999
.globl __secondary_hold_acknowledge
100100
__secondary_hold_acknowledge:
101-
.llong 0x0
101+
.8byte 0x0
102102

103103
#ifdef CONFIG_RELOCATABLE
104104
/* This flag is set to 1 by a loader if the kernel should run
@@ -650,7 +650,7 @@ __after_prom_start:
650650
bctr
651651

652652
.balign 8
653-
p_end: .llong _end - copy_to_here
653+
p_end: .8byte _end - copy_to_here
654654

655655
4:
656656
/*
@@ -892,7 +892,7 @@ _GLOBAL(relative_toc)
892892
blr
893893

894894
.balign 8
895-
p_toc: .llong __toc_start + 0x8000 - 0b
895+
p_toc: .8byte __toc_start + 0x8000 - 0b
896896

897897
/*
898898
* This is where the main kernel code starts.

arch/powerpc/kernel/reloc_64.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ _GLOBAL(relocate)
8282
6: blr
8383

8484
.balign 8
85-
p_dyn: .llong __dynamic_start - 0b
86-
p_rela: .llong __rela_dyn_start - 0b
87-
p_st: .llong _stext - 0b
85+
p_dyn: .8byte __dynamic_start - 0b
86+
p_rela: .8byte __rela_dyn_start - 0b
87+
p_st: .8byte _stext - 0b
8888

arch/powerpc/kernel/systbl.S

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#include <asm/ppc_asm.h>
1818

1919
#ifdef CONFIG_PPC64
20-
#define SYSCALL(func) .llong DOTSYM(sys_##func),DOTSYM(sys_##func)
21-
#define COMPAT_SYS(func) .llong DOTSYM(sys_##func),DOTSYM(compat_sys_##func)
22-
#define PPC_SYS(func) .llong DOTSYM(ppc_##func),DOTSYM(ppc_##func)
23-
#define OLDSYS(func) .llong DOTSYM(sys_ni_syscall),DOTSYM(sys_ni_syscall)
24-
#define SYS32ONLY(func) .llong DOTSYM(sys_ni_syscall),DOTSYM(compat_sys_##func)
25-
#define PPC64ONLY(func) .llong DOTSYM(ppc_##func),DOTSYM(sys_ni_syscall)
26-
#define SYSX(f, f3264, f32) .llong DOTSYM(f),DOTSYM(f3264)
20+
#define SYSCALL(func) .8byte DOTSYM(sys_##func),DOTSYM(sys_##func)
21+
#define COMPAT_SYS(func) .8byte DOTSYM(sys_##func),DOTSYM(compat_sys_##func)
22+
#define PPC_SYS(func) .8byte DOTSYM(ppc_##func),DOTSYM(ppc_##func)
23+
#define OLDSYS(func) .8byte DOTSYM(sys_ni_syscall),DOTSYM(sys_ni_syscall)
24+
#define SYS32ONLY(func) .8byte DOTSYM(sys_ni_syscall),DOTSYM(compat_sys_##func)
25+
#define PPC64ONLY(func) .8byte DOTSYM(ppc_##func),DOTSYM(sys_ni_syscall)
26+
#define SYSX(f, f3264, f32) .8byte DOTSYM(f),DOTSYM(f3264)
2727
#else
2828
#define SYSCALL(func) .long sys_##func
2929
#define COMPAT_SYS(func) .long sys_##func

arch/powerpc/platforms/powernv/opal-wrappers.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
.globl opal_tracepoint_refcount
2929
opal_tracepoint_refcount:
30-
.llong 0
30+
.8byte 0
3131

3232
.section ".text"
3333

arch/powerpc/platforms/pseries/hvCall.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
.globl hcall_tracepoint_refcount
2525
hcall_tracepoint_refcount:
26-
.llong 0
26+
.8byte 0
2727

2828
.section ".text"
2929
#endif

0 commit comments

Comments
 (0)