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

Merge tag 'for-5.17/parisc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc architecture updates from Helge Deller:

 - Fix lpa and lpa_user defines (John David Anglin)

 - Fix symbol lookup of init functions with an __is_kernel() fix (Helge
   Deller)

 - Fix wrong pdc_toc_pim_11 and pdc_toc_pim_20 definitions (Helge
   Deller)

 - Add lws_atomic_xchg and lws_atomic_store syscalls (John David Anglin)

 - Rewrite light-weight syscall and futex code (John David Anglin)

 - Enable TOC (transfer of contents) feature unconditionally (Helge
   Deller)

 - Improve fault handler messages (John David Anglin)

 - Improve build process (Masahiro Yamada)

 - Reduce kernel code footprint of user access functions (Helge Deller)

 - Fix build error due to outX() macros (Bart Van Assche)

 - Ue default_groups in kobj_type in pdc_stable (Greg Kroah-Hartman)

 - Default to 16 CPUs on 32-bit kernel (Helge Deller)

* tag 'for-5.17/parisc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Default to 16 CPUs on 32-bit kernel
  sections: Fix __is_kernel() to include init ranges
  parisc: Re-use toc_stack as hpmc_stack
  parisc: Enable TOC (transfer of contents) feature unconditionally
  parisc: io: Improve the outb(), outw() and outl() macros
  parisc: pdc_stable: use default_groups in kobj_type
  parisc: Add kgdb io_module to read chars via PDC
  parisc: Fix pdc_toc_pim_11 and pdc_toc_pim_20 definitions
  parisc: Add lws_atomic_xchg and lws_atomic_store syscalls
  parisc: Rewrite light-weight syscall and futex code
  parisc: Enhance page fault termination message
  parisc: Don't call faulthandler_disabled() in do_page_fault()
  parisc: Switch user access functions to signal errors in r29 instead of r8
  parisc: Avoid calling faulthandler_disabled() twice
  parisc: Fix lpa and lpa_user defines
  parisc: Define depi_safe macro
  parisc: decompressor: do not copy source files while building
parents f18e2d87 68d247ad

arch/parisc/Kconfig

+2 −15
Original line number Diff line number Diff line
@@ -287,20 +287,6 @@ config SMP 


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



config TOC

	bool "Support TOC switch"

	default y if 64BIT || !SMP

	help

	  Most PA-RISC machines have either a switch at the back of the machine

	  or a command in BMC to trigger a TOC interrupt. If you say Y here a

	  handler will be installed which will either show a backtrace on all

	  CPUs, or enter a possible configured debugger like kgdb/kdb.



	  Note that with this option enabled, the kernel will use an additional 16KB

	  per possible CPU as a special stack for the TOC handler.



	  If you don't want to debug the Kernel, say N.



config PARISC_CPU_TOPOLOGY

	bool "Support cpu topology definition"

	depends on SMP
@@ -370,7 +356,8 @@ config NR_CPUS 
	int "Maximum number of CPUs (2-32)"

	range 2 32

	depends on SMP

	default "4"

	default "4" if 64BIT

	default "16"



config KEXEC

	bool "Kexec system call"

arch/parisc/boot/compressed/.gitignore

+0 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

firmware.c

real2.S

sizes.h

vmlinux

vmlinux.lds

arch/parisc/boot/compressed/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ OBJECTS := head.o real2.o firmware.o misc.o piggy.o 
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 += $(OBJECTS) sizes.h

targets += real2.S firmware.c



KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -42,14 +41,7 @@ $(obj)/head.o: $(obj)/sizes.h 
CFLAGS_misc.o += -I$(objtree)/$(obj)

$(obj)/misc.o: $(obj)/sizes.h



$(obj)/firmware.o: $(obj)/firmware.c

$(obj)/firmware.c: $(srctree)/arch/$(SRCARCH)/kernel/firmware.c

	$(call cmd,shipped)



AFLAGS_real2.o += -DBOOTLOADER

$(obj)/real2.o: $(obj)/real2.S

$(obj)/real2.S: $(srctree)/arch/$(SRCARCH)/kernel/real2.S

	$(call cmd,shipped)



CPPFLAGS_vmlinux.lds += -I$(objtree)/$(obj) -DBOOTLOADER

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

arch/parisc/boot/compressed/firmware.c

0 → 100644
+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include "../../kernel/firmware.c"

arch/parisc/boot/compressed/real2.S

0 → 100644
+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

#include "../../kernel/real2.S"