aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2007-05-10 09:46:02 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-05-10 09:46:08 -0400
commit906fc9e92f0e8b618d4025c3aa6289415ecd8152 (patch)
treee9d02da1137fb5f11e4229f859cd4c8bb3a9ac5f
parentf54bfc0e34dbd15e9df099a8e36a346c6c583f3c (diff)
[S390] update default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/defconfig234
1 files changed, 128 insertions, 106 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 0e4da8a7d826..485b60c1983c 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-rc1 3# Linux kernel version: 2.6.21
4# Wed Feb 21 10:44:30 2007 4# Thu May 10 15:18:19 2007
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_ZONE_DMA=y 7CONFIG_ZONE_DMA=y
@@ -14,6 +14,7 @@ CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_TIME=y 14CONFIG_GENERIC_TIME=y
15CONFIG_GENERIC_BUG=y 15CONFIG_GENERIC_BUG=y
16CONFIG_NO_IOMEM=y 16CONFIG_NO_IOMEM=y
17CONFIG_NO_DMA=y
17CONFIG_S390=y 18CONFIG_S390=y
18CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 19CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
19 20
@@ -41,9 +42,11 @@ CONFIG_AUDIT=y
41# CONFIG_AUDITSYSCALL is not set 42# CONFIG_AUDITSYSCALL is not set
42CONFIG_IKCONFIG=y 43CONFIG_IKCONFIG=y
43CONFIG_IKCONFIG_PROC=y 44CONFIG_IKCONFIG_PROC=y
45CONFIG_LOG_BUF_SHIFT=17
44# CONFIG_CPUSETS is not set 46# CONFIG_CPUSETS is not set
45CONFIG_SYSFS_DEPRECATED=y 47CONFIG_SYSFS_DEPRECATED=y
46# CONFIG_RELAY is not set 48# CONFIG_RELAY is not set
49CONFIG_BLK_DEV_INITRD=y
47CONFIG_INITRAMFS_SOURCE="" 50CONFIG_INITRAMFS_SOURCE=""
48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 51# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
49CONFIG_SYSCTL=y 52CONFIG_SYSCTL=y
@@ -60,12 +63,14 @@ CONFIG_BASE_FULL=y
60CONFIG_FUTEX=y 63CONFIG_FUTEX=y
61CONFIG_EPOLL=y 64CONFIG_EPOLL=y
62CONFIG_SHMEM=y 65CONFIG_SHMEM=y
63CONFIG_SLAB=y
64CONFIG_VM_EVENT_COUNTERS=y 66CONFIG_VM_EVENT_COUNTERS=y
67CONFIG_SLUB_DEBUG=y
68CONFIG_SLAB=y
69# CONFIG_SLUB is not set
70# CONFIG_SLOB is not set
65CONFIG_RT_MUTEXES=y 71CONFIG_RT_MUTEXES=y
66# CONFIG_TINY_SHMEM is not set 72# CONFIG_TINY_SHMEM is not set
67CONFIG_BASE_SMALL=0 73CONFIG_BASE_SMALL=0
68# CONFIG_SLOB is not set
69 74
70# 75#
71# Loadable module support 76# Loadable module support
@@ -128,6 +133,14 @@ CONFIG_CHECK_STACK=y
128CONFIG_STACK_GUARD=256 133CONFIG_STACK_GUARD=256
129# CONFIG_WARN_STACK is not set 134# CONFIG_WARN_STACK is not set
130CONFIG_ARCH_POPULATES_NODE_MAP=y 135CONFIG_ARCH_POPULATES_NODE_MAP=y
136
137#
138# Kernel preemption
139#
140# CONFIG_PREEMPT_NONE is not set
141# CONFIG_PREEMPT_VOLUNTARY is not set
142CONFIG_PREEMPT=y
143CONFIG_PREEMPT_BKL=y
131CONFIG_SELECT_MEMORY_MODEL=y 144CONFIG_SELECT_MEMORY_MODEL=y
132CONFIG_FLATMEM_MANUAL=y 145CONFIG_FLATMEM_MANUAL=y
133# CONFIG_DISCONTIGMEM_MANUAL is not set 146# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -150,7 +163,6 @@ CONFIG_QDIO=y
150# 163#
151# Misc 164# Misc
152# 165#
153CONFIG_PREEMPT=y
154CONFIG_IPL=y 166CONFIG_IPL=y
155# CONFIG_IPL_TAPE is not set 167# CONFIG_IPL_TAPE is not set
156CONFIG_IPL_VM=y 168CONFIG_IPL_VM=y
@@ -163,6 +175,11 @@ CONFIG_PFAULT=y
163CONFIG_VIRT_TIMER=y 175CONFIG_VIRT_TIMER=y
164CONFIG_VIRT_CPU_ACCOUNTING=y 176CONFIG_VIRT_CPU_ACCOUNTING=y
165# CONFIG_APPLDATA_BASE is not set 177# CONFIG_APPLDATA_BASE is not set
178CONFIG_HZ_100=y
179# CONFIG_HZ_250 is not set
180# CONFIG_HZ_300 is not set
181# CONFIG_HZ_1000 is not set
182CONFIG_HZ=100
166CONFIG_NO_IDLE_HZ=y 183CONFIG_NO_IDLE_HZ=y
167CONFIG_NO_IDLE_HZ_INIT=y 184CONFIG_NO_IDLE_HZ_INIT=y
168CONFIG_S390_HYPFS_FS=y 185CONFIG_S390_HYPFS_FS=y
@@ -177,7 +194,6 @@ CONFIG_NET=y
177# 194#
178# Networking options 195# Networking options
179# 196#
180# CONFIG_NETDEBUG is not set
181CONFIG_PACKET=y 197CONFIG_PACKET=y
182# CONFIG_PACKET_MMAP is not set 198# CONFIG_PACKET_MMAP is not set
183CONFIG_UNIX=y 199CONFIG_UNIX=y
@@ -216,6 +232,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
216CONFIG_IPV6=y 232CONFIG_IPV6=y
217# CONFIG_IPV6_PRIVACY is not set 233# CONFIG_IPV6_PRIVACY is not set
218# CONFIG_IPV6_ROUTER_PREF is not set 234# CONFIG_IPV6_ROUTER_PREF is not set
235# CONFIG_IPV6_OPTIMISTIC_DAD is not set
219# CONFIG_INET6_AH is not set 236# CONFIG_INET6_AH is not set
220# CONFIG_INET6_ESP is not set 237# CONFIG_INET6_ESP is not set
221# CONFIG_INET6_IPCOMP is not set 238# CONFIG_INET6_IPCOMP is not set
@@ -240,7 +257,12 @@ CONFIG_IPV6_SIT=y
240# 257#
241# SCTP Configuration (EXPERIMENTAL) 258# SCTP Configuration (EXPERIMENTAL)
242# 259#
243# CONFIG_IP_SCTP is not set 260CONFIG_IP_SCTP=m
261# CONFIG_SCTP_DBG_MSG is not set
262# CONFIG_SCTP_DBG_OBJCNT is not set
263# CONFIG_SCTP_HMAC_NONE is not set
264# CONFIG_SCTP_HMAC_SHA1 is not set
265CONFIG_SCTP_HMAC_MD5=y
244 266
245# 267#
246# TIPC Configuration (EXPERIMENTAL) 268# TIPC Configuration (EXPERIMENTAL)
@@ -263,9 +285,6 @@ CONFIG_IPV6_SIT=y
263# 285#
264CONFIG_NET_SCHED=y 286CONFIG_NET_SCHED=y
265CONFIG_NET_SCH_FIFO=y 287CONFIG_NET_SCH_FIFO=y
266CONFIG_NET_SCH_CLK_JIFFIES=y
267# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
268# CONFIG_NET_SCH_CLK_CPU is not set
269 288
270# 289#
271# Queueing/Scheduling 290# Queueing/Scheduling
@@ -308,11 +327,14 @@ CONFIG_NET_ESTIMATOR=y
308# 327#
309# CONFIG_NET_PKTGEN is not set 328# CONFIG_NET_PKTGEN is not set
310# CONFIG_NET_TCPPROBE is not set 329# CONFIG_NET_TCPPROBE is not set
311# CONFIG_HAMRADIO is not set 330# CONFIG_AF_RXRPC is not set
312# CONFIG_IRDA is not set 331# CONFIG_RFKILL is not set
313# CONFIG_BT is not set
314# CONFIG_IEEE80211 is not set
315# CONFIG_PCMCIA is not set 332# CONFIG_PCMCIA is not set
333CONFIG_CCW=y
334
335#
336# Device Drivers
337#
316 338
317# 339#
318# Generic Driver Options 340# Generic Driver Options
@@ -330,6 +352,37 @@ CONFIG_SYS_HYPERVISOR=y
330# CONFIG_CONNECTOR is not set 352# CONFIG_CONNECTOR is not set
331 353
332# 354#
355# Block devices
356#
357# CONFIG_BLK_DEV_COW_COMMON is not set
358CONFIG_BLK_DEV_LOOP=m
359# CONFIG_BLK_DEV_CRYPTOLOOP is not set
360CONFIG_BLK_DEV_NBD=m
361CONFIG_BLK_DEV_RAM=y
362CONFIG_BLK_DEV_RAM_COUNT=16
363CONFIG_BLK_DEV_RAM_SIZE=4096
364CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
365# CONFIG_CDROM_PKTCDVD is not set
366# CONFIG_ATA_OVER_ETH is not set
367
368#
369# S/390 block device drivers
370#
371CONFIG_BLK_DEV_XPRAM=m
372# CONFIG_DCSSBLK is not set
373CONFIG_DASD=y
374CONFIG_DASD_PROFILE=y
375CONFIG_DASD_ECKD=y
376CONFIG_DASD_FBA=y
377CONFIG_DASD_DIAG=y
378CONFIG_DASD_EER=y
379
380#
381# Misc devices
382#
383# CONFIG_BLINK is not set
384
385#
333# SCSI device support 386# SCSI device support
334# 387#
335# CONFIG_RAID_ATTRS is not set 388# CONFIG_RAID_ATTRS is not set
@@ -356,6 +409,7 @@ CONFIG_SCSI_MULTI_LUN=y
356CONFIG_SCSI_CONSTANTS=y 409CONFIG_SCSI_CONSTANTS=y
357CONFIG_SCSI_LOGGING=y 410CONFIG_SCSI_LOGGING=y
358CONFIG_SCSI_SCAN_ASYNC=y 411CONFIG_SCSI_SCAN_ASYNC=y
412CONFIG_SCSI_WAIT_SCAN=m
359 413
360# 414#
361# SCSI Transports 415# SCSI Transports
@@ -372,34 +426,6 @@ CONFIG_SCSI_FC_ATTRS=y
372# CONFIG_ISCSI_TCP is not set 426# CONFIG_ISCSI_TCP is not set
373# CONFIG_SCSI_DEBUG is not set 427# CONFIG_SCSI_DEBUG is not set
374CONFIG_ZFCP=y 428CONFIG_ZFCP=y
375CONFIG_CCW=y
376
377#
378# Block devices
379#
380# CONFIG_BLK_DEV_COW_COMMON is not set
381CONFIG_BLK_DEV_LOOP=m
382# CONFIG_BLK_DEV_CRYPTOLOOP is not set
383CONFIG_BLK_DEV_NBD=m
384CONFIG_BLK_DEV_RAM=y
385CONFIG_BLK_DEV_RAM_COUNT=16
386CONFIG_BLK_DEV_RAM_SIZE=4096
387CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
388CONFIG_BLK_DEV_INITRD=y
389# CONFIG_CDROM_PKTCDVD is not set
390
391#
392# S/390 block device drivers
393#
394CONFIG_BLK_DEV_XPRAM=m
395# CONFIG_DCSSBLK is not set
396CONFIG_DASD=y
397CONFIG_DASD_PROFILE=y
398CONFIG_DASD_ECKD=y
399CONFIG_DASD_FBA=y
400CONFIG_DASD_DIAG=y
401CONFIG_DASD_EER=y
402# CONFIG_ATA_OVER_ETH is not set
403 429
404# 430#
405# Multi-device support (RAID and LVM) 431# Multi-device support (RAID and LVM)
@@ -421,56 +447,7 @@ CONFIG_DM_MIRROR=y
421CONFIG_DM_ZERO=y 447CONFIG_DM_ZERO=y
422CONFIG_DM_MULTIPATH=y 448CONFIG_DM_MULTIPATH=y
423# CONFIG_DM_MULTIPATH_EMC is not set 449# CONFIG_DM_MULTIPATH_EMC is not set
424 450# CONFIG_DM_DELAY is not set
425#
426# Character device drivers
427#
428CONFIG_UNIX98_PTYS=y
429CONFIG_UNIX98_PTY_COUNT=2048
430# CONFIG_HANGCHECK_TIMER is not set
431
432#
433# Watchdog Cards
434#
435# CONFIG_WATCHDOG is not set
436
437#
438# S/390 character device drivers
439#
440CONFIG_TN3270=y
441CONFIG_TN3270_TTY=y
442CONFIG_TN3270_FS=m
443CONFIG_TN3270_CONSOLE=y
444CONFIG_TN3215=y
445CONFIG_TN3215_CONSOLE=y
446CONFIG_CCW_CONSOLE=y
447CONFIG_SCLP_TTY=y
448CONFIG_SCLP_CONSOLE=y
449CONFIG_SCLP_VT220_TTY=y
450CONFIG_SCLP_VT220_CONSOLE=y
451CONFIG_SCLP_CPI=m
452CONFIG_S390_TAPE=m
453
454#
455# S/390 tape interface support
456#
457CONFIG_S390_TAPE_BLOCK=y
458
459#
460# S/390 tape hardware support
461#
462CONFIG_S390_TAPE_34XX=m
463# CONFIG_S390_TAPE_3590 is not set
464# CONFIG_VMLOGRDR is not set
465# CONFIG_VMCP is not set
466# CONFIG_MONREADER is not set
467CONFIG_MONWRITER=m
468
469#
470# Cryptographic devices
471#
472CONFIG_ZCRYPT=m
473# CONFIG_ZCRYPT_MONOLITHIC is not set
474 451
475# 452#
476# Network device support 453# Network device support
@@ -482,10 +459,6 @@ CONFIG_EQUALIZER=m
482CONFIG_TUN=m 459CONFIG_TUN=m
483 460
484# 461#
485# PHY device support
486#
487
488#
489# Ethernet (10 or 100Mbit) 462# Ethernet (10 or 100Mbit)
490# 463#
491CONFIG_NET_ETHERNET=y 464CONFIG_NET_ETHERNET=y
@@ -498,6 +471,7 @@ CONFIG_NET_ETHERNET=y
498# 471#
499# Ethernet (10000 Mbit) 472# Ethernet (10000 Mbit)
500# 473#
474CONFIG_MLX4_DEBUG=y
501 475
502# 476#
503# Token Ring devices 477# Token Ring devices
@@ -505,11 +479,6 @@ CONFIG_NET_ETHERNET=y
505# CONFIG_TR is not set 479# CONFIG_TR is not set
506 480
507# 481#
508# Wireless LAN (non-hamradio)
509#
510# CONFIG_NET_RADIO is not set
511
512#
513# Wan interfaces 482# Wan interfaces
514# 483#
515# CONFIG_WAN is not set 484# CONFIG_WAN is not set
@@ -537,6 +506,56 @@ CONFIG_CCWGROUP=y
537# CONFIG_NET_POLL_CONTROLLER is not set 506# CONFIG_NET_POLL_CONTROLLER is not set
538 507
539# 508#
509# Character devices
510#
511CONFIG_UNIX98_PTYS=y
512CONFIG_LEGACY_PTYS=y
513CONFIG_LEGACY_PTY_COUNT=256
514
515#
516# Watchdog Cards
517#
518# CONFIG_WATCHDOG is not set
519CONFIG_HW_RANDOM=m
520# CONFIG_R3964 is not set
521CONFIG_RAW_DRIVER=m
522CONFIG_MAX_RAW_DEVS=256
523# CONFIG_HANGCHECK_TIMER is not set
524
525#
526# S/390 character device drivers
527#
528CONFIG_TN3270=y
529CONFIG_TN3270_TTY=y
530CONFIG_TN3270_FS=m
531CONFIG_TN3270_CONSOLE=y
532CONFIG_TN3215=y
533CONFIG_TN3215_CONSOLE=y
534CONFIG_CCW_CONSOLE=y
535CONFIG_SCLP=y
536CONFIG_SCLP_TTY=y
537CONFIG_SCLP_CONSOLE=y
538CONFIG_SCLP_VT220_TTY=y
539CONFIG_SCLP_VT220_CONSOLE=y
540CONFIG_SCLP_CPI=m
541CONFIG_S390_TAPE=m
542
543#
544# S/390 tape interface support
545#
546CONFIG_S390_TAPE_BLOCK=y
547
548#
549# S/390 tape hardware support
550#
551CONFIG_S390_TAPE_34XX=m
552# CONFIG_S390_TAPE_3590 is not set
553# CONFIG_VMLOGRDR is not set
554# CONFIG_VMCP is not set
555# CONFIG_MONREADER is not set
556CONFIG_MONWRITER=m
557
558#
540# File systems 559# File systems
541# 560#
542CONFIG_EXT2_FS=y 561CONFIG_EXT2_FS=y
@@ -628,6 +647,7 @@ CONFIG_LOCKD_V4=y
628CONFIG_EXPORTFS=y 647CONFIG_EXPORTFS=y
629CONFIG_NFS_COMMON=y 648CONFIG_NFS_COMMON=y
630CONFIG_SUNRPC=y 649CONFIG_SUNRPC=y
650# CONFIG_SUNRPC_BIND34 is not set
631# CONFIG_RPCSEC_GSS_KRB5 is not set 651# CONFIG_RPCSEC_GSS_KRB5 is not set
632# CONFIG_RPCSEC_GSS_SPKM3 is not set 652# CONFIG_RPCSEC_GSS_SPKM3 is not set
633# CONFIG_SMB_FS is not set 653# CONFIG_SMB_FS is not set
@@ -658,6 +678,7 @@ CONFIG_MSDOS_PARTITION=y
658# CONFIG_SUN_PARTITION is not set 678# CONFIG_SUN_PARTITION is not set
659# CONFIG_KARMA_PARTITION is not set 679# CONFIG_KARMA_PARTITION is not set
660# CONFIG_EFI_PARTITION is not set 680# CONFIG_EFI_PARTITION is not set
681# CONFIG_SYSV68_PARTITION is not set
661 682
662# 683#
663# Native Language Support 684# Native Language Support
@@ -668,8 +689,6 @@ CONFIG_MSDOS_PARTITION=y
668# Distributed Lock Manager 689# Distributed Lock Manager
669# 690#
670CONFIG_DLM=m 691CONFIG_DLM=m
671CONFIG_DLM_TCP=y
672# CONFIG_DLM_SCTP is not set
673# CONFIG_DLM_DEBUG is not set 692# CONFIG_DLM_DEBUG is not set
674 693
675# 694#
@@ -693,7 +712,6 @@ CONFIG_MAGIC_SYSRQ=y
693CONFIG_DEBUG_FS=y 712CONFIG_DEBUG_FS=y
694CONFIG_HEADERS_CHECK=y 713CONFIG_HEADERS_CHECK=y
695CONFIG_DEBUG_KERNEL=y 714CONFIG_DEBUG_KERNEL=y
696CONFIG_LOG_BUF_SHIFT=17
697# CONFIG_SCHEDSTATS is not set 715# CONFIG_SCHEDSTATS is not set
698# CONFIG_TIMER_STATS is not set 716# CONFIG_TIMER_STATS is not set
699# CONFIG_DEBUG_SLAB is not set 717# CONFIG_DEBUG_SLAB is not set
@@ -729,12 +747,13 @@ CONFIG_FORCED_INLINING=y
729CONFIG_CRYPTO=y 747CONFIG_CRYPTO=y
730CONFIG_CRYPTO_ALGAPI=y 748CONFIG_CRYPTO_ALGAPI=y
731CONFIG_CRYPTO_BLKCIPHER=y 749CONFIG_CRYPTO_BLKCIPHER=y
750CONFIG_CRYPTO_HASH=m
732CONFIG_CRYPTO_MANAGER=y 751CONFIG_CRYPTO_MANAGER=y
733# CONFIG_CRYPTO_HMAC is not set 752CONFIG_CRYPTO_HMAC=m
734# CONFIG_CRYPTO_XCBC is not set 753# CONFIG_CRYPTO_XCBC is not set
735# CONFIG_CRYPTO_NULL is not set 754# CONFIG_CRYPTO_NULL is not set
736# CONFIG_CRYPTO_MD4 is not set 755# CONFIG_CRYPTO_MD4 is not set
737# CONFIG_CRYPTO_MD5 is not set 756CONFIG_CRYPTO_MD5=m
738# CONFIG_CRYPTO_SHA1 is not set 757# CONFIG_CRYPTO_SHA1 is not set
739# CONFIG_CRYPTO_SHA256 is not set 758# CONFIG_CRYPTO_SHA256 is not set
740# CONFIG_CRYPTO_SHA512 is not set 759# CONFIG_CRYPTO_SHA512 is not set
@@ -745,6 +764,7 @@ CONFIG_CRYPTO_ECB=m
745CONFIG_CRYPTO_CBC=y 764CONFIG_CRYPTO_CBC=y
746CONFIG_CRYPTO_PCBC=m 765CONFIG_CRYPTO_PCBC=m
747# CONFIG_CRYPTO_LRW is not set 766# CONFIG_CRYPTO_LRW is not set
767# CONFIG_CRYPTO_CRYPTD is not set
748# CONFIG_CRYPTO_DES is not set 768# CONFIG_CRYPTO_DES is not set
749CONFIG_CRYPTO_FCRYPT=m 769CONFIG_CRYPTO_FCRYPT=m
750# CONFIG_CRYPTO_BLOWFISH is not set 770# CONFIG_CRYPTO_BLOWFISH is not set
@@ -771,6 +791,8 @@ CONFIG_CRYPTO_CAMELLIA=m
771# CONFIG_CRYPTO_DES_S390 is not set 791# CONFIG_CRYPTO_DES_S390 is not set
772# CONFIG_CRYPTO_AES_S390 is not set 792# CONFIG_CRYPTO_AES_S390 is not set
773CONFIG_S390_PRNG=m 793CONFIG_S390_PRNG=m
794CONFIG_ZCRYPT=m
795# CONFIG_ZCRYPT_MONOLITHIC is not set
774 796
775# 797#
776# Library routines 798# Library routines