From 4843eb07dac691c3c1dab28b57b6f9752d6ebaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Tue, 15 Nov 2005 13:23:41 +0000 Subject: [PATCH] - QLA2XXX options activated globally. - CONFIG_SCTP_HMAC_MD5=y set globally - or better default to CONFIG_SCTP_HMAC_SHA1=y? - Memory model options removed from global config: every arch must set their memory model by arch/flavour now (FLATMEM, or DISCONTIGMEM on NUMA). - new option: DEFAULT_IOSCHED="anticipatory" - everyone OK with this or better use the deadline scheduler? - CONFIG_SPLIT_PTLOCK_CPUS must be set per-arch svn path=/dists/trunk/linux-2.6/; revision=4829 --- debian/arch/alpha/config | 2 -- debian/arch/amd64/config | 3 +- debian/arch/amd64/config.amd64-generic | 3 ++ debian/arch/amd64/config.amd64-k8 | 3 ++ debian/arch/amd64/config.amd64-k8-smp | 10 +++--- debian/arch/amd64/config.em64t-p4 | 3 ++ debian/arch/amd64/config.em64t-p4-smp | 3 ++ debian/arch/arm/config.footbridge | 1 - debian/arch/arm/config.ixp4xx | 1 - debian/arch/config | 42 +++++++++++++++++++++----- debian/arch/i386/config | 2 -- debian/arch/ia64/config | 2 -- debian/arch/m68k/config | 2 -- debian/arch/powerpc/config.apus | 5 --- 14 files changed, 52 insertions(+), 30 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 2cd72af5f..c8860d87f 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -454,8 +454,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y CONFIG_ATM=y CONFIG_ATM_CLIP=y # CONFIG_ATM_CLIP_NO_ICMP is not set diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 19a201ec6..d3ea54781 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -476,8 +476,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y CONFIG_ATM=y CONFIG_ATM_CLIP=y # CONFIG_ATM_CLIP_NO_ICMP is not set @@ -1654,3 +1652,4 @@ CONFIG_SBC8360_WDT=m CONFIG_W83977F_WDT=m CONFIG_I6300ESB_WDT=m CONFIG_USB_SUSPEND=y +CONFIG_SPLIT_PTLOCK_CPUS=4 diff --git a/debian/arch/amd64/config.amd64-generic b/debian/arch/amd64/config.amd64-generic index c8d24117b..3a6586afb 100644 --- a/debian/arch/amd64/config.amd64-generic +++ b/debian/arch/amd64/config.amd64-generic @@ -48,3 +48,6 @@ CONFIG_EXT2_FS=y CONFIG_FS_MBCACHE=y # CONFIG_CHECKING is not set CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +# CONFIG_DISCONTIGMEM_MANUAL is not set diff --git a/debian/arch/amd64/config.amd64-k8 b/debian/arch/amd64/config.amd64-k8 index ec51d3aa9..b72f55ede 100644 --- a/debian/arch/amd64/config.amd64-k8 +++ b/debian/arch/amd64/config.amd64-k8 @@ -48,3 +48,6 @@ CONFIG_EXT2_FS=m CONFIG_FS_MBCACHE=m # CONFIG_CHECKING is not set CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +# CONFIG_DISCONTIGMEM_MANUAL is not set diff --git a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp index a6370ce26..3cf57f696 100644 --- a/debian/arch/amd64/config.amd64-k8-smp +++ b/debian/arch/amd64/config.amd64-k8-smp @@ -10,7 +10,6 @@ CONFIG_SMP=y # CONFIG_SCHED_SMT is not set CONFIG_K8_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_DISCONTIGMEM=y CONFIG_NUMA=y CONFIG_HAVE_DEC_LOCK=y CONFIG_NR_CPUS=32 @@ -23,15 +22,14 @@ CONFIG_FB_MATROX_MAVEN=m CONFIG_EXT2_FS=m CONFIG_FS_MBCACHE=m CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_ARCH_DISCONTIGMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y # CONFIG_HOTPLUG_CPU is not set -CONFIG_SPARSEMEM=y -CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_DIGIEPCA=m CONFIG_MKISS=m +CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y # CONFIG_FLATMEM_MANUAL is not set -CONFIG_SPARSEMEM_EXTREME=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y # CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_DISCONTIGMEM=y CONFIG_DISCONTIGMEM_MANUAL=y diff --git a/debian/arch/amd64/config.em64t-p4 b/debian/arch/amd64/config.em64t-p4 index d4fff154c..4bc07e054 100644 --- a/debian/arch/amd64/config.em64t-p4 +++ b/debian/arch/amd64/config.em64t-p4 @@ -48,3 +48,6 @@ CONFIG_EXT2_FS=m CONFIG_FS_MBCACHE=m # CONFIG_CHECKING is not set CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +# CONFIG_DISCONTIGMEM_MANUAL is not set diff --git a/debian/arch/amd64/config.em64t-p4-smp b/debian/arch/amd64/config.em64t-p4-smp index 8997d94bc..cc7ae2b17 100644 --- a/debian/arch/amd64/config.em64t-p4-smp +++ b/debian/arch/amd64/config.em64t-p4-smp @@ -24,3 +24,6 @@ CONFIG_ARCH_FLATMEM_ENABLE=y # CONFIG_HOTPLUG_CPU is not set CONFIG_DIGIEPCA=m CONFIG_MKISS=m +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +# CONFIG_DISCONTIGMEM_MANUAL is not set diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index af2919858..5ba207e27 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -539,7 +539,6 @@ CONFIG_SCSI_SATA_VITESSE=m # CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA2XXX is not set # CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 9021af6b2..9891f0eef 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1449,4 +1449,3 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m -CONFIG_SCSI_QLA2XXX=m diff --git a/debian/arch/config b/debian/arch/config index 2c37d5464..730fd609c 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -164,7 +164,6 @@ CONFIG_USB_XUSBATM=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_PCMCIA_LOAD_CIS=y CONFIG_DVB_USB=m -CONFIG_ASK_IP_FIB_HASH=y CONFIG_USB_LD=m CONFIG_SERIAL_8250_FOURPORT=m CONFIG_DVB_USB_VP7045=m @@ -573,8 +572,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set # CONFIG_BLK_DEV_IDESCSI is not set CONFIG_W1_DS2433_CRC=y @@ -614,7 +611,6 @@ CONFIG_SCSI_SAS_ATTRS=m # CONFIG_WANT_EARLY_SERIAL is not set # CONFIG_IEEE80211_DEBUG is not set CONFIG_DAVICOM_PHY=m -CONFIG_FLATMEM_MANUAL=y CONFIG_IP_NF_CONNTRACK_EVENTS=y CONFIG_IP_NF_NAT_PPTP=m CONFIG_USB_SISUSBVGA_CON=y @@ -630,7 +626,6 @@ CONFIG_CASSINI=m CONFIG_SELECT_MEMORY_MODEL=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_USB_STORAGE_ONETOUCH=y -# CONFIG_SPARSEMEM_MANUAL is not set CONFIG_DRM_SAVAGE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_PHYLIB=m @@ -646,7 +641,6 @@ CONFIG_FLATMEM=y CONFIG_INFINIBAND_USER_MAD=m CONFIG_IP_NF_CONNTRACK_NETLINK=m CONFIG_IP6_NF_TARGET_REJECT=m -# CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_HOSTAP_PLX=m CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_USB_NET_PLUSB=m @@ -696,10 +690,44 @@ CONFIG_FUSION=y # CONFIG_NET_POCKET is not set CONFIG_FW_LOADER=m CONFIG_MII=m -# CONFIG_SCSI_QLA2XXX is not set CONFIG_BLK_DEV_IDEPNP=m CONFIG_AIRO=m CONFIG_SCSI_SATA_INTEL_COMBINED=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_SECURITY_NETWORK=y CONFIG_XFS_QUOTA=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +CONFIG_SCSI_QLA6312=m +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_SCSI_QLA2322=m +CONFIG_RTC_X1205_I2C=m +CONFIG_SCSI_QLA21XX=m +CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_USB_SERIAL_NOKIA_DKU2=m +CONFIG_DEFAULT_AS=y +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_SCSI_SATA_SIL24=m +CONFIG_SCSI_QLA2300=m +CONFIG_MTD_ONENAND=m +CONFIG_VIDEO_BT848_DVB=m +CONFIG_PPP_MPPE=m +# CONFIG_DEFAULT_CFQ is not set +CONFIG_SCSI_PDC_ADMA=m +CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y +# CONFIG_OBSOLETE_OSS_DRIVER is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_VIDEO_EM28XX=m +CONFIG_RFD_FTL=m +# CONFIG_DEBUG_VM is not set +CONFIG_SCSI_QLA22XX=m +CONFIG_DVB_NXT200X=m +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_QLA24XX=m +CONFIG_SCSI_QLA2XXX=m +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_TELCLOCK=m diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 2277f5b11..f0f6adba8 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -573,8 +573,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y CONFIG_ATM=y CONFIG_ATM_CLIP=y # CONFIG_ATM_CLIP_NO_ICMP is not set diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index e792395ae..24c32ef7e 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -420,8 +420,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set CONFIG_SCTP_HMAC_NONE=y -# CONFIG_SCTP_HMAC_SHA1 is not set -# CONFIG_SCTP_HMAC_MD5 is not set # CONFIG_ATM is not set CONFIG_BRIDGE=m CONFIG_DECNET=m diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 2e5d3e18c..a73ad57d6 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -190,8 +190,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set diff --git a/debian/arch/powerpc/config.apus b/debian/arch/powerpc/config.apus index 5222d6ee4..d77ed9a0c 100644 --- a/debian/arch/powerpc/config.apus +++ b/debian/arch/powerpc/config.apus @@ -320,11 +320,6 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_IPR is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA21XX is not set -# CONFIG_SCSI_QLA22XX is not set -# CONFIG_SCSI_QLA2300 is not set -# CONFIG_SCSI_QLA2322 is not set -# CONFIG_SCSI_QLA6312 is not set # CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set