Commit 42a19aa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC fixes from Vineet Gupta:

 - Sundry build and misc fixes

* tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: build: Try to guess GCC variant of cross compiler
  ARC: bpf: Correct conditional check in 'check_jmp_32'
  ARC: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices
  ARC: build: Use __force to suppress per-CPU cmpxchg warnings
  ARC: fix reference of dependency for PAE40 config
  ARC: build: disallow invalid PAE40 + 4K page config
  arc: rename aux.h to arc_aux.h
parents 7031a38a 824927e8

arch/arc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ config ARC_PAGE_SIZE_16K 
config ARC_PAGE_SIZE_4K

	bool "4KB"

	select HAVE_PAGE_SIZE_4KB

	depends on ARC_MMU_V3 || ARC_MMU_V4



endchoice
@@ -474,7 +473,8 @@ config HIGHMEM 


config ARC_HAS_PAE40

	bool "Support for the 40-bit Physical Address Extension"

	depends on ISA_ARCV2

	depends on ARC_MMU_V4

	depends on !ARC_PAGE_SIZE_4K

	select HIGHMEM

	select PHYS_ADDR_T_64BIT

	help

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
KBUILD_DEFCONFIG := haps_hs_smp_defconfig



ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)

CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-)

endif



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

arch/arc/boot/dts/axc001.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ictl_intc: gpio-controller@0 { 
				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <30>;

				ngpios = <30>;

				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;

arch/arc/boot/dts/axc003.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ ictl_intc: gpio-controller@0 { 
				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <30>;

				ngpios = <30>;

				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;

arch/arc/boot/dts/axc003_idu.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ ictl_intc: gpio-controller@0 { 
				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <30>;

				ngpios = <30>;

				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;