From f16850b763f1919a13d5f6e04c9322aa1d32da37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Thu, 24 Nov 2005 15:37:55 +0000 Subject: [PATCH] Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures: statically linked has better performance then modules due to TLB issue. svn path=/dists/trunk/linux-2.6/; revision=4885 --- debian/arch/alpha/config | 3 --- debian/arch/amd64/config | 3 --- debian/arch/arm/config | 2 -- debian/arch/arm/config.footbridge | 2 -- debian/arch/arm/config.ixp4xx | 2 -- debian/arch/arm/config.rpc | 2 -- debian/arch/arm/config.s3c2410 | 1 - debian/arch/config | 6 +++--- debian/arch/hppa/config | 3 --- debian/arch/i386/config | 3 --- debian/arch/ia64/config | 3 --- debian/arch/m68k/config | 3 --- debian/arch/powerpc/config.apus | 3 --- debian/arch/sparc/config | 3 --- debian/changelog | 2 ++ 15 files changed, 5 insertions(+), 36 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index c8860d87f..bcfc31b86 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -347,9 +347,6 @@ CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index b701d6010..ba5a0cded 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -366,9 +366,6 @@ CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y diff --git a/debian/arch/arm/config b/debian/arch/arm/config index 2c014e270..d040d7221 100644 --- a/debian/arch/arm/config +++ b/debian/arch/arm/config @@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_PACKET=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_SLIP_SMART=y CONFIG_SUNRPC_GSS=m @@ -16,4 +15,3 @@ CONFIG_RXRPC=m CONFIG_ECONET_NATIVE=y CONFIG_EQUALIZER=m CONFIG_NET_CLS_ROUTE=y -CONFIG_PACKET_MMAP=y diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 5ba207e27..f4cf55bcc 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -180,8 +180,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=y -CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 9891f0eef..d65dff33c 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -189,8 +189,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=m -CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_NET_KEY is not set diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 54ff3ed45..211924f28 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -170,8 +170,6 @@ CONFIG_NET=y # # Networking options # -# CONFIG_PACKET is not set -CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index 6d89a2a27..bbb330e0f 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -200,7 +200,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=m diff --git a/debian/arch/config b/debian/arch/config index ca4273c99..9d4b5ee66 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -350,9 +350,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=m @@ -736,4 +733,7 @@ CONFIG_USB_SERIAL_ANYDATA=m CONFIG_VIDEO_DECODER=m CONFIG_VIDEO_AUDIO_DECODER=m CONFIG_CARDMAN_4040=m +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_PACKET_MMAP=y CONFIG_MKISS=m diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index d587bee37..61d6bf7fc 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -233,9 +233,6 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y CONFIG_NET_KEY=m CONFIG_INET=y CONFIG_IP_MULTICAST=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index f0f6adba8..80d554300 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -463,9 +463,6 @@ CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 907ff6463..803a8cc14 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -313,9 +313,6 @@ CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -CONFIG_UNIX=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index a73ad57d6..612fd2872 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -78,9 +78,6 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_NET=y -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -CONFIG_UNIX=y CONFIG_NET_KEY=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set diff --git a/debian/arch/powerpc/config.apus b/debian/arch/powerpc/config.apus index d77ed9a0c..a36f4599d 100644 --- a/debian/arch/powerpc/config.apus +++ b/debian/arch/powerpc/config.apus @@ -381,9 +381,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index b14d645cb..47f716a95 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -92,9 +92,6 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID6=m CONFIG_MD_FAULTY=m CONFIG_DM_MULTIPATH_EMC=m -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y CONFIG_IP_PNP=y # CONFIG_IP_PNP_DHCP is not set # CONFIG_IP_PNP_BOOTP is not set diff --git a/debian/changelog b/debian/changelog index 95967d546..1d24b3023 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ linux-2.6 (2.6.14+2.6.15-rc2-0experimental.1) UNRELEASED; urgency=low [ Frederik Schüler ] * New upstream release candidate. * Readdition of qla2xxx drivers, as firmware license has been fixed. + * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures: + statically linked has better performance then modules due to TLB issue. [ Simon Horman ] * Enable MKISS globally (closes: #340215)