tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S

Replace ifdef clutter with the PPC_LONG and PPC_LONG_ALIGN macros
for readability.

No change to the generated code.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Michael Ellerman and committed by
Benjamin Herrenschmidt 76bfdcf7 551c3c04

+6 -12
+6 -12
arch/powerpc/lib/string.S
··· 13 13 #include <asm/ppc_asm.h> 14 14 15 15 .section __ex_table,"a" 16 - #ifdef CONFIG_PPC64 17 - .align 3 18 - #define EXTBL .llong 19 - #else 20 - .align 2 21 - #define EXTBL .long 22 - #endif 16 + PPC_LONG_ALIGN 23 17 .text 24 18 25 19 _GLOBAL(strcpy) ··· 154 160 blr 155 161 156 162 .section __ex_table,"a" 157 - EXTBL 11b,90b 158 - EXTBL 1b,91b 159 - EXTBL 8b,92b 163 + PPC_LONG 11b,90b 164 + PPC_LONG 1b,91b 165 + PPC_LONG 8b,92b 160 166 .text 161 167 162 168 _GLOBAL(__strncpy_from_user) ··· 177 183 blr 178 184 179 185 .section __ex_table,"a" 180 - EXTBL 1b,99b 186 + PPC_LONG 1b,99b 181 187 .text 182 188 183 189 /* r3 = str, r4 = len (> 0), r5 = top (highest addr) */ ··· 202 208 blr 203 209 204 210 .section __ex_table,"a" 205 - EXTBL 1b,99b 211 + PPC_LONG 1b,99b