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

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

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

Pull ARC fixes from Vineet Gupta:

 - mmap handler for dma ops as generic handler no longer works for us
   [Alexey]

 - Fixes for EZChip platform [Noam]

 - Fix RTC clocksource driver build issue

 - ARC IRQ handling fixes [Yuriy]

 - Revert a recent makefile change which doesn't go well with oldish
   tools out in the wild

* tag 'arc-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARCv2: MCIP: Use IDU_M_DISTRI_DEST mode if there is only 1 destination core
  ARC: IRQ: Do not use hwirq as virq and vice versa
  ARC: [plat-eznps] set default baud for early console
  ARC: [plat-eznps] remove IPI clear from SMP operations
  Revert "ARC: build: retire old toggles"
  ARC: timer: rtc: implement read loop in "C" vs. inline asm
  ARC: change return value of userspace cmpxchg assist syscall
  arc: Implement arch-specific dma_map_ops.mmap
  ARC: [SMP] avoid overriding present cpumask
  ARC: Enable PERF_EVENTS in nSIM driven platforms
parents e3d183c0 0a0a047d

arch/arc/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ atleast_gcc44 := $(call cc-ifversion, -ge, 0404, y) 


cflags-$(atleast_gcc44)			+= -fsection-anchors



cflags-$(CONFIG_ARC_HAS_LLSC)		+= -mlock

cflags-$(CONFIG_ARC_HAS_SWAPE)		+= -mswape



ifdef CONFIG_ISA_ARCV2



ifndef CONFIG_ARC_HAS_LL64

arch/arc/boot/dts/axc001.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
			reg-io-width = <4>;

		};



		arcpmu0: pmu {

		arcpct0: pct {

			compatible = "snps,arc700-pct";

		};

	};

arch/arc/boot/dts/nsim_700.dts

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
			};

		};



		arcpmu0: pmu {

		arcpct0: pct {

			compatible = "snps,arc700-pct";

		};

	};

arch/arc/boot/dts/nsimosci.dts

+4 −0
Original line number Diff line number Diff line
@@ -83,5 +83,9 @@ 
			reg = <0xf0003000 0x44>;

			interrupts = <7>;

		};



		arcpct0: pct {

			compatible = "snps,arc700-pct";

		};

	};

};

arch/arc/configs/nsim_700_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_KPROBES=y