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

Commit 4de9ad9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull Tile arch updates from Chris Metcalf:
 "These changes bring in a bunch of new functionality that has been
  maintained internally at Tilera over the last year, plus other stray
  bits of work that I've taken into the tile tree from other folks.

  The changes include some PCI root complex work, interrupt-driven
  console support, support for performing fast-path unaligned data
  fixups by kernel-based JIT code generation, CONFIG_PREEMPT support,
  vDSO support for gettimeofday(), a serial driver for the tilegx
  on-chip UART, KGDB support, more optimized string routines, support
  for ftrace and kprobes, improved ASLR, and many bug fixes.

  We also remove support for the old TILE64 chip, which is no longer
  buildable"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (85 commits)
  tile: refresh tile defconfig files
  tile: rework <asm/cmpxchg.h>
  tile PCI RC: make default consistent DMA mask 32-bit
  tile: add null check for kzalloc in tile/kernel/setup.c
  tile: make __write_once a synonym for __read_mostly
  tile: remove support for TILE64
  tile: use asm-generic/bitops/builtin-*.h
  tile: eliminate no-op "noatomichash" boot argument
  tile: use standard tile_bundle_bits type in traps.c
  tile: simplify code referencing hypervisor API addresses
  tile: change <asm/system.h> to <asm/switch_to.h> in comments
  tile: mark pcibios_init() as __init
  tile: check for correct compiler earlier in asm-offsets.c
  tile: use standard 'generic-y' model for <asm/hw_irq.h>
  tile: use asm-generic version of <asm/local64.h>
  tile PCI RC: add comment about "PCI hole" problem
  tile: remove DEBUG_EXTRA_FLAGS kernel config option
  tile: add virt_to_kpte() API and clean up and document behavior
  tile: support FRAME_POINTER
  tile: support reporting Tilera hypervisor statistics
  ...
parents 576c25eb 06da6629

MAINTAINERS

+7 −2
Original line number Diff line number Diff line
@@ -8373,9 +8373,14 @@ M: Chris Metcalf <cmetcalf@tilera.com> 
W:	http://www.tilera.com/scm/

S:	Supported

F:	arch/tile/

F:	drivers/tty/hvc/hvc_tile.c

F:	drivers/net/ethernet/tile/

F:	drivers/char/tile-srom.c

F:	drivers/edac/tile_edac.c

F:	drivers/net/ethernet/tile/

F:	drivers/rtc/rtc-tile.c

F:	drivers/tty/hvc/hvc_tile.c

F:	drivers/tty/serial/tilegx.c

F:	drivers/usb/host/*-tilegx.c

F:	include/linux/usb/tilegx.h



TLAN NETWORK DRIVER

M:	Samuel Chessman <chessman@tux.org>

arch/tile/Kconfig

+29 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config TILE 
	select HAVE_SYSCALL_TRACEPOINTS

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select HAVE_DEBUG_STACKOVERFLOW

	select ARCH_WANT_FRAME_POINTERS



# FIXME: investigate whether we need/want these options.

#	select HAVE_IOREMAP_PROT
@@ -64,6 +65,9 @@ config HUGETLB_SUPER_PAGES 
	depends on HUGETLB_PAGE && TILEGX

	def_bool y



config GENERIC_TIME_VSYSCALL

	def_bool y



# FIXME: tilegx can implement a more efficient rwsem.

config RWSEM_GENERIC_SPINLOCK

	def_bool y
@@ -112,10 +116,19 @@ config SMP 
config HVC_TILE

	depends on TTY

	select HVC_DRIVER

	select HVC_IRQ if TILEGX

	def_bool y



config TILEGX

	bool "Building with TILE-Gx (64-bit) compiler and toolchain"

	bool "Building for TILE-Gx (64-bit) processor"

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_ARCH_KGDB



config TILEPRO

	def_bool !TILEGX
@@ -194,7 +207,7 @@ config SYSVIPC_COMPAT 
	def_bool y

	depends on COMPAT && SYSVIPC



# We do not currently support disabling HIGHMEM on tile64 and tilepro.

# We do not currently support disabling HIGHMEM on tilepro.

config HIGHMEM

	bool # "Support for more than 512 MB of RAM"

	default !TILEGX
@@ -300,6 +313,8 @@ config PAGE_OFFSET 


source "mm/Kconfig"



source "kernel/Kconfig.preempt"



config CMDLINE_BOOL

	bool "Built-in kernel command line"

	default n
@@ -396,8 +411,20 @@ config NO_IOMEM 
config NO_IOPORT

	def_bool !PCI



config TILE_PCI_IO

	bool "PCI I/O space support"

	default n

	depends on PCI

	depends on TILEGX

	---help---

	  Enable PCI I/O space support on TILEGx. Since the PCI I/O space

	  is used by few modern PCIe endpoint devices, its support is disabled

	  by default to save the TRIO PIO Region resource for other purposes.



source "drivers/pci/Kconfig"



source "drivers/pci/pcie/Kconfig"



config TILE_USB

	tristate "Tilera USB host adapter support"

	default y

arch/tile/Kconfig.debug

+6 −8
Original line number Diff line number Diff line
@@ -14,14 +14,12 @@ config EARLY_PRINTK 
	  with klogd/syslogd. You should normally N here,

	  unless you want to debug such a crash.



config DEBUG_EXTRA_FLAGS

	string "Additional compiler arguments when building with '-g'"

	depends on DEBUG_INFO

	default ""

config TILE_HVGLUE_TRACE

	bool "Provide wrapper functions for hypervisor ABI calls"

	default n

	help

	  Debug info can be large, and flags like

	  `-femit-struct-debug-baseonly' can reduce the kernel file

	  size and build time noticeably.  Such flags are often

	  helpful if the main use of debug info is line number info.

	  Provide wrapper functions for the hypervisor ABI calls

	  defined in arch/tile/kernel/hvglue.S.  This allows tracing

	  mechanisms, etc., to have visibility into those calls.



endmenu

arch/tile/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ endif 
# In kernel modules, this causes load failures due to unsupported relocations.

KBUILD_CFLAGS   += -fno-asynchronous-unwind-tables



ifneq ($(CONFIG_DEBUG_EXTRA_FLAGS),"")

KBUILD_CFLAGS   += $(CONFIG_DEBUG_EXTRA_FLAGS)

endif



LIBGCC_PATH     := \

  $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)

arch/tile/configs/tilegx_defconfig

+38 −203
Original line number Diff line number Diff line 
CONFIG_TILEGX=y

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_FHANDLE=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_LOG_BUF_SHIFT=19

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y
@@ -18,18 +17,18 @@ CONFIG_CGROUP_DEVICE=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEMCG=y

CONFIG_CGROUP_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_RD_XZ=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y
@@ -45,12 +44,12 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_SGI_PARTITION=y

CONFIG_SUN_PARTITION=y

CONFIG_KARMA_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_NR_CPUS=100

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HZ_100=y

# CONFIG_COMPACTION is not set

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_TILE_PCI_IO=y

CONFIG_PCI_DEBUG=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y
@@ -108,150 +107,9 @@ CONFIG_IPV6_MULTIPLE_TABLES=y 
CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_ZONES=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m

CONFIG_NF_CONNTRACK_IRC=m

CONFIG_NF_CONNTRACK_NETBIOS_NS=m

CONFIG_NF_CONNTRACK_PPTP=m

CONFIG_NF_CONNTRACK_SANE=m

CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NETFILTER_TPROXY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m

CONFIG_NETFILTER_XT_TARGET_CT=m

CONFIG_NETFILTER_XT_TARGET_DSCP=m

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFLOG=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

CONFIG_NETFILTER_XT_TARGET_TEE=m

CONFIG_NETFILTER_XT_TARGET_TPROXY=m

CONFIG_NETFILTER_XT_TARGET_TRACE=m

CONFIG_NETFILTER_XT_TARGET_SECMARK=m

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m

CONFIG_NETFILTER_XT_MATCH_CONNMARK=m

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

CONFIG_NETFILTER_XT_MATCH_DCCP=m

CONFIG_NETFILTER_XT_MATCH_DSCP=m

CONFIG_NETFILTER_XT_MATCH_ESP=m

CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m

CONFIG_NETFILTER_XT_MATCH_HELPER=m

CONFIG_NETFILTER_XT_MATCH_IPRANGE=m

CONFIG_NETFILTER_XT_MATCH_IPVS=m

CONFIG_NETFILTER_XT_MATCH_LENGTH=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=m

CONFIG_NETFILTER_XT_MATCH_MAC=m

CONFIG_NETFILTER_XT_MATCH_MARK=m

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m

CONFIG_NETFILTER_XT_MATCH_OSF=m

CONFIG_NETFILTER_XT_MATCH_OWNER=m

CONFIG_NETFILTER_XT_MATCH_POLICY=m

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m

CONFIG_NETFILTER_XT_MATCH_QUOTA=m

CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

CONFIG_NETFILTER_XT_MATCH_SOCKET=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

CONFIG_NETFILTER_XT_MATCH_STRING=m

CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

CONFIG_NETFILTER_XT_MATCH_TIME=m

CONFIG_NETFILTER_XT_MATCH_U32=m

CONFIG_IP_VS=m

CONFIG_IP_VS_IPV6=y

CONFIG_IP_VS_PROTO_TCP=y

CONFIG_IP_VS_PROTO_UDP=y

CONFIG_IP_VS_PROTO_ESP=y

CONFIG_IP_VS_PROTO_AH=y

CONFIG_IP_VS_PROTO_SCTP=y

CONFIG_IP_VS_RR=m

CONFIG_IP_VS_WRR=m

CONFIG_IP_VS_LC=m

CONFIG_IP_VS_WLC=m

CONFIG_IP_VS_LBLC=m

CONFIG_IP_VS_LBLCR=m

CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_NF_CONNTRACK_IPV4=m

# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_SECURITY=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_IP6_NF_QUEUE=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m

CONFIG_IP6_NF_MATCH_FRAG=m

CONFIG_IP6_NF_MATCH_OPTS=m

CONFIG_IP6_NF_MATCH_HL=m

CONFIG_IP6_NF_MATCH_IPV6HEADER=m

CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_TARGET_LOG=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_SECURITY=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m

CONFIG_BRIDGE_EBT_T_NAT=m

CONFIG_BRIDGE_EBT_802_3=m

CONFIG_BRIDGE_EBT_AMONG=m

CONFIG_BRIDGE_EBT_ARP=m

CONFIG_BRIDGE_EBT_IP=m

CONFIG_BRIDGE_EBT_IP6=m

CONFIG_BRIDGE_EBT_LIMIT=m

CONFIG_BRIDGE_EBT_MARK=m

CONFIG_BRIDGE_EBT_PKTTYPE=m

CONFIG_BRIDGE_EBT_STP=m

CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_BRIDGE_EBT_ARPREPLY=m

CONFIG_BRIDGE_EBT_DNAT=m

CONFIG_BRIDGE_EBT_MARK_T=m

CONFIG_BRIDGE_EBT_REDIRECT=m

CONFIG_BRIDGE_EBT_SNAT=m

CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_ULOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_RDS=m

CONFIG_RDS_TCP=m

CONFIG_BRIDGE=m

CONFIG_NET_DSA=y

CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_PHONET=m
@@ -292,13 +150,13 @@ CONFIG_NET_ACT_POLICE=m 
CONFIG_NET_ACT_GACT=m

CONFIG_GACT_PROB=y

CONFIG_NET_ACT_MIRRED=m

CONFIG_NET_ACT_IPT=m

CONFIG_NET_ACT_NAT=m

CONFIG_NET_ACT_PEDIT=m

CONFIG_NET_ACT_SIMP=m

CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_CLS_IND=y

CONFIG_DCB=y

CONFIG_DNS_RESOLVER=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y
@@ -317,10 +175,12 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SAS_ATA=y

CONFIG_ISCSI_TCP=m

CONFIG_SCSI_MVSAS=y

# CONFIG_SCSI_MVSAS_DEBUG is not set

CONFIG_SCSI_MVSAS_TASKLET=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_SIL24=y

# CONFIG_ATA_SFF is not set

CONFIG_MD=y
@@ -343,6 +203,12 @@ CONFIG_DM_MULTIPATH_QL=m 
CONFIG_DM_MULTIPATH_ST=m

CONFIG_DM_DELAY=m

CONFIG_DM_UEVENT=y

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m

CONFIG_TCM_PSCSI=m

CONFIG_LOOPBACK_TARGET=m

CONFIG_ISCSI_TARGET=m

CONFIG_FUSION=y

CONFIG_FUSION_SAS=y

CONFIG_NETDEVICES=y
@@ -359,42 +225,8 @@ CONFIG_VETH=m 
CONFIG_NET_DSA_MV88E6060=y

CONFIG_NET_DSA_MV88E6131=y

CONFIG_NET_DSA_MV88E6123_61_65=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_ALTEON is not set

# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EXAR is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_PACKET_ENGINE is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SUN is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_TILE_NET is not set

# CONFIG_NET_VENDOR_VIA is not set

CONFIG_SKY2=y

CONFIG_PTP_1588_CLOCK_TILEGX=y

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set
@@ -402,6 +234,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=y 
# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_TILEGX=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_TIMERIOMEM=m

CONFIG_I2C=y
@@ -410,13 +243,16 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

# CONFIG_VGA_ARB is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_DRM=m

CONFIG_DRM_TDFX=m

CONFIG_DRM_R128=m

CONFIG_DRM_MGA=m

CONFIG_DRM_VIA=m

CONFIG_DRM_SAVAGE=m

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_RTC_CLASS=y
@@ -464,9 +300,8 @@ CONFIG_ECRYPT_FS=m 
CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4=m

CONFIG_NFS_V4_1=y

CONFIG_NFS_FSCACHE=y

CONFIG_NFSD=m
@@ -519,25 +354,28 @@ CONFIG_NLS_ISO8859_15=m 
CONFIG_NLS_KOI8_R=m

CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=m

CONFIG_DLM=m

CONFIG_DLM_DEBUG=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_DEBUG_FS=y

CONFIG_HEADERS_CHECK=y

# CONFIG_FRAME_POINTER is not set

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_CREDENTIALS=y

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_KGDB=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_SECURITY=y

CONFIG_SECURITYFS=y
@@ -546,7 +384,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y 
CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_PCRYPT=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m
@@ -559,14 +396,12 @@ CONFIG_CRYPTO_XTS=m 
CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32C=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m