Commit 2120447b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC fixes from Vineet Gupta:

 - MCIP aka ARconnect fixes for SMP builds [Euginey]

 - preventive fix for SLC (L2 cache) flushing [Euginey]

 - Kconfig default fix [Ulf Magnusson]

 - trailing semicolon fixes [Luis de Bethencourt]

 - other assorted minor fixes

* tag 'arc-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: setup cpu possible mask according to possible-cpus dts property
  ARC: mcip: update MCIP debug mask when the new cpu came online
  ARC: mcip: halt GFRC counter when ARC cores halt
  ARCv2: boot log: fix HS48 release number
  arc: dts: use 'atmel' as manufacturer for at24 in axs10x_mb
  ARC: Fix malformed ARC_EMUL_UNALIGNED default
  ARC: boot log: Fix trailing semicolon
  ARC: dw2 unwind: Fix trailing semicolon
  ARC: Enable fatal signals on boot for dev platforms
  ARCv2: Don't pretend we may set L-bit in STATUS32 with kflag instruction
  ARCv2: cache: fix slc_entire_op: flush only instead of flush-n-inv
parents 8da5db7d a29a2527

arch/arc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -484,7 +484,6 @@ config ARC_CURR_IN_REG 


config ARC_EMUL_UNALIGNED

	bool "Emulate unaligned memory access (userspace only)"

	default N

	select SYSCTL_ARCH_UNALIGN_NO_WARN

	select SYSCTL_ARCH_UNALIGN_ALLOW

	depends on ISA_ARCOMPACT

arch/arc/boot/dts/axs101.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
	compatible = "snps,axs101", "snps,arc-sdp";



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60";

		bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60 print-fatal-signals=1";

	};

};

arch/arc/boot/dts/axs10x_mb.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -214,13 +214,13 @@ 
			};



			eeprom@0x54{

				compatible = "24c01";

				compatible = "atmel,24c01";

				reg = <0x54>;

				pagesize = <0x8>;

			};



			eeprom@0x57{

				compatible = "24c04";

				compatible = "atmel,24c04";

				reg = <0x57>;

				pagesize = <0x8>;

			};

arch/arc/boot/dts/haps_hs_idu.dts

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



	chosen {

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 debug";

		bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 debug print-fatal-signals=1";

	};



	aliases {

arch/arc/boot/dts/nsim_700.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
	interrupt-parent = <&core_intc>;



	chosen {

		bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";

		bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";

	};



	aliases {

CRA Git | Maintained and supported by SUSTech CRA and CCSE