aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2006-01-06 03:19:11 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:49 -0500
commit088c4ec16aa6b865dcf690051ddac30eb2bf6bcc (patch)
treebd2f31466a835145723c529fe05fac25f13a345d /arch/s390
parent4e3df37e7fb4e41bec84465ff31949737160ed58 (diff)
[PATCH] s390: update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/defconfig55
1 files changed, 39 insertions, 16 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 45d44c6bb39d..0c495fe83112 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.14-rc1 3# Linux kernel version: 2.6.15-rc2
4# Wed Sep 14 16:46:19 2005 4# Mon Nov 21 13:51:30 2005
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_RWSEM_XCHGADD_ALGORITHM=y 7CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -65,6 +65,24 @@ CONFIG_KMOD=y
65CONFIG_STOP_MACHINE=y 65CONFIG_STOP_MACHINE=y
66 66
67# 67#
68# Block layer
69#
70# CONFIG_LBD is not set
71
72#
73# IO Schedulers
74#
75CONFIG_IOSCHED_NOOP=y
76CONFIG_IOSCHED_AS=y
77CONFIG_IOSCHED_DEADLINE=y
78CONFIG_IOSCHED_CFQ=y
79CONFIG_DEFAULT_AS=y
80# CONFIG_DEFAULT_DEADLINE is not set
81# CONFIG_DEFAULT_CFQ is not set
82# CONFIG_DEFAULT_NOOP is not set
83CONFIG_DEFAULT_IOSCHED="anticipatory"
84
85#
68# Base setup 86# Base setup
69# 87#
70 88
@@ -97,6 +115,7 @@ CONFIG_FLATMEM_MANUAL=y
97CONFIG_FLATMEM=y 115CONFIG_FLATMEM=y
98CONFIG_FLAT_NODE_MEM_MAP=y 116CONFIG_FLAT_NODE_MEM_MAP=y
99# CONFIG_SPARSEMEM_STATIC is not set 117# CONFIG_SPARSEMEM_STATIC is not set
118CONFIG_SPLIT_PTLOCK_CPUS=4
100 119
101# 120#
102# I/O subsystem configuration 121# I/O subsystem configuration
@@ -188,10 +207,18 @@ CONFIG_IPV6=y
188# CONFIG_NET_DIVERT is not set 207# CONFIG_NET_DIVERT is not set
189# CONFIG_ECONET is not set 208# CONFIG_ECONET is not set
190# CONFIG_WAN_ROUTER is not set 209# CONFIG_WAN_ROUTER is not set
210
211#
212# QoS and/or fair queueing
213#
191CONFIG_NET_SCHED=y 214CONFIG_NET_SCHED=y
192CONFIG_NET_SCH_CLK_JIFFIES=y 215CONFIG_NET_SCH_CLK_JIFFIES=y
193# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 216# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
194# CONFIG_NET_SCH_CLK_CPU is not set 217# CONFIG_NET_SCH_CLK_CPU is not set
218
219#
220# Queueing/Scheduling
221#
195CONFIG_NET_SCH_CBQ=m 222CONFIG_NET_SCH_CBQ=m
196# CONFIG_NET_SCH_HTB is not set 223# CONFIG_NET_SCH_HTB is not set
197# CONFIG_NET_SCH_HFSC is not set 224# CONFIG_NET_SCH_HFSC is not set
@@ -204,8 +231,10 @@ CONFIG_NET_SCH_GRED=m
204CONFIG_NET_SCH_DSMARK=m 231CONFIG_NET_SCH_DSMARK=m
205# CONFIG_NET_SCH_NETEM is not set 232# CONFIG_NET_SCH_NETEM is not set
206# CONFIG_NET_SCH_INGRESS is not set 233# CONFIG_NET_SCH_INGRESS is not set
207CONFIG_NET_QOS=y 234
208CONFIG_NET_ESTIMATOR=y 235#
236# Classification
237#
209CONFIG_NET_CLS=y 238CONFIG_NET_CLS=y
210# CONFIG_NET_CLS_BASIC is not set 239# CONFIG_NET_CLS_BASIC is not set
211CONFIG_NET_CLS_TCINDEX=m 240CONFIG_NET_CLS_TCINDEX=m
@@ -214,18 +243,18 @@ CONFIG_NET_CLS_ROUTE=y
214CONFIG_NET_CLS_FW=m 243CONFIG_NET_CLS_FW=m
215CONFIG_NET_CLS_U32=m 244CONFIG_NET_CLS_U32=m
216# CONFIG_CLS_U32_PERF is not set 245# CONFIG_CLS_U32_PERF is not set
217# CONFIG_NET_CLS_IND is not set
218CONFIG_NET_CLS_RSVP=m 246CONFIG_NET_CLS_RSVP=m
219CONFIG_NET_CLS_RSVP6=m 247CONFIG_NET_CLS_RSVP6=m
220# CONFIG_NET_EMATCH is not set 248# CONFIG_NET_EMATCH is not set
221# CONFIG_NET_CLS_ACT is not set 249# CONFIG_NET_CLS_ACT is not set
222CONFIG_NET_CLS_POLICE=y 250CONFIG_NET_CLS_POLICE=y
251# CONFIG_NET_CLS_IND is not set
252CONFIG_NET_ESTIMATOR=y
223 253
224# 254#
225# Network testing 255# Network testing
226# 256#
227# CONFIG_NET_PKTGEN is not set 257# CONFIG_NET_PKTGEN is not set
228# CONFIG_NETFILTER_NETLINK is not set
229# CONFIG_HAMRADIO is not set 258# CONFIG_HAMRADIO is not set
230# CONFIG_IRDA is not set 259# CONFIG_IRDA is not set
231# CONFIG_BT is not set 260# CONFIG_BT is not set
@@ -276,6 +305,7 @@ CONFIG_SCSI_FC_ATTRS=y
276# 305#
277# SCSI low-level drivers 306# SCSI low-level drivers
278# 307#
308# CONFIG_ISCSI_TCP is not set
279# CONFIG_SCSI_SATA is not set 309# CONFIG_SCSI_SATA is not set
280# CONFIG_SCSI_DEBUG is not set 310# CONFIG_SCSI_DEBUG is not set
281CONFIG_ZFCP=y 311CONFIG_ZFCP=y
@@ -292,7 +322,6 @@ CONFIG_BLK_DEV_RAM=y
292CONFIG_BLK_DEV_RAM_COUNT=16 322CONFIG_BLK_DEV_RAM_COUNT=16
293CONFIG_BLK_DEV_RAM_SIZE=4096 323CONFIG_BLK_DEV_RAM_SIZE=4096
294CONFIG_BLK_DEV_INITRD=y 324CONFIG_BLK_DEV_INITRD=y
295# CONFIG_LBD is not set
296# CONFIG_CDROM_PKTCDVD is not set 325# CONFIG_CDROM_PKTCDVD is not set
297 326
298# 327#
@@ -305,15 +334,8 @@ CONFIG_DASD_PROFILE=y
305CONFIG_DASD_ECKD=y 334CONFIG_DASD_ECKD=y
306CONFIG_DASD_FBA=y 335CONFIG_DASD_FBA=y
307CONFIG_DASD_DIAG=y 336CONFIG_DASD_DIAG=y
337CONFIG_DASD_EER=m
308# CONFIG_DASD_CMB is not set 338# CONFIG_DASD_CMB is not set
309
310#
311# IO Schedulers
312#
313CONFIG_IOSCHED_NOOP=y
314CONFIG_IOSCHED_AS=y
315CONFIG_IOSCHED_DEADLINE=y
316CONFIG_IOSCHED_CFQ=y
317# CONFIG_ATA_OVER_ETH is not set 339# CONFIG_ATA_OVER_ETH is not set
318 340
319# 341#
@@ -378,7 +400,6 @@ CONFIG_S390_TAPE_34XX=m
378# CONFIG_VMLOGRDR is not set 400# CONFIG_VMLOGRDR is not set
379# CONFIG_VMCP is not set 401# CONFIG_VMCP is not set
380# CONFIG_MONREADER is not set 402# CONFIG_MONREADER is not set
381# CONFIG_DCSS_SHM is not set
382 403
383# 404#
384# Cryptographic devices 405# Cryptographic devices
@@ -593,6 +614,8 @@ CONFIG_DEBUG_PREEMPT=y
593# CONFIG_DEBUG_KOBJECT is not set 614# CONFIG_DEBUG_KOBJECT is not set
594# CONFIG_DEBUG_INFO is not set 615# CONFIG_DEBUG_INFO is not set
595CONFIG_DEBUG_FS=y 616CONFIG_DEBUG_FS=y
617# CONFIG_DEBUG_VM is not set
618# CONFIG_RCU_TORTURE_TEST is not set
596 619
597# 620#
598# Security options 621# Security options