From: Marc Fiuczynski Date: Fri, 29 Dec 2006 01:57:38 +0000 (+0000) Subject: Merge to Fedora kernel-2.6.18-1.2260_FC5 patched with stable patch-2.6.18.5-vs2.0... X-Git-Tag: fedora-2_6_18-1_2260_FC5-vs2_0_3-rc1~1 X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=a030541d6dd71712d1989c26d9e63a698c64d5d8 Merge to Fedora kernel-2.6.18-1.2260_FC5 patched with stable patch-2.6.18.5-vs2.0.3-rc1.diff --- diff --git a/.config b/.config index 5472124cf..4ac339200 100644 --- a/.config +++ b/.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:33 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:27 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1749,7 +1749,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2884,6 +2884,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/.config.old b/.config.old index 8db28ce90..1074baa86 100644 --- a/.config.old +++ b/.config.old @@ -1436,8 +1436,8 @@ CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_ROCKETPORT is not set -CONFIG_SYNCLINK=m +CONFIG_ROCKETPORT=m +CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c index cc8eb3b32..0c3a3f9b5 100644 --- a/arch/i386/kernel/sysenter.c +++ b/arch/i386/kernel/sysenter.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/configs/kernel-2.6.18-i586-smp.config b/configs/kernel-2.6.18-i586-smp.config index 7031af6cb..9b8e0f044 100644 --- a/configs/kernel-2.6.18-i586-smp.config +++ b/configs/kernel-2.6.18-i586-smp.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:26 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:21 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -1904,7 +1904,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -3097,6 +3097,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i586.config b/configs/kernel-2.6.18-i586.config index 2960893d4..96022d6a5 100644 --- a/configs/kernel-2.6.18-i586.config +++ b/configs/kernel-2.6.18-i586.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:26 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:21 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -1897,7 +1897,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -3094,6 +3094,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i686-kdump.config b/configs/kernel-2.6.18-i686-kdump.config index f5b9e6247..f524425f6 100644 --- a/configs/kernel-2.6.18-i686-kdump.config +++ b/configs/kernel-2.6.18-i686-kdump.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:27 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:22 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -1921,7 +1921,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -3134,6 +3134,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i686-smp.config b/configs/kernel-2.6.18-i686-smp.config index b2c40783d..002f39691 100644 --- a/configs/kernel-2.6.18-i686-smp.config +++ b/configs/kernel-2.6.18-i686-smp.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:27 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:22 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -1922,7 +1922,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -3131,6 +3131,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i686-xen.config b/configs/kernel-2.6.18-i686-xen.config index a6165c52a..3d888fc8f 100644 --- a/configs/kernel-2.6.18-i686-xen.config +++ b/configs/kernel-2.6.18-i686-xen.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:27 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:22 2006 # CONFIG_X86_32=y CONFIG_LOCKDEP_SUPPORT=y @@ -1794,7 +1794,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2934,6 +2934,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i686-xen0.config b/configs/kernel-2.6.18-i686-xen0.config index 16438720b..c37defd9c 100644 --- a/configs/kernel-2.6.18-i686-xen0.config +++ b/configs/kernel-2.6.18-i686-xen0.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:28 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:23 2006 # CONFIG_X86_32=y CONFIG_LOCKDEP_SUPPORT=y @@ -1792,7 +1792,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2932,6 +2932,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i686-xenU.config b/configs/kernel-2.6.18-i686-xenU.config index 7bef09257..ce59cd9d8 100644 --- a/configs/kernel-2.6.18-i686-xenU.config +++ b/configs/kernel-2.6.18-i686-xenU.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:28 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:23 2006 # CONFIG_X86_32=y CONFIG_LOCKDEP_SUPPORT=y @@ -974,7 +974,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -1338,6 +1338,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-i686.config b/configs/kernel-2.6.18-i686.config index 29fb9f674..a9f030d09 100644 --- a/configs/kernel-2.6.18-i686.config +++ b/configs/kernel-2.6.18-i686.config @@ -1,8 +1,8 @@ # i386 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:28 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:23 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -1921,7 +1921,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -3133,6 +3133,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ia64-xen.config b/configs/kernel-2.6.18-ia64-xen.config index abec6965f..339709b62 100644 --- a/configs/kernel-2.6.18-ia64-xen.config +++ b/configs/kernel-2.6.18-ia64-xen.config @@ -1,8 +1,8 @@ # ia64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:29 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:24 2006 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -1545,7 +1545,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2584,6 +2584,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ia64.config b/configs/kernel-2.6.18-ia64.config index 3282a40ad..d811a1beb 100644 --- a/configs/kernel-2.6.18-ia64.config +++ b/configs/kernel-2.6.18-ia64.config @@ -1,8 +1,8 @@ # ia64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:29 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:24 2006 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -1565,7 +1565,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2632,6 +2632,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ppc-smp.config b/configs/kernel-2.6.18-ppc-smp.config index 7e33c5497..7ecb586db 100644 --- a/configs/kernel-2.6.18-ppc-smp.config +++ b/configs/kernel-2.6.18-ppc-smp.config @@ -1,8 +1,8 @@ # powerpc # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:29 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:24 2006 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -1787,7 +1787,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2944,6 +2944,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ppc.config b/configs/kernel-2.6.18-ppc.config index 2699ead48..3b93fbad0 100644 --- a/configs/kernel-2.6.18-ppc.config +++ b/configs/kernel-2.6.18-ppc.config @@ -1,8 +1,8 @@ # powerpc # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:30 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:25 2006 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -1789,7 +1789,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2948,6 +2948,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ppc64-kdump.config b/configs/kernel-2.6.18-ppc64-kdump.config index 8d851c40e..fe9012c14 100644 --- a/configs/kernel-2.6.18-ppc64-kdump.config +++ b/configs/kernel-2.6.18-ppc64-kdump.config @@ -1,8 +1,8 @@ # powerpc # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:30 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:25 2006 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -1693,7 +1693,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2776,6 +2776,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ppc64.config b/configs/kernel-2.6.18-ppc64.config index 411ab6236..35c0c63d5 100644 --- a/configs/kernel-2.6.18-ppc64.config +++ b/configs/kernel-2.6.18-ppc64.config @@ -1,8 +1,8 @@ # powerpc # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:30 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:25 2006 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -1693,7 +1693,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2775,6 +2775,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-ppc64iseries.config b/configs/kernel-2.6.18-ppc64iseries.config index ab48ca669..2fdbeb8cb 100644 --- a/configs/kernel-2.6.18-ppc64iseries.config +++ b/configs/kernel-2.6.18-ppc64iseries.config @@ -1,8 +1,8 @@ # powerpc # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:30 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:25 2006 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -1023,7 +1023,7 @@ CONFIG_GAMEPORT_FM801=m # CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -1335,6 +1335,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-s390.config b/configs/kernel-2.6.18-s390.config index 0887d7f4f..d73b915cd 100644 --- a/configs/kernel-2.6.18-s390.config +++ b/configs/kernel-2.6.18-s390.config @@ -1,8 +1,8 @@ # s390 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:31 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:26 2006 # CONFIG_MMU=y CONFIG_LOCKDEP_SUPPORT=y @@ -889,6 +889,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-s390x.config b/configs/kernel-2.6.18-s390x.config index 6928ca9cb..56508ef57 100644 --- a/configs/kernel-2.6.18-s390x.config +++ b/configs/kernel-2.6.18-s390x.config @@ -1,8 +1,8 @@ # s390 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:31 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:26 2006 # CONFIG_MMU=y CONFIG_LOCKDEP_SUPPORT=y @@ -887,6 +887,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-x86_64-kdump.config b/configs/kernel-2.6.18-x86_64-kdump.config index ae155864a..da14891ec 100644 --- a/configs/kernel-2.6.18-x86_64-kdump.config +++ b/configs/kernel-2.6.18-x86_64-kdump.config @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:31 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:27 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1735,7 +1735,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2871,6 +2871,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-x86_64-xen.config b/configs/kernel-2.6.18-x86_64-xen.config index 8bb58f7c5..6fad8ff64 100644 --- a/configs/kernel-2.6.18-x86_64-xen.config +++ b/configs/kernel-2.6.18-x86_64-xen.config @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:32 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:27 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1717,7 +1717,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2842,6 +2842,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-x86_64-xen0.config b/configs/kernel-2.6.18-x86_64-xen0.config index 32be42fd7..51a5b78dd 100644 --- a/configs/kernel-2.6.18-x86_64-xen0.config +++ b/configs/kernel-2.6.18-x86_64-xen0.config @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:32 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:27 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1717,7 +1717,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2842,6 +2842,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-x86_64-xenU.config b/configs/kernel-2.6.18-x86_64-xenU.config index 2c47cdbf3..2fcae4e29 100644 --- a/configs/kernel-2.6.18-x86_64-xenU.config +++ b/configs/kernel-2.6.18-x86_64-xenU.config @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:33 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:27 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -936,7 +936,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -1304,6 +1304,10 @@ CONFIG_BEFS_FS=m CONFIG_BFS_FS=m CONFIG_EFS_FS=m CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/configs/kernel-2.6.18-x86_64.config b/configs/kernel-2.6.18-x86_64.config index 8ff437668..6c935d9f0 100644 --- a/configs/kernel-2.6.18-x86_64.config +++ b/configs/kernel-2.6.18-x86_64.config @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18.6-rc2 -# Tue Dec 26 19:31:33 2006 +# Linux kernel version: 2.6.18.6 +# Thu Dec 28 22:01:27 2006 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1750,7 +1750,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set +CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DIGIEPCA is not set @@ -2885,6 +2885,10 @@ CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff --git a/fs/Kconfig b/fs/Kconfig index 75b7c0785..e9f181d7e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1285,6 +1285,71 @@ config CRAMFS If unsure, say N. +config SQUASHFS + tristate "SquashFS 3.0 - Squashed file system support" + select ZLIB_INFLATE + help + Saying Y here includes support for SquashFS 3.0 (a Compressed Read-Only File + System). Squashfs is a highly compressed read-only filesystem for Linux. + It uses zlib compression to compress both files, inodes and directories. + Inodes in the system are very small and all blocks are packed to minimise + data overhead. Block sizes greater than 4K are supported up to a maximum of 64K. + SquashFS 3.0 supports 64 bit filesystems and files (larger than 4GB), full + uid/gid information, hard links and timestamps. + + Squashfs is intended for general read-only filesystem use, for archival + use (i.e. in cases where a .tar.gz file may be used), and in embedded + systems where low overhead is needed. Further information and filesystem tools + are available from http://squashfs.sourceforge.net. + + If you want to compile this as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read . The module + will be called squashfs. Note that the root file system (the one + containing the directory /) cannot be compiled as a module. + + If unsure, say N. + +config SQUASHFS_EMBEDDED + + bool "Additional options for memory-constrained systems" + depends on SQUASHFS + default n + help + Saying Y here allows you to specify cache sizes and how Squashfs + allocates memory. This is only intended for memory constrained + systems. + + If unsure, say N. + +config SQUASHFS_FRAGMENT_CACHE_SIZE + int "Number of fragments cached" if SQUASHFS_EMBEDDED + depends on SQUASHFS + default "3" + help + By default SquashFS caches the last 3 fragments read from + the filesystem. Increasing this amount may mean SquashFS + has to re-read fragments less often from disk, at the expense + of extra system memory. Decreasing this amount will mean + SquashFS uses less memory at the expense of extra reads from disk. + + Note there must be at least one cached fragment. Anything + much more than three will probably not make much difference. + +config SQUASHFS_VMALLOC + bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED + depends on SQUASHFS + default n + help + By default SquashFS uses kmalloc to obtain fragment cache memory. + Kmalloc memory is the standard kernel allocator, but it can fail + on memory constrained systems. Because of the way Vmalloc works, + Vmalloc can succeed when kmalloc fails. Specifying this option + will make SquashFS always use Vmalloc to allocate the + fragment cache memory. + + If unsure, say N. + config VXFS_FS tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" help diff --git a/fs/Makefile b/fs/Makefile index e5efb4b69..970aed37e 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -58,6 +58,7 @@ obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3 obj-$(CONFIG_JBD) += jbd/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ +obj-$(CONFIG_SQUASHFS) += squashfs/ obj-$(CONFIG_RAMFS) += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/