tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[S390] Update default configuration.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by Martin Schwidefsky and committed by Martin Schwidefsky cc4707b3 f5cae7b0

+75 -11
unified split
+75 -11
arch/s390/defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.31 4 - # Tue Sep 22 17:43:13 2009 3 + # Linux kernel version: 2.6.33-rc2 4 + # Mon Jan 4 09:03:07 2010 5 5 # 6 6 CONFIG_SCHED_MC=y 7 7 CONFIG_MMU=y ··· 51 51 # 52 52 CONFIG_TREE_RCU=y 53 53 # CONFIG_TREE_PREEMPT_RCU is not set 54 + # CONFIG_TINY_RCU is not set 54 55 # CONFIG_RCU_TRACE is not set 55 56 CONFIG_RCU_FANOUT=64 56 57 # CONFIG_RCU_FANOUT_EXACT is not set ··· 114 113 # CONFIG_PERF_EVENTS is not set 115 114 # CONFIG_PERF_COUNTERS is not set 116 115 CONFIG_VM_EVENT_COUNTERS=y 117 - # CONFIG_STRIP_ASM_SYMS is not set 118 116 # CONFIG_COMPAT_BRK is not set 119 117 CONFIG_SLAB=y 120 118 # CONFIG_SLUB is not set ··· 149 149 CONFIG_BLOCK=y 150 150 CONFIG_BLK_DEV_BSG=y 151 151 # CONFIG_BLK_DEV_INTEGRITY is not set 152 + # CONFIG_BLK_CGROUP is not set 152 153 CONFIG_BLOCK_COMPAT=y 153 154 154 155 # 155 156 # IO Schedulers 156 157 # 157 158 CONFIG_IOSCHED_NOOP=y 158 - CONFIG_IOSCHED_AS=y 159 159 CONFIG_IOSCHED_DEADLINE=y 160 160 CONFIG_IOSCHED_CFQ=y 161 - # CONFIG_DEFAULT_AS is not set 161 + # CONFIG_CFQ_GROUP_IOSCHED is not set 162 162 CONFIG_DEFAULT_DEADLINE=y 163 163 # CONFIG_DEFAULT_CFQ is not set 164 164 # CONFIG_DEFAULT_NOOP is not set 165 165 CONFIG_DEFAULT_IOSCHED="deadline" 166 166 CONFIG_PREEMPT_NOTIFIERS=y 167 + CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y 168 + CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y 169 + CONFIG_ARCH_INLINE_SPIN_LOCK=y 170 + CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y 171 + CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y 172 + CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y 173 + CONFIG_ARCH_INLINE_SPIN_UNLOCK=y 174 + CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y 175 + CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y 176 + CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y 177 + CONFIG_ARCH_INLINE_READ_TRYLOCK=y 178 + CONFIG_ARCH_INLINE_READ_LOCK=y 179 + CONFIG_ARCH_INLINE_READ_LOCK_BH=y 180 + CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y 181 + CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y 182 + CONFIG_ARCH_INLINE_READ_UNLOCK=y 183 + CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y 184 + CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y 185 + CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y 186 + CONFIG_ARCH_INLINE_WRITE_TRYLOCK=y 187 + CONFIG_ARCH_INLINE_WRITE_LOCK=y 188 + CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y 189 + CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y 190 + CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y 191 + CONFIG_ARCH_INLINE_WRITE_UNLOCK=y 192 + CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y 193 + CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y 194 + CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y 195 + # CONFIG_INLINE_SPIN_TRYLOCK is not set 196 + # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set 197 + # CONFIG_INLINE_SPIN_LOCK is not set 198 + # CONFIG_INLINE_SPIN_LOCK_BH is not set 199 + # CONFIG_INLINE_SPIN_LOCK_IRQ is not set 200 + # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set 201 + # CONFIG_INLINE_SPIN_UNLOCK is not set 202 + # CONFIG_INLINE_SPIN_UNLOCK_BH is not set 203 + # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set 204 + # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set 205 + # CONFIG_INLINE_READ_TRYLOCK is not set 206 + # CONFIG_INLINE_READ_LOCK is not set 207 + # CONFIG_INLINE_READ_LOCK_BH is not set 208 + # CONFIG_INLINE_READ_LOCK_IRQ is not set 209 + # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set 210 + # CONFIG_INLINE_READ_UNLOCK is not set 211 + # CONFIG_INLINE_READ_UNLOCK_BH is not set 212 + # CONFIG_INLINE_READ_UNLOCK_IRQ is not set 213 + # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set 214 + # CONFIG_INLINE_WRITE_TRYLOCK is not set 215 + # CONFIG_INLINE_WRITE_LOCK is not set 216 + # CONFIG_INLINE_WRITE_LOCK_BH is not set 217 + # CONFIG_INLINE_WRITE_LOCK_IRQ is not set 218 + # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set 219 + # CONFIG_INLINE_WRITE_UNLOCK is not set 220 + # CONFIG_INLINE_WRITE_UNLOCK_BH is not set 221 + # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set 222 + # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set 223 + # CONFIG_MUTEX_SPIN_ON_OWNER is not set 167 224 CONFIG_FREEZER=y 168 225 169 226 # ··· 284 227 CONFIG_MEMORY_HOTPLUG_SPARSE=y 285 228 CONFIG_MEMORY_HOTREMOVE=y 286 229 CONFIG_PAGEFLAGS_EXTENDED=y 287 - CONFIG_SPLIT_PTLOCK_CPUS=4 230 + CONFIG_SPLIT_PTLOCK_CPUS=999999 288 231 CONFIG_MIGRATION=y 289 232 CONFIG_PHYS_ADDR_T_64BIT=y 290 233 CONFIG_ZONE_DMA_FLAG=1 291 234 CONFIG_BOUNCE=y 292 235 CONFIG_VIRT_TO_BUS=y 293 - CONFIG_HAVE_MLOCK=y 294 - CONFIG_HAVE_MLOCKED_PAGE_BIT=y 236 + # CONFIG_KSM is not set 295 237 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 296 238 297 239 # ··· 395 339 CONFIG_INET6_XFRM_MODE_BEET=y 396 340 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 397 341 CONFIG_IPV6_SIT=y 342 + # CONFIG_IPV6_SIT_6RD is not set 398 343 CONFIG_IPV6_NDISC_NODETYPE=y 399 344 # CONFIG_IPV6_TUNNEL is not set 400 345 # CONFIG_IPV6_MULTIPLE_TABLES is not set ··· 561 504 # CONFIG_BLK_DEV_COW_COMMON is not set 562 505 CONFIG_BLK_DEV_LOOP=m 563 506 # CONFIG_BLK_DEV_CRYPTOLOOP is not set 507 + 508 + # 509 + # DRBD disabled because PROC_FS, INET or CONNECTOR not selected 510 + # 564 511 CONFIG_BLK_DEV_NBD=m 565 512 # CONFIG_BLK_DEV_OSD is not set 566 513 CONFIG_BLK_DEV_RAM=y ··· 771 710 # CONFIG_PPS is not set 772 711 # CONFIG_POWER_SUPPLY is not set 773 712 # CONFIG_THERMAL is not set 774 - # CONFIG_THERMAL_HWMON is not set 775 713 # CONFIG_WATCHDOG is not set 776 714 # CONFIG_REGULATOR is not set 777 715 # CONFIG_MEMSTICK is not set ··· 924 864 CONFIG_ENABLE_MUST_CHECK=y 925 865 CONFIG_FRAME_WARN=2048 926 866 CONFIG_MAGIC_SYSRQ=y 867 + # CONFIG_STRIP_ASM_SYMS is not set 927 868 # CONFIG_UNUSED_SYMBOLS is not set 928 869 CONFIG_DEBUG_FS=y 929 870 # CONFIG_HEADERS_CHECK is not set ··· 992 931 CONFIG_SAMPLES=y 993 932 # CONFIG_SAMPLE_KOBJECT is not set 994 933 # CONFIG_SAMPLE_KPROBES is not set 995 - # CONFIG_KMEMCHECK is not set 996 934 997 935 # 998 936 # Security options ··· 999 939 # CONFIG_KEYS is not set 1000 940 # CONFIG_SECURITY is not set 1001 941 # CONFIG_SECURITYFS is not set 1002 - # CONFIG_SECURITY_FILE_CAPABILITIES is not set 942 + # CONFIG_DEFAULT_SECURITY_SELINUX is not set 943 + # CONFIG_DEFAULT_SECURITY_SMACK is not set 944 + # CONFIG_DEFAULT_SECURITY_TOMOYO is not set 945 + CONFIG_DEFAULT_SECURITY_DAC=y 946 + CONFIG_DEFAULT_SECURITY="" 1003 947 CONFIG_CRYPTO=y 1004 948 1005 949 #