Commit 16d72dd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc fixes from Helge Deller:

 - Fix crashes when accessing PCI devices on some machines like C240 and
   J5000. The crashes were triggered because we replaced cache flushes
   by nops in the alternative coding where we shouldn't for some
   machines.

 - Dave fixed a race in the usage of the sr1 space register when used to
   load the coherence index.

 - Use the hardware lpa instruction to to load the physical address of
   kernel virtual addresses in the iommu driver code.

 - The kernel may fail to link when CONFIG_MLONGCALLS isn't set. Solve
   that by rearranging functions in the final vmlinux executeable.

 - Some defconfig cleanups and removal of compiler warnings.

* 'parisc-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix crash due alternative coding for NP iopdir_fdc bit
  parisc: Use lpa instruction to load physical addresses in driver code
  parisc: configs: Remove useless UEVENT_HELPER_PATH
  parisc: Use implicit space register selection for loading the coherence index of I/O pdirs
  parisc: Fix compiler warnings in float emulation code
  parisc/slab: cleanup after /proc/slab_allocators removal
  parisc: Allow building 64-bit kernel without -mlong-calls compiler option
  parisc: Kconfig: remove ARCH_DISCARD_MEMBLOCK
parents ae876604 527a1d1e

arch/parisc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ config PARISC 
	select GENERIC_STRNCPY_FROM_USER

	select SYSCTL_ARCH_UNALIGN_ALLOW

	select SYSCTL_EXCEPTION_TRACE

	select ARCH_DISCARD_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC

	select VIRT_TO_BUS

	select MODULES_USE_ELF_RELA
@@ -195,7 +194,8 @@ config PREFETCH 


config MLONGCALLS

	bool "Enable the -mlong-calls compiler option for big kernels"

	default y

	default y if !MODULES || UBSAN || FTRACE

	default n

	depends on PA8X00

	help

	  If you configure the kernel to include many drivers built-in instead

arch/parisc/configs/712_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ CONFIG_INET_DIAG=m 
CONFIG_NETFILTER=y

CONFIG_LLC2=m

CONFIG_NET_PKTGEN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

arch/parisc/configs/a500_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ CONFIG_IP_DCCP=m 
# CONFIG_IP_DCCP_CCID3 is not set

CONFIG_LLC2=m

CONFIG_NET_PKTGEN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

arch/parisc/configs/b180_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

arch/parisc/configs/c3000_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ CONFIG_INET6_IPCOMP=m 
CONFIG_IPV6_TUNNEL=m

CONFIG_NETFILTER=y

CONFIG_NET_PKTGEN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE