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

Commit ec0ad3d0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/urgent' into sched/core 



Merge in asm goto fix, to be able to apply the asm/rmwcc.h fix.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3354781a 3f0116c3

arch/arm/Makefile

+7 −2
Original line number Original line Diff line number Diff line
@@ -296,10 +296,15 @@ archprepare: 
# Convert bzImage to zImage

# Convert bzImage to zImage

bzImage: zImage

bzImage: zImage





zImage Image xipImage bootpImage uImage: vmlinux

BOOT_TARGETS	= zImage Image xipImage bootpImage uImage

INSTALL_TARGETS	= zinstall uinstall install



PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@





zinstall uinstall install: vmlinux

$(INSTALL_TARGETS):

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@





%.dtb: | scripts

%.dtb: | scripts

arch/arm/boot/Makefile

+8 −8
Original line number Original line Diff line number Diff line
@@ -95,24 +95,24 @@ initrd: 
	@test "$(INITRD)" != "" || \

	@test "$(INITRD)" != "" || \

	(echo You must specify INITRD; exit -1)

	(echo You must specify INITRD; exit -1)





install: $(obj)/Image

install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/Image System.map "$(INSTALL_PATH)"

	$(obj)/Image System.map "$(INSTALL_PATH)"





zinstall: $(obj)/zImage

zinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/zImage System.map "$(INSTALL_PATH)"

	$(obj)/zImage System.map "$(INSTALL_PATH)"





uinstall: $(obj)/uImage

uinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/uImage System.map "$(INSTALL_PATH)"

	$(obj)/uImage System.map "$(INSTALL_PATH)"





zi:

zi:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/zImage System.map "$(INSTALL_PATH)"

	$(obj)/zImage System.map "$(INSTALL_PATH)"





i:

i:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/Image System.map "$(INSTALL_PATH)"

	$(obj)/Image System.map "$(INSTALL_PATH)"





subdir-	    := bootp compressed dts
 
subdir-	    := bootp compressed dts

arch/arm/boot/install.sh

+14 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,20 @@ 
#   $4 - default install path (blank if root directory)

#   $4 - default install path (blank if root directory)

#

#





verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2

		echo " *** Missing file: $1"                              1>&2

		echo ' *** You need to run "make" before "make install".' 1>&2

		echo ""                                                   1>&2

		exit 1

	fi

}



# Make sure the files actually exist

verify "$2"

verify "$3"



# User may have a custom install script

# User may have a custom install script

if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi

if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi

arch/arm/include/asm/jump_label.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




static __always_inline bool arch_static_branch(struct static_key *key)

static __always_inline bool arch_static_branch(struct static_key *key)

{

{

	asm goto("1:\n\t"

	asm_volatile_goto("1:\n\t"

		 JUMP_LABEL_NOP "\n\t"

		 JUMP_LABEL_NOP "\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".word 1b, %l[l_yes], %c0\n\t"

		 ".word 1b, %l[l_yes], %c0\n\t"

arch/mips/include/asm/jump_label.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 




static __always_inline bool arch_static_branch(struct static_key *key)

static __always_inline bool arch_static_branch(struct static_key *key)

{

{

	asm goto("1:\tnop\n\t"

	asm_volatile_goto("1:\tnop\n\t"

		"nop\n\t"

		"nop\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"