Commit 3086ae07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC fixes from Vineet Gupta:

 - Fix __ALIGN_STR and __ALIGN to not use default junk padding

 - Misc Kconfig cleanups, header updates

* tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: define __ALIGN_STR and __ALIGN symbols for ARC
  ARC: show_regs: reduce lines of output
  ARC: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  ARC: fpu: fix randconfig build error reported by 0-day test service
  ARC: fix some Kconfig typos
  ARC: Cleanup old Kconfig IO scheduler options
parents 6693075e 8d92e992

arch/arc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ config ARC_CPU_HS 
	help

	  Support for ARC HS38x Cores based on ARCv2 ISA

	  The notable features are:

	    - SMP configurations of upto 4 core with coherency

	    - SMP configurations of up to 4 cores with coherency

	    - Optional L2 Cache and IO-Coherency

	    - Revised Interrupt Architecture (multiple priorites, reg banks,

	        auto stack switch, auto regfile save/restore)
@@ -192,7 +192,7 @@ config ARC_SMP_HALT_ON_RESET 
	help

	  In SMP configuration cores can be configured as Halt-on-reset

	  or they could all start at same time. For Halt-on-reset, non

	  masters are parked until Master kicks them so they can start of

	  masters are parked until Master kicks them so they can start off

	  at designated entry point. For other case, all jump to common

	  entry point and spin wait for Master's signal.

arch/arc/configs/nps_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ CONFIG_MODULES=y 
CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARC_PLAT_EZNPS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4096

arch/arc/configs/nsimosci_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ CONFIG_ISA_ARCOMPACT=y 
CONFIG_KPROBES=y

CONFIG_MODULES=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci"

# CONFIG_COMPACTION is not set

CONFIG_NET=y

arch/arc/configs/nsimosci_hs_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ CONFIG_PERF_EVENTS=y 
CONFIG_KPROBES=y

CONFIG_MODULES=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ISA_ARCV2=y

CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci_hs"

# CONFIG_COMPACTION is not set

arch/arc/configs/nsimosci_hs_smp_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ CONFIG_PERF_EVENTS=y 
CONFIG_KPROBES=y

CONFIG_MODULES=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ISA_ARCV2=y

CONFIG_SMP=y

# CONFIG_ARC_TIMERS_64BIT is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE