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

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

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

Pull parisc fixes from Helge Deller:

 - Unbreak parisc bootloader by avoiding a gcc-7 optimization to convert
   multiple byte-accesses into one word-access.

 - Add missing HWPOISON page fault handler code. I completely missed
   that when I added HWPOISON support during this merge window and it
   only showed up now with the madvise07 LTP test case.

 - Fix backtrace unwinding to stop when stack start has been reached.

 - Issue warning if initrd has been loaded into memory regions with
   broken RAM modules.

 - Fix HPMC handler (parisc hardware fault handler) to comply with
   architecture specification.

 - Avoid compiler warnings about too large frame sizes.

 - Minor init-section fixes.

* 'parisc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Unbreak bootloader due to gcc-7 optimizations
  parisc: Reintroduce option to gzip-compress the kernel
  parisc: Add HWPOISON page fault handler code
  parisc: Move init_per_cpu() into init section
  parisc: Check if initrd was loaded into broken RAM
  parisc: Add PDCE_CHECK instruction to HPMC handler
  parisc: Add wrapper for pdc_instr() firmware function
  parisc: Move start_parisc() into init section
  parisc: Stop unwinding at start of stack
  parisc: Fix too large frame size warnings
parents ded85032 8c031ba6

arch/parisc/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -257,6 +257,18 @@ config PARISC_PAGE_SIZE_64KB 


endchoice



config PARISC_SELF_EXTRACT

	bool "Build kernel as self-extracting executable"

	default y

	help

	  Say Y if you want to build the parisc kernel as a kind of

	  self-extracting executable.



	  If you say N here, the kernel will be compressed with gzip

	  which can be loaded by the palo bootloader directly too.



	  If you don't know what to do here, say Y.



config SMP

	bool "Symmetric multi-processing support"

	---help---

arch/parisc/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -129,8 +129,13 @@ Image: vmlinux 
bzImage: vmlinux

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



ifdef CONFIG_PARISC_SELF_EXTRACT

vmlinuz: bzImage

	$(OBJCOPY) $(boot)/bzImage $@

else

vmlinuz: vmlinux

	@gzip -cf -9 $< > $@

endif



install:

	$(CONFIG_SHELL) $(src)/arch/parisc/install.sh \

arch/parisc/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ targets += misc.o piggy.o sizes.h head.o real2.o firmware.o 
KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks

KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs

KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os

ifndef CONFIG_64BIT

KBUILD_CFLAGS += -mfast-indirect-calls

endif

arch/parisc/boot/compressed/misc.c

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
/* Symbols defined by linker scripts */

extern char input_data[];

extern int input_len;

extern __le32 output_len;	/* at unaligned address, little-endian */

/* output_len is inserted by the linker possibly at an unaligned address */

extern __le32 output_len __aligned(1);

extern char _text, _end;

extern char _bss, _ebss;

extern char _startcode_end;

arch/parisc/include/asm/pdc.h

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ void setup_pdc(void); /* in inventory.c */ 
/* wrapper-functions from pdc.c */



int pdc_add_valid(unsigned long address);

int pdc_instr(unsigned int *instr);

int pdc_chassis_info(struct pdc_chassis_info *chassis_info, void *led_info, unsigned long len);

int pdc_chassis_disp(unsigned long disp);

int pdc_chassis_warn(unsigned long *warn);