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

Commit 2a0ea7df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:
 "ARC is back after radio silence in 4.17:

   - Fix CONFIG_SWAP [Alexey]

   - Robustify cmpxchg emulation for systems w/o atomics [Alexey /
     PeterZ]

   - Allow mprotext(PROT_EXEC) for stack mappings [Vineet]

   - HSDK platform enable PCIe, APG GPIO [Gustavo]

   - miscll other fixes, config updates etc"

* tag 'arc-4.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARCv2: [plat-hsdk]: Save accl reg pair by default
  ARC: mm: allow mprotect to make stack mappings executable
  ARC: Fix CONFIG_SWAP
  ARC: [arcompact] entry.S: minor code movement
  ARC: configs: Remove CONFIG_INITRAMFS_SOURCE from defconfigs
  ARC: configs: remove no longer needed CONFIG_DEVPTS_MULTIPLE_INSTANCES
  ARC: Improve cmpxchg syscall implementation
  ARC: [plat-hsdk]: Configure APB GPIO controller on ARC HSDK platform
  ARC: [plat-hsdk] Add PCIe support
  ARC: Enable machine_desc->init_per_cpu for !CONFIG_SMP
  ARC: Explicitly add -mmedium-calls to CFLAGS
parents 293bccc5 af1fc5ba

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ config ARC_HAS_DIV_REM 


config ARC_HAS_ACCL_REGS

	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6)"

	default n

	default y

	help

	  Depending on the configuration, CPU can contain accumulator reg-pair

	  (also referred to as r58:r59). These can also be used by gcc as GPR so

arch/arc/Makefile

+1 −14
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ endif 


KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -D__linux__

cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs
@@ -140,16 +140,3 @@ dtbs: scripts 


archclean:

	$(Q)$(MAKE) $(clean)=$(boot)
 


# Hacks to enable final link due to absence of link-time branch relexation

# and gcc choosing optimal(shorter) branches at -O3

#

# vineetg Feb 2010: -mlong-calls switched off for overall kernel build

# However lib/decompress_inflate.o (.init.text) calls

# zlib_inflate_workspacesize (.text) causing relocation errors.

# Thus forcing all exten calls in this file to be long calls

export CFLAGS_decompress_inflate.o = -mmedium-calls

export CFLAGS_initramfs.o = -mmedium-calls

ifdef CONFIG_SMP

export CFLAGS_core.o = -mmedium-calls

endif

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/configs/axs103_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/configs/axs103_smp_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_VM_EVENT_COUNTERS is not set