Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (dc0046c7) · Commits · e / devices / android_kernel_teracube_emerald

arch/sparc/configs/sparc32_defconfig

+68 −30

Original line number	Original line	Diff line number	Diff line
	#		#
	# Automatically generated make config: don't edit		# Automatically generated make config: don't edit
	# Linux kernel version: 2.6.28		# Linux kernel version: 2.6.30-rc2
	# Thu Jan 8 16:45:44 2009		# Fri Apr 17 04:04:46 2009
	#		#
	# CONFIG_64BIT is not set		# CONFIG_64BIT is not set
	CONFIG_SPARC=y		CONFIG_SPARC=y
	@@ -30,17 +30,27 @@ CONFIG_SWAP=y
	CONFIG_SYSVIPC=y		CONFIG_SYSVIPC=y
	CONFIG_SYSVIPC_SYSCTL=y		CONFIG_SYSVIPC_SYSCTL=y
	CONFIG_POSIX_MQUEUE=y		CONFIG_POSIX_MQUEUE=y
			CONFIG_POSIX_MQUEUE_SYSCTL=y
	# CONFIG_BSD_PROCESS_ACCT is not set		# CONFIG_BSD_PROCESS_ACCT is not set
	# CONFIG_TASKSTATS is not set		# CONFIG_TASKSTATS is not set
	# CONFIG_AUDIT is not set		# CONFIG_AUDIT is not set

			#
			# RCU Subsystem
			#
			CONFIG_CLASSIC_RCU=y
			# CONFIG_TREE_RCU is not set
			# CONFIG_PREEMPT_RCU is not set
			# CONFIG_TREE_RCU_TRACE is not set
			# CONFIG_PREEMPT_RCU_TRACE is not set
	# CONFIG_IKCONFIG is not set		# CONFIG_IKCONFIG is not set
	CONFIG_LOG_BUF_SHIFT=14		CONFIG_LOG_BUF_SHIFT=14
	# CONFIG_CGROUPS is not set
	CONFIG_GROUP_SCHED=y		CONFIG_GROUP_SCHED=y
	CONFIG_FAIR_GROUP_SCHED=y		CONFIG_FAIR_GROUP_SCHED=y
	CONFIG_RT_GROUP_SCHED=y		CONFIG_RT_GROUP_SCHED=y
	CONFIG_USER_SCHED=y		CONFIG_USER_SCHED=y
	# CONFIG_CGROUP_SCHED is not set		# CONFIG_CGROUP_SCHED is not set
			# CONFIG_CGROUPS is not set
	CONFIG_SYSFS_DEPRECATED=y		CONFIG_SYSFS_DEPRECATED=y
	CONFIG_SYSFS_DEPRECATED_V2=y		CONFIG_SYSFS_DEPRECATED_V2=y
	# CONFIG_RELAY is not set		# CONFIG_RELAY is not set
	@@ -49,24 +59,28 @@ CONFIG_NAMESPACES=y
	# CONFIG_IPC_NS is not set		# CONFIG_IPC_NS is not set
	# CONFIG_USER_NS is not set		# CONFIG_USER_NS is not set
	# CONFIG_PID_NS is not set		# CONFIG_PID_NS is not set
			# CONFIG_NET_NS is not set
	CONFIG_BLK_DEV_INITRD=y		CONFIG_BLK_DEV_INITRD=y
	CONFIG_INITRAMFS_SOURCE=""		CONFIG_INITRAMFS_SOURCE=""
			CONFIG_RD_GZIP=y
			CONFIG_RD_BZIP2=y
			CONFIG_RD_LZMA=y
	# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
	CONFIG_SYSCTL=y		CONFIG_SYSCTL=y
			CONFIG_ANON_INODES=y
	# CONFIG_EMBEDDED is not set		# CONFIG_EMBEDDED is not set
	CONFIG_UID16=y		CONFIG_UID16=y
	CONFIG_SYSCTL_SYSCALL=y		CONFIG_SYSCTL_SYSCALL=y
	CONFIG_KALLSYMS=y		CONFIG_KALLSYMS=y
	# CONFIG_KALLSYMS_ALL is not set		# CONFIG_KALLSYMS_ALL is not set
	# CONFIG_KALLSYMS_EXTRA_PASS is not set		# CONFIG_KALLSYMS_EXTRA_PASS is not set
			# CONFIG_STRIP_ASM_SYMS is not set
	CONFIG_HOTPLUG=y		CONFIG_HOTPLUG=y
	CONFIG_PRINTK=y		CONFIG_PRINTK=y
	CONFIG_BUG=y		CONFIG_BUG=y
	CONFIG_ELF_CORE=y		CONFIG_ELF_CORE=y
	CONFIG_COMPAT_BRK=y
	CONFIG_BASE_FULL=y		CONFIG_BASE_FULL=y
	CONFIG_FUTEX=y		CONFIG_FUTEX=y
	CONFIG_ANON_INODES=y
	CONFIG_EPOLL=y		CONFIG_EPOLL=y
	CONFIG_SIGNALFD=y		CONFIG_SIGNALFD=y
	CONFIG_TIMERFD=y		CONFIG_TIMERFD=y
	@@ -75,12 +89,15 @@ CONFIG_SHMEM=y
	CONFIG_AIO=y		CONFIG_AIO=y
	CONFIG_VM_EVENT_COUNTERS=y		CONFIG_VM_EVENT_COUNTERS=y
	CONFIG_PCI_QUIRKS=y		CONFIG_PCI_QUIRKS=y
			CONFIG_COMPAT_BRK=y
	CONFIG_SLAB=y		CONFIG_SLAB=y
	# CONFIG_SLUB is not set		# CONFIG_SLUB is not set
	# CONFIG_SLOB is not set		# CONFIG_SLOB is not set
	# CONFIG_PROFILING is not set		# CONFIG_PROFILING is not set
			# CONFIG_MARKERS is not set
	CONFIG_HAVE_OPROFILE=y		CONFIG_HAVE_OPROFILE=y
	CONFIG_HAVE_ARCH_TRACEHOOK=y		CONFIG_HAVE_ARCH_TRACEHOOK=y
			# CONFIG_SLOW_WORK is not set
	# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set		# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
	CONFIG_SLABINFO=y		CONFIG_SLABINFO=y
	CONFIG_RT_MUTEXES=y		CONFIG_RT_MUTEXES=y
	@@ -93,7 +110,6 @@ CONFIG_MODULE_UNLOAD=y
	# CONFIG_MODULE_SRCVERSION_ALL is not set		# CONFIG_MODULE_SRCVERSION_ALL is not set
	CONFIG_BLOCK=y		CONFIG_BLOCK=y
	# CONFIG_LBD is not set		# CONFIG_LBD is not set
	# CONFIG_BLK_DEV_IO_TRACE is not set
	# CONFIG_BLK_DEV_BSG is not set		# CONFIG_BLK_DEV_BSG is not set
	# CONFIG_BLK_DEV_INTEGRITY is not set		# CONFIG_BLK_DEV_INTEGRITY is not set

	@@ -109,11 +125,6 @@ CONFIG_IOSCHED_CFQ=y
	CONFIG_DEFAULT_CFQ=y		CONFIG_DEFAULT_CFQ=y
	# CONFIG_DEFAULT_NOOP is not set		# CONFIG_DEFAULT_NOOP is not set
	CONFIG_DEFAULT_IOSCHED="cfq"		CONFIG_DEFAULT_IOSCHED="cfq"
	CONFIG_CLASSIC_RCU=y
	# CONFIG_TREE_RCU is not set
	# CONFIG_PREEMPT_RCU is not set
	# CONFIG_TREE_RCU_TRACE is not set
	# CONFIG_PREEMPT_RCU_TRACE is not set
	# CONFIG_FREEZER is not set		# CONFIG_FREEZER is not set

	#		#
	@@ -144,6 +155,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
	CONFIG_ZONE_DMA_FLAG=1		CONFIG_ZONE_DMA_FLAG=1
	CONFIG_BOUNCE=y		CONFIG_BOUNCE=y
	CONFIG_UNEVICTABLE_LRU=y		CONFIG_UNEVICTABLE_LRU=y
			CONFIG_HAVE_MLOCK=y
			CONFIG_HAVE_MLOCKED_PAGE_BIT=y
	CONFIG_SUN_PM=y		CONFIG_SUN_PM=y
	# CONFIG_SPARC_LED is not set		# CONFIG_SPARC_LED is not set
	CONFIG_SERIAL_CONSOLE=y		CONFIG_SERIAL_CONSOLE=y
	@@ -159,6 +172,7 @@ CONFIG_PCI_SYSCALL=y
	CONFIG_PCI_LEGACY=y		CONFIG_PCI_LEGACY=y
	# CONFIG_PCI_DEBUG is not set		# CONFIG_PCI_DEBUG is not set
	# CONFIG_PCI_STUB is not set		# CONFIG_PCI_STUB is not set
			# CONFIG_PCI_IOV is not set
	# CONFIG_PCCARD is not set		# CONFIG_PCCARD is not set
	CONFIG_SUN_OPENPROMFS=m		CONFIG_SUN_OPENPROMFS=m
	CONFIG_SPARC32_PCI=y		CONFIG_SPARC32_PCI=y
	@@ -175,8 +189,6 @@ CONFIG_NET=y
	#		#
	# Networking options		# Networking options
	#		#
	# CONFIG_NET_NS is not set
	CONFIG_COMPAT_NET_DEV_OPS=y
	CONFIG_PACKET=y		CONFIG_PACKET=y
	# CONFIG_PACKET_MMAP is not set		# CONFIG_PACKET_MMAP is not set
	CONFIG_UNIX=y		CONFIG_UNIX=y
	@@ -251,6 +263,7 @@ CONFIG_IPV6_TUNNEL=m
	# CONFIG_LAPB is not set		# CONFIG_LAPB is not set
	# CONFIG_ECONET is not set		# CONFIG_ECONET is not set
	# CONFIG_WAN_ROUTER is not set		# CONFIG_WAN_ROUTER is not set
			# CONFIG_PHONET is not set
	# CONFIG_NET_SCHED is not set		# CONFIG_NET_SCHED is not set
	# CONFIG_DCB is not set		# CONFIG_DCB is not set

	@@ -263,7 +276,6 @@ CONFIG_NET_PKTGEN=m
	# CONFIG_IRDA is not set		# CONFIG_IRDA is not set
	# CONFIG_BT is not set		# CONFIG_BT is not set
	# CONFIG_AF_RXRPC is not set		# CONFIG_AF_RXRPC is not set
	# CONFIG_PHONET is not set
	CONFIG_WIRELESS=y		CONFIG_WIRELESS=y
	# CONFIG_CFG80211 is not set		# CONFIG_CFG80211 is not set
	CONFIG_WIRELESS_OLD_REGULATORY=y		CONFIG_WIRELESS_OLD_REGULATORY=y
	@@ -313,12 +325,16 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
	# CONFIG_BLK_DEV_HD is not set		# CONFIG_BLK_DEV_HD is not set
	CONFIG_MISC_DEVICES=y		CONFIG_MISC_DEVICES=y
	# CONFIG_PHANTOM is not set		# CONFIG_PHANTOM is not set
	# CONFIG_EEPROM_93CX6 is not set
	# CONFIG_SGI_IOC4 is not set		# CONFIG_SGI_IOC4 is not set
	# CONFIG_TIFM_CORE is not set		# CONFIG_TIFM_CORE is not set
	# CONFIG_ENCLOSURE_SERVICES is not set		# CONFIG_ENCLOSURE_SERVICES is not set
	# CONFIG_HP_ILO is not set		# CONFIG_HP_ILO is not set
	# CONFIG_C2PORT is not set		# CONFIG_C2PORT is not set

			#
			# EEPROM support
			#
			# CONFIG_EEPROM_93CX6 is not set
	CONFIG_HAVE_IDE=y		CONFIG_HAVE_IDE=y
	# CONFIG_IDE is not set		# CONFIG_IDE is not set

	@@ -375,8 +391,10 @@ CONFIG_SCSI_LOWLEVEL=y
	# CONFIG_MEGARAID_NEWGEN is not set		# CONFIG_MEGARAID_NEWGEN is not set
	# CONFIG_MEGARAID_LEGACY is not set		# CONFIG_MEGARAID_LEGACY is not set
	# CONFIG_MEGARAID_SAS is not set		# CONFIG_MEGARAID_SAS is not set
			# CONFIG_SCSI_MPT2SAS is not set
	# CONFIG_SCSI_HPTIOP is not set		# CONFIG_SCSI_HPTIOP is not set
	# CONFIG_LIBFC is not set		# CONFIG_LIBFC is not set
			# CONFIG_LIBFCOE is not set
	# CONFIG_FCOE is not set		# CONFIG_FCOE is not set
	# CONFIG_SCSI_DMX3191D is not set		# CONFIG_SCSI_DMX3191D is not set
	# CONFIG_SCSI_FUTURE_DOMAIN is not set		# CONFIG_SCSI_FUTURE_DOMAIN is not set
	@@ -398,6 +416,7 @@ CONFIG_SCSI_QLOGICPTI=m
	CONFIG_SCSI_SUNESP=y		CONFIG_SCSI_SUNESP=y
	# CONFIG_SCSI_SRP is not set		# CONFIG_SCSI_SRP is not set
	# CONFIG_SCSI_DH is not set		# CONFIG_SCSI_DH is not set
			# CONFIG_SCSI_OSD_INITIATOR is not set
	# CONFIG_ATA is not set		# CONFIG_ATA is not set
	# CONFIG_MD is not set		# CONFIG_MD is not set
	# CONFIG_FUSION is not set		# CONFIG_FUSION is not set
	@@ -413,6 +432,7 @@ CONFIG_SCSI_SUNESP=y
	# CONFIG_IEEE1394 is not set		# CONFIG_IEEE1394 is not set
	# CONFIG_I2O is not set		# CONFIG_I2O is not set
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
			CONFIG_COMPAT_NET_DEV_OPS=y
	CONFIG_DUMMY=m		CONFIG_DUMMY=m
	# CONFIG_BONDING is not set		# CONFIG_BONDING is not set
	# CONFIG_MACVLAN is not set		# CONFIG_MACVLAN is not set
	@@ -430,6 +450,8 @@ CONFIG_SUNQE=m
	# CONFIG_SUNGEM is not set		# CONFIG_SUNGEM is not set
	# CONFIG_CASSINI is not set		# CONFIG_CASSINI is not set
	# CONFIG_NET_VENDOR_3COM is not set		# CONFIG_NET_VENDOR_3COM is not set
			# CONFIG_ETHOC is not set
			# CONFIG_DNET is not set
	# CONFIG_NET_TULIP is not set		# CONFIG_NET_TULIP is not set
	# CONFIG_HP100 is not set		# CONFIG_HP100 is not set
	# CONFIG_IBM_NEW_EMAC_ZMII is not set		# CONFIG_IBM_NEW_EMAC_ZMII is not set
	@@ -448,6 +470,7 @@ CONFIG_NETDEV_1000=y
	# CONFIG_E1000 is not set		# CONFIG_E1000 is not set
	# CONFIG_IP1000 is not set		# CONFIG_IP1000 is not set
	# CONFIG_IGB is not set		# CONFIG_IGB is not set
			# CONFIG_IGBVF is not set
	# CONFIG_MYRI_SBUS is not set		# CONFIG_MYRI_SBUS is not set
	# CONFIG_NS83820 is not set		# CONFIG_NS83820 is not set
	# CONFIG_HAMACHI is not set		# CONFIG_HAMACHI is not set
	@@ -462,6 +485,7 @@ CONFIG_NETDEV_1000=y
	# CONFIG_QLA3XXX is not set		# CONFIG_QLA3XXX is not set
	# CONFIG_ATL1 is not set		# CONFIG_ATL1 is not set
	# CONFIG_ATL1E is not set		# CONFIG_ATL1E is not set
			# CONFIG_ATL1C is not set
	# CONFIG_JME is not set		# CONFIG_JME is not set
	CONFIG_NETDEV_10000=y		CONFIG_NETDEV_10000=y
	# CONFIG_CHELSIO_T1 is not set		# CONFIG_CHELSIO_T1 is not set
	@@ -471,6 +495,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
	# CONFIG_IXGBE is not set		# CONFIG_IXGBE is not set
	# CONFIG_IXGB is not set		# CONFIG_IXGB is not set
	# CONFIG_S2IO is not set		# CONFIG_S2IO is not set
			# CONFIG_VXGE is not set
	# CONFIG_MYRI10GE is not set		# CONFIG_MYRI10GE is not set
	# CONFIG_NETXEN_NIC is not set		# CONFIG_NETXEN_NIC is not set
	# CONFIG_NIU is not set		# CONFIG_NIU is not set
	@@ -480,6 +505,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
	# CONFIG_BNX2X is not set		# CONFIG_BNX2X is not set
	# CONFIG_QLGE is not set		# CONFIG_QLGE is not set
	# CONFIG_SFC is not set		# CONFIG_SFC is not set
			# CONFIG_BE2NET is not set
	# CONFIG_TR is not set		# CONFIG_TR is not set

	#		#
	@@ -487,7 +513,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y
	#		#
	# CONFIG_WLAN_PRE80211 is not set		# CONFIG_WLAN_PRE80211 is not set
	# CONFIG_WLAN_80211 is not set		# CONFIG_WLAN_80211 is not set
	# CONFIG_IWLWIFI_LEDS is not set

	#		#
	# Enable WiMAX (Networking options) to see the WiMAX drivers		# Enable WiMAX (Networking options) to see the WiMAX drivers
	@@ -537,7 +562,6 @@ CONFIG_MOUSE_PS2=m
	CONFIG_MOUSE_PS2_ALPS=y		CONFIG_MOUSE_PS2_ALPS=y
	CONFIG_MOUSE_PS2_LOGIPS2PP=y		CONFIG_MOUSE_PS2_LOGIPS2PP=y
	CONFIG_MOUSE_PS2_SYNAPTICS=y		CONFIG_MOUSE_PS2_SYNAPTICS=y
	CONFIG_MOUSE_PS2_LIFEBOOK=y
	CONFIG_MOUSE_PS2_TRACKPOINT=y		CONFIG_MOUSE_PS2_TRACKPOINT=y
	# CONFIG_MOUSE_PS2_ELANTECH is not set		# CONFIG_MOUSE_PS2_ELANTECH is not set
	# CONFIG_MOUSE_PS2_TOUCHKIT is not set		# CONFIG_MOUSE_PS2_TOUCHKIT is not set
	@@ -597,6 +621,7 @@ CONFIG_LEGACY_PTYS=y
	CONFIG_LEGACY_PTY_COUNT=256		CONFIG_LEGACY_PTY_COUNT=256
	# CONFIG_IPMI_HANDLER is not set		# CONFIG_IPMI_HANDLER is not set
	CONFIG_HW_RANDOM=m		CONFIG_HW_RANDOM=m
			# CONFIG_HW_RANDOM_TIMERIOMEM is not set
	# CONFIG_R3964 is not set		# CONFIG_R3964 is not set
	# CONFIG_APPLICOM is not set		# CONFIG_APPLICOM is not set
	# CONFIG_RAW_DRIVER is not set		# CONFIG_RAW_DRIVER is not set
	@@ -688,7 +713,6 @@ CONFIG_HID=y
	#		#
	# Special HID drivers		# Special HID drivers
	#		#
	CONFIG_HID_COMPAT=y
	CONFIG_USB_SUPPORT=y		CONFIG_USB_SUPPORT=y
	CONFIG_USB_ARCH_HAS_HCD=y		CONFIG_USB_ARCH_HAS_HCD=y
	CONFIG_USB_ARCH_HAS_OHCI=y		CONFIG_USB_ARCH_HAS_OHCI=y
	@@ -700,7 +724,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
	#		#

	#		#
	# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;		# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
	#		#
	# CONFIG_USB_GADGET is not set		# CONFIG_USB_GADGET is not set

	@@ -750,6 +774,7 @@ CONFIG_RTC_DRV_M48T59=y
	# on-CPU RTC drivers		# on-CPU RTC drivers
	#		#
	# CONFIG_DMADEVICES is not set		# CONFIG_DMADEVICES is not set
			# CONFIG_AUXDISPLAY is not set
	# CONFIG_UIO is not set		# CONFIG_UIO is not set
	# CONFIG_STAGING is not set		# CONFIG_STAGING is not set

	@@ -777,6 +802,7 @@ CONFIG_FS_POSIX_ACL=y
	CONFIG_FILE_LOCKING=y		CONFIG_FILE_LOCKING=y
	# CONFIG_XFS_FS is not set		# CONFIG_XFS_FS is not set
	# CONFIG_OCFS2_FS is not set		# CONFIG_OCFS2_FS is not set
			# CONFIG_BTRFS_FS is not set
	CONFIG_DNOTIFY=y		CONFIG_DNOTIFY=y
	CONFIG_INOTIFY=y		CONFIG_INOTIFY=y
	CONFIG_INOTIFY_USER=y		CONFIG_INOTIFY_USER=y
	@@ -785,6 +811,11 @@ CONFIG_AUTOFS_FS=m
	CONFIG_AUTOFS4_FS=m		CONFIG_AUTOFS4_FS=m
	# CONFIG_FUSE_FS is not set		# CONFIG_FUSE_FS is not set

			#
			# Caches
			#
			# CONFIG_FSCACHE is not set

	#		#
	# CD-ROM/DVD Filesystems		# CD-ROM/DVD Filesystems
	#		#
	@@ -820,14 +851,20 @@ CONFIG_MISC_FILESYSTEMS=y
	# CONFIG_BFS_FS is not set		# CONFIG_BFS_FS is not set
	# CONFIG_EFS_FS is not set		# CONFIG_EFS_FS is not set
	# CONFIG_CRAMFS is not set		# CONFIG_CRAMFS is not set
			# CONFIG_SQUASHFS is not set
	# CONFIG_VXFS_FS is not set		# CONFIG_VXFS_FS is not set
	# CONFIG_MINIX_FS is not set		# CONFIG_MINIX_FS is not set
	# CONFIG_OMFS_FS is not set		# CONFIG_OMFS_FS is not set
	# CONFIG_HPFS_FS is not set		# CONFIG_HPFS_FS is not set
	# CONFIG_QNX4FS_FS is not set		# CONFIG_QNX4FS_FS is not set
	CONFIG_ROMFS_FS=m		CONFIG_ROMFS_FS=m
			CONFIG_ROMFS_BACKED_BY_BLOCK=y
			# CONFIG_ROMFS_BACKED_BY_MTD is not set
			# CONFIG_ROMFS_BACKED_BY_BOTH is not set
			CONFIG_ROMFS_ON_BLOCK=y
	# CONFIG_SYSV_FS is not set		# CONFIG_SYSV_FS is not set
	# CONFIG_UFS_FS is not set		# CONFIG_UFS_FS is not set
			# CONFIG_NILFS2_FS is not set
	CONFIG_NETWORK_FILESYSTEMS=y		CONFIG_NETWORK_FILESYSTEMS=y
	CONFIG_NFS_FS=y		CONFIG_NFS_FS=y
	# CONFIG_NFS_V3 is not set		# CONFIG_NFS_V3 is not set
	@@ -838,7 +875,6 @@ CONFIG_LOCKD=y
	CONFIG_NFS_COMMON=y		CONFIG_NFS_COMMON=y
	CONFIG_SUNRPC=y		CONFIG_SUNRPC=y
	CONFIG_SUNRPC_GSS=m		CONFIG_SUNRPC_GSS=m
	# CONFIG_SUNRPC_REGISTER_V4 is not set
	CONFIG_RPCSEC_GSS_KRB5=m		CONFIG_RPCSEC_GSS_KRB5=m
	# CONFIG_RPCSEC_GSS_SPKM3 is not set		# CONFIG_RPCSEC_GSS_SPKM3 is not set
	# CONFIG_SMB_FS is not set		# CONFIG_SMB_FS is not set
	@@ -911,6 +947,9 @@ CONFIG_DEBUG_KERNEL=y
	CONFIG_DETECT_SOFTLOCKUP=y		CONFIG_DETECT_SOFTLOCKUP=y
	# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set		# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
	CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0		CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
			CONFIG_DETECT_HUNG_TASK=y
			# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
			CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
	# CONFIG_SCHED_DEBUG is not set		# CONFIG_SCHED_DEBUG is not set
	# CONFIG_SCHEDSTATS is not set		# CONFIG_SCHEDSTATS is not set
	# CONFIG_TIMER_STATS is not set		# CONFIG_TIMER_STATS is not set
	@@ -939,15 +978,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
	# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set		# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
	# CONFIG_FAULT_INJECTION is not set		# CONFIG_FAULT_INJECTION is not set
	# CONFIG_SYSCTL_SYSCALL_CHECK is not set		# CONFIG_SYSCTL_SYSCALL_CHECK is not set
			# CONFIG_PAGE_POISONING is not set
	#
	# Tracers
	#
	# CONFIG_SCHED_TRACER is not set
	# CONFIG_CONTEXT_SWITCH_TRACER is not set
	# CONFIG_BOOT_TRACER is not set
	# CONFIG_TRACE_BRANCH_PROFILING is not set
	# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
	# CONFIG_SAMPLES is not set		# CONFIG_SAMPLES is not set
	CONFIG_HAVE_ARCH_KGDB=y		CONFIG_HAVE_ARCH_KGDB=y
	CONFIG_KGDB=y		CONFIG_KGDB=y
	@@ -979,10 +1010,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
	CONFIG_CRYPTO_HASH=y		CONFIG_CRYPTO_HASH=y
	CONFIG_CRYPTO_HASH2=y		CONFIG_CRYPTO_HASH2=y
	CONFIG_CRYPTO_RNG2=y		CONFIG_CRYPTO_RNG2=y
			CONFIG_CRYPTO_PCOMP=y
	CONFIG_CRYPTO_MANAGER=y		CONFIG_CRYPTO_MANAGER=y
	CONFIG_CRYPTO_MANAGER2=y		CONFIG_CRYPTO_MANAGER2=y
	# CONFIG_CRYPTO_GF128MUL is not set		# CONFIG_CRYPTO_GF128MUL is not set
	CONFIG_CRYPTO_NULL=m		CONFIG_CRYPTO_NULL=m
			CONFIG_CRYPTO_WORKQUEUE=y
	# CONFIG_CRYPTO_CRYPTD is not set		# CONFIG_CRYPTO_CRYPTD is not set
	CONFIG_CRYPTO_AUTHENC=y		CONFIG_CRYPTO_AUTHENC=y
	# CONFIG_CRYPTO_TEST is not set		# CONFIG_CRYPTO_TEST is not set
	@@ -1052,6 +1085,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
	# Compression		# Compression
	#		#
	CONFIG_CRYPTO_DEFLATE=y		CONFIG_CRYPTO_DEFLATE=y
			# CONFIG_CRYPTO_ZLIB is not set
	# CONFIG_CRYPTO_LZO is not set		# CONFIG_CRYPTO_LZO is not set

	#		#
	@@ -1059,6 +1093,7 @@ CONFIG_CRYPTO_DEFLATE=y
	#		#
	# CONFIG_CRYPTO_ANSI_CPRNG is not set		# CONFIG_CRYPTO_ANSI_CPRNG is not set
	# CONFIG_CRYPTO_HW is not set		# CONFIG_CRYPTO_HW is not set
			# CONFIG_BINARY_PRINTF is not set

	#		#
	# Library routines		# Library routines
	@@ -1074,7 +1109,10 @@ CONFIG_CRC32=y
	CONFIG_LIBCRC32C=m		CONFIG_LIBCRC32C=m
	CONFIG_ZLIB_INFLATE=y		CONFIG_ZLIB_INFLATE=y
	CONFIG_ZLIB_DEFLATE=y		CONFIG_ZLIB_DEFLATE=y
	CONFIG_PLIST=y		CONFIG_DECOMPRESS_GZIP=y
			CONFIG_DECOMPRESS_BZIP2=y
			CONFIG_DECOMPRESS_LZMA=y
	CONFIG_HAS_IOMEM=y		CONFIG_HAS_IOMEM=y
	CONFIG_HAS_IOPORT=y		CONFIG_HAS_IOPORT=y
	CONFIG_HAS_DMA=y		CONFIG_HAS_DMA=y
			CONFIG_NLATTR=y

arch/sparc/configs/sparc64_defconfig

+119 −63

File changed.

Preview size limit exceeded, changes collapsed.

arch/sparc/kernel/of_device_32.c

+19 −2

Original line number	Original line	Diff line number	Diff line
	@@ -246,8 +246,25 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)

	static int of_bus_sbus_match(struct device_node *np)		static int of_bus_sbus_match(struct device_node *np)
	{		{
	return !strcmp(np->name, "sbus") \|\|		struct device_node *dp = np;
	!strcmp(np->name, "sbi");
			while (dp) {
			if (!strcmp(dp->name, "sbus") \|\|
			!strcmp(dp->name, "sbi"))
			return 1;

			/* Have a look at use_1to1_mapping(). We're trying
			* to match SBUS if that's the top-level bus and we
			* don't have some intervening real bus that provides
			* ranges based translations.
			*/
			if (of_find_property(dp, "ranges", NULL) != NULL)
			break;

			dp = dp->parent;
			}

			return 0;
	}		}

	static void of_bus_sbus_count_cells(struct device_node *child,		static void of_bus_sbus_count_cells(struct device_node *child,

arch/sparc/kernel/of_device_64.c

+19 −2

Original line number	Original line	Diff line number	Diff line
	@@ -300,8 +300,25 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)

	static int of_bus_sbus_match(struct device_node *np)		static int of_bus_sbus_match(struct device_node *np)
	{		{
	return !strcmp(np->name, "sbus") \|\|		struct device_node *dp = np;
	!strcmp(np->name, "sbi");
			while (dp) {
			if (!strcmp(dp->name, "sbus") \|\|
			!strcmp(dp->name, "sbi"))
			return 1;

			/* Have a look at use_1to1_mapping(). We're trying
			* to match SBUS if that's the top-level bus and we
			* don't have some intervening real bus that provides
			* ranges based translations.
			*/
			if (of_find_property(dp, "ranges", NULL) != NULL)
			break;

			dp = dp->parent;
			}

			return 0;
	}		}

	static void of_bus_sbus_count_cells(struct device_node *child,		static void of_bus_sbus_count_cells(struct device_node *child,