Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'powerpc-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fix boot failure on 603 with DEBUG_PAGEALLOC and KFENCE
- Fix 32-build with newer binutils that rejects 'ptesync' etc
Thanks to Anders Roxell, Christophe Leroy, and Maxime Bizon.
* tag 'powerpc-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/lib/sstep: fix 'ptesync' build error
powerpc/603: Fix boot failure with DEBUG_PAGEALLOC and KFENCE
+4
-2
+2
-2
arch/powerpc/kernel/head_book3s_32.S
+2
-2
arch/powerpc/kernel/head_book3s_32.S
···
421
421
*/
422
422
/* Get PTE (linux-style) and check access */
423
423
mfspr r3,SPRN_IMISS
424
-
#ifdef CONFIG_MODULES
424
+
#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE)
425
425
lis r1, TASK_SIZE@h /* check if kernel address */
426
426
cmplw 0,r1,r3
427
427
#endif
428
428
mfspr r2, SPRN_SDR1
429
429
li r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC | _PAGE_USER
430
430
rlwinm r2, r2, 28, 0xfffff000
431
-
#ifdef CONFIG_MODULES
431
+
#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE)
432
432
bgt- 112f
433
433
lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */
434
434
li r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC
+2
arch/powerpc/lib/sstep.c
+2
arch/powerpc/lib/sstep.c
···
3264
3264
case BARRIER_EIEIO:
3265
3265
eieio();
3266
3266
break;
3267
+
#ifdef CONFIG_PPC64
3267
3268
case BARRIER_LWSYNC:
3268
3269
asm volatile("lwsync" : : : "memory");
3269
3270
break;
3270
3271
case BARRIER_PTESYNC:
3271
3272
asm volatile("ptesync" : : : "memory");
3272
3273
break;
3274
+
#endif
3273
3275
}
3274
3276
break;
3275
3277