Patch "csky: fix arch_jump_label_transform_static override" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    csky: fix arch_jump_label_transform_static override

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     csky-fix-arch_jump_label_transform_static-override.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a5d83457e8f3f4e42250c61f0c5bdcf8462241e1
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date:   Mon Nov 6 22:02:59 2023 +0100

    csky: fix arch_jump_label_transform_static override
    
    [ Upstream commit ca8e45c8048a2c9503c74751d25414601f730580 ]
    
    The arch_jump_label_transform_static() function in csky was originally meant to
    override the generic __weak function, but that got changed to an #ifndef check.
    
    This showed up as a missing-prototype warning:
    arch/csky/kernel/jump_label.c:43:6: error: no previous prototype for 'arch_jump_label_transform_static' [-Werror=missing-prototypes]
    
    Change the method to use the new method of having a #define and a prototype
    for the global function.
    
    Fixes: 7e6b9db27de9 ("jump_label: make initial NOP patching the special case")
    Fixes: 4e8bb4ba5a55 ("csky: Add jump-label implementation")
    Reviewed-by: Guo Ren <guoren@xxxxxxxxxx>
    Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/csky/include/asm/jump_label.h b/arch/csky/include/asm/jump_label.h
index d488ba6084bc..98a3f4b168bd 100644
--- a/arch/csky/include/asm/jump_label.h
+++ b/arch/csky/include/asm/jump_label.h
@@ -43,5 +43,10 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key,
 	return true;
 }
 
+enum jump_label_type;
+void arch_jump_label_transform_static(struct jump_entry *entry,
+				      enum jump_label_type type);
+#define arch_jump_label_transform_static arch_jump_label_transform_static
+
 #endif  /* __ASSEMBLY__ */
 #endif	/* __ASM_CSKY_JUMP_LABEL_H */




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux