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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
"Two more powerpc fixes for 5.5:

- One commit to fix a build error when CONFIG_JUMP_LABEL=n,
introduced by our recent fix to is_shared_processor().

- A commit marking some SLB related functions as notrace, as tracing
them triggers warnings.

Thanks to Jason A Donenfeld"

* tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/spinlocks: Include correct header for static key
powerpc/mm: Mark get_slice_psize() & slice_addr_is_low() as notrace

Linus Torvalds 6f2e9c3d e35d0165

+3 -2
+1
arch/powerpc/include/asm/spinlock.h
··· 15 15 * 16 16 * (the type definitions are in asm/spinlock_types.h) 17 17 */ 18 + #include <linux/jump_label.h> 18 19 #include <linux/irqflags.h> 19 20 #ifdef CONFIG_PPC64 20 21 #include <asm/paca.h>
+2 -2
arch/powerpc/mm/slice.c
··· 50 50 51 51 #endif 52 52 53 - static inline bool slice_addr_is_low(unsigned long addr) 53 + static inline notrace bool slice_addr_is_low(unsigned long addr) 54 54 { 55 55 u64 tmp = (u64)addr; 56 56 ··· 659 659 mm_ctx_user_psize(&current->mm->context), 1); 660 660 } 661 661 662 - unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr) 662 + unsigned int notrace get_slice_psize(struct mm_struct *mm, unsigned long addr) 663 663 { 664 664 unsigned char *psizes; 665 665 int index, mask_index;