Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3250aab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fixlets from Ingo Molnar:
 "An endianness fix and a jump labels branch hint update"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/qrwlock: include asm/byteorder.h as needed
  jump_label: Add branch hints to static_branch_{un,}likely()
parents 0dc400f4 ca66e797

include/asm-generic/qrwlock_types.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define __ASM_GENERIC_QRWLOCK_TYPES_H



#include <linux/types.h>

#include <asm/byteorder.h>

#include <asm/spinlock_types.h>



/*

include/linux/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ extern bool ____wrong_branch_error(void); 
		branch = !arch_static_branch_jump(&(x)->key, true);		\

	else									\

		branch = ____wrong_branch_error();				\

	branch;									\

	likely(branch);								\

})



#define static_branch_unlikely(x)						\
@@ -405,7 +405,7 @@ extern bool ____wrong_branch_error(void); 
		branch = arch_static_branch(&(x)->key, false);			\

	else									\

		branch = ____wrong_branch_error();				\

	branch;									\

	unlikely(branch);							\

})



#else /* !HAVE_JUMP_LABEL */