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

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

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

Pull parisc updates from Helge Deller:
 "Major changes include:

   - Full support of the firmware Page Deallocation Table with
     MADV_HWPOISON and MADV_SOFT_OFFLINE. A kernel thread scans
     regularily for new bad memory pages.

   - Full support for self-extracting kernel.

   - Added UBSAN support.

   - Lots of section mismatch fixes across all parisc drivers.

   - Added examples for %pF and %pS usage in printk-formats.txt"

* 'parisc-4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: (28 commits)
  printk-formats.txt: Add examples for %pF and %pS usage
  parisc: Fix up devices below a PCI-PCI MegaRAID controller bridge
  parisc/core: Fix section mismatches
  parisc/ipmi_si_intf: Fix section mismatches on parisc platform
  parisc/input/hilkbd: Fix section mismatches
  parisc/net/lasi_82596: Fix section mismatches
  parisc/serio: Fix section mismatches in gscps2 and hp_sdc drivers
  parisc: Fix section mismatches in parisc core drivers
  parisc/parport_gsc: Fix section mismatches
  parisc/scsi/lasi700: Fix section mismatches
  parisc/scsi/zalon: Fix section mismatches
  parisc/8250_gsc: Fix section mismatches
  parisc/mux: Fix section mismatches
  parisc/sticore: Fix section mismatches
  parisc/harmony: Fix section mismatches
  parisc: Wire up support for self-extracting kernel
  parisc: Make existing core files reuseable for bootloader
  parisc: Add core code for self-extracting kernel
  parisc: Enable UBSAN support
  parisc/random: Add machine specific randomness
  ...
parents d1ce4956 fd46cd55

Documentation/printk-formats.txt

+10 −0
Original line number Diff line number Diff line
@@ -75,6 +75,16 @@ used when printing stack backtraces. The specifier takes into 
consideration the effect of compiler optimisations which may occur

when tail-call``s are used and marked with the noreturn GCC attribute.



Examples::



	printk("Going to call: %pF\n", gettimeofday);

	printk("Going to call: %pF\n", p->func);

	printk("%s: called from %pS\n", __func__, (void *)_RET_IP_);

	printk("%s: called from %pS\n", __func__,

				(void *)__builtin_return_address(0));

	printk("Faulted at %pS\n", (void *)regs->ip);

	printk(" %s%pB\n", (reliable ? "" : "? "), (void *)*stack);





Kernel Pointers

===============

arch/parisc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ config PARISC 
	select ARCH_WANT_FRAME_POINTERS

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_WANTS_UBSAN_NO_NULL

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select RTC_CLASS

	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE
@@ -17,6 +20,12 @@ config PARISC 
	select BUG

	select BUILDTIME_EXTABLE_SORT

	select HAVE_PERF_EVENTS

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZ4

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select GENERIC_ATOMIC64 if !64BIT

	select GENERIC_IRQ_PROBE

	select GENERIC_PCI_IOMAP

arch/parisc/Makefile

+13 −3
Original line number Diff line number Diff line
@@ -24,15 +24,20 @@ KBUILD_DEFCONFIG := default_defconfig 
NM		= sh $(srctree)/arch/parisc/nm

CHECKFLAGS	+= -D__hppa__=1

LIBGCC		= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

export LIBGCC



ifdef CONFIG_64BIT

UTS_MACHINE	:= parisc64

CHECKFLAGS	+= -D__LP64__=1 -m64

CC_ARCHES	= hppa64

LD_BFD		:= elf64-hppa-linux

else # 32-bit

CC_ARCHES	= hppa hppa2.0 hppa1.1

LD_BFD		:= elf32-hppa-linux

endif



export LD_BFD



ifneq ($(SUBARCH),$(UTS_MACHINE))

	ifeq ($(CROSS_COMPILE),)

		CC_SUFFIXES = linux linux-gnu unknown-linux-gnu
@@ -88,6 +93,8 @@ libs-y += arch/parisc/lib/ $(LIBGCC) 


drivers-$(CONFIG_OPROFILE)		+= arch/parisc/oprofile/



boot	:= arch/parisc/boot



PALO := $(shell if (which palo 2>&1); then : ; \

	elif [ -x /sbin/palo ]; then echo /sbin/palo; \

	fi)
@@ -116,11 +123,14 @@ INSTALL_TARGETS = zinstall install 


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



bzImage zImage: vmlinuz

zImage: vmlinuz

Image: vmlinux



vmlinuz: vmlinux

	@gzip -cf -9 $< > $@

bzImage: vmlinux

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



vmlinuz: bzImage

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



install:

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

arch/parisc/boot/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
image

bzImage

arch/parisc/boot/Makefile

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux parisc-specific parts of the boot image creator.

#



COMPILE_VERSION := __linux_compile_version_id__`hostname |  \

			tr -c '[0-9A-Za-z]' '_'`__`date | \

			tr -c '[0-9A-Za-z]' '_'`_t



ccflags-y  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.



targets := image

targets += bzImage

subdir- := compressed



$(obj)/image: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/bzImage: $(obj)/compressed/vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/compressed/vmlinux: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



install: $(CONFIGURE) $(obj)/bzImage

	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \

	      System.map "$(INSTALL_PATH)"