Commit 9100fc5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-5.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:
 "A few small fixes for the parisc architecture:

   - Fix fall-through warnings in parisc math emu code

   - Fix vmlinuz linking failure with debug-enabled kernels

   - Fix a race condition in kernel live-patching code

   - Add missing archclean Makefile target & defconfig adjustments"

* 'parisc-5.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Add archclean Makefile target
  parisc: Strip debug info from kernel before creating compressed vmlinuz
  parisc: Fix build of compressed kernel even with debug enabled
  parisc: fix race condition in patching code
  parisc: rename default_defconfig to defconfig
  parisc: Fix fall-through warnings in fpudispatch.c
  parisc: Mark expected switch fall-throughs in fault.c
parents 4dd68199 f2c5ed0d

arch/parisc/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


KBUILD_IMAGE := vmlinuz



KBUILD_DEFCONFIG := default_defconfig



NM		= sh $(srctree)/arch/parisc/nm

CHECKFLAGS	+= -D__hppa__=1

LIBGCC		= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
@@ -182,5 +180,8 @@ define archhelp 
	@echo  '  zinstall	- Install compressed vmlinuz kernel'

endef



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



archheaders:

	$(Q)$(MAKE) $(build)=arch/parisc/kernel/syscalls all

arch/parisc/boot/compressed/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ UBSAN_SANITIZE := n 
targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

targets += misc.o piggy.o sizes.h head.o real2.o firmware.o

targets += real2.S firmware.c



KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -55,7 +56,8 @@ $(obj)/misc.o: $(obj)/sizes.h 
CPPFLAGS_vmlinux.lds += -I$(objtree)/$(obj) -DBOOTLOADER

$(obj)/vmlinux.lds: $(obj)/sizes.h



$(obj)/vmlinux.bin: vmlinux

OBJCOPYFLAGS_vmlinux.bin := -R .comment -R .note -S

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



vmlinux.bin.all-y := $(obj)/vmlinux.bin

arch/parisc/boot/compressed/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ SECTIONS 
		*(.rodata.compressed)

	}



	/* bootloader code and data starts behind area of extracted kernel */

	. = (SZ_end - SZparisc_kernel_start + KERNEL_BINARY_TEXT_START);

	/* bootloader code and data starts at least behind area of extracted kernel */

	. = MAX(ABSOLUTE(.), (SZ_end - SZparisc_kernel_start + KERNEL_BINARY_TEXT_START));



	/* align on next page boundary */

	. = ALIGN(4096);

arch/parisc/kernel/ftrace.c

+2 −1
Original line number Diff line number Diff line
@@ -181,8 +181,9 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, 
	for (i = 0; i < ARRAY_SIZE(insn); i++)

		insn[i] = INSN_NOP;



	__patch_text((void *)rec->ip, INSN_NOP);

	__patch_text_multiple((void *)rec->ip + 4 - sizeof(insn),

			      insn, sizeof(insn));

			      insn, sizeof(insn)-4);

	return 0;

}

#endif