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

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

Pull parisc architecture updates from Helge Deller:

 - Fix a kernel crash when a signal is delivered to bad userspace stack

 - Fix fall-through warnings in math-emu code

 - Increase size of gcc stack frame check

 - Switch coding from 'pci_' to 'dma_' API

 - Make struct parisc_driver::remove() return void

 - Some parisc related Makefile changes

 - Minor cleanups, e.g. change to octal permissions, fix macro
   collisions, fix PMD_ORDER collision, replace spaces with tabs

* tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: math-emu: Fix fall-through warnings
  parisc: fix crash with signals and alloca
  parisc: Fix compile failure when building 64-bit kernel natively
  parisc: ccio-dma.c: Added tab instead of spaces
  parisc/parport_gsc: switch from 'pci_' to 'dma_' API
  parisc: move core-y in arch/parisc/Makefile to arch/parisc/Kbuild
  parisc: switch from 'pci_' to 'dma_' API
  parisc: Make struct parisc_driver::remove() return void
  parisc: remove unused arch/parisc/boot/install.sh and its phony target
  parisc: Rename PMD_ORDER to PMD_TABLE_ORDER
  parisc: math-emu: Avoid "fmt" macro collision
  parisc: Increase size of gcc stack frame check
  parisc: Replace symbolic permissions with octal permissions
parents b5d6d263 6f1fce59

Makefile

+5 −0
Original line number Diff line number Diff line
@@ -404,6 +404,11 @@ ifeq ($(ARCH),sparc64) 
       SRCARCH := sparc

endif



# Additional ARCH settings for parisc

ifeq ($(ARCH),parisc64)

       SRCARCH := parisc

endif



export cross_compiling :=

ifneq ($(SRCARCH),$(SUBARCH))

cross_compiling := 1

arch/parisc/Kbuild

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

obj-y	+= mm/ kernel/ math-emu/

arch/parisc/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -25,18 +25,18 @@ CHECKFLAGS += -D__hppa__=1 
ifdef CONFIG_64BIT

UTS_MACHINE	:= parisc64

CHECKFLAGS	+= -D__LP64__=1

CC_ARCHES	= hppa64

LD_BFD		:= elf64-hppa-linux

else # 32-bit

CC_ARCHES	= hppa hppa2.0 hppa1.1

LD_BFD		:= elf32-hppa-linux

endif



# select defconfig based on actual architecture

ifeq ($(shell uname -m),parisc64)

ifeq ($(ARCH),parisc64)

	KBUILD_DEFCONFIG := generic-64bit_defconfig

	CC_ARCHES := hppa64

else

	KBUILD_DEFCONFIG := generic-32bit_defconfig

	CC_ARCHES := hppa hppa2.0 hppa1.1

endif



export LD_BFD
@@ -111,9 +111,6 @@ KBUILD_CFLAGS += $(cflags-y) 
LIBGCC		:= $(shell $(CC) -print-libgcc-file-name)

export LIBGCC



kernel-y			:= mm/ kernel/ math-emu/



core-y	+= $(addprefix arch/parisc/, $(kernel-y))

libs-y	+= arch/parisc/lib/ $(LIBGCC)



boot	:= arch/parisc/boot

arch/parisc/boot/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -15,7 +15,3 @@ $(obj)/bzImage: $(obj)/compressed/vmlinux FORCE 


$(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)"

arch/parisc/boot/install.sh

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
#!/bin/sh

#

# arch/parisc/install.sh, derived from arch/i386/boot/install.sh

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 1995 by Linus Torvalds

#

# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin

#

# "make install" script for i386 architecture

#

# Arguments:

#   $1 - kernel version

#   $2 - kernel image file

#   $3 - kernel map file

#   $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



if [ -n "${INSTALLKERNEL}" ]; then

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

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

fi



# Default install



if [ "$(basename $2)" = "zImage" ]; then

# Compressed install

  echo "Installing compressed kernel"

  base=vmlinuz

else

# Normal install

  echo "Installing normal kernel"

  base=vmlinux

fi



if [ -f $4/$base-$1 ]; then

  mv $4/$base-$1 $4/$base-$1.old

fi

cat $2 > $4/$base-$1



# Install system map file

if [ -f $4/System.map-$1 ]; then

  mv $4/System.map-$1 $4/System.map-$1.old

fi

cp $3 $4/System.map-$1