Merge tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (6f2e9c3d) · Commits · 戴 / test

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

arch/powerpc/include/asm/spinlock.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*
		* (the type definitions are in asm/spinlock_types.h)
		*/
		#include <linux/jump_label.h>
		#include <linux/irqflags.h>
		#ifdef CONFIG_PPC64
		#include <asm/paca.h>

arch/powerpc/mm/slice.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ static void slice_print_mask(const char label, const struct slice_mask mask) {

		#endif

		static inline bool slice_addr_is_low(unsigned long addr)
		static inline notrace bool slice_addr_is_low(unsigned long addr)
		{
		u64 tmp = (u64)addr;

		@@ -659,7 +659,7 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp,
		mm_ctx_user_psize(&current->mm->context), 1);
		}

		unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr)
		unsigned int notrace get_slice_psize(struct mm_struct *mm, unsigned long addr)
		{
		unsigned char *psizes;
		int index, mask_index;

Admin message