From 7138ff3885ce1841217ae678a5ac956f4eae1825 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 13 Nov 2007 06:34:52 +0000 Subject: [PATCH] * Enable hugetlbfs on i386, amd64, sparc64 and powerpc64. Closes: #450939 svn path=/dists/trunk/linux-2.6/; revision=9720 --- debian/changelog | 3 ++- debian/config/amd64/config | 3 ++- debian/config/i386/config | 3 ++- debian/config/powerpc/config.powerpc64 | 3 ++- debian/config/sparc/config.sparc64 | 3 ++- debian/config/sparc/config.sparc64-smp | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 337ba267d..3bc13674b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,8 +109,9 @@ linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low [ dann frazier ] * [ia64] Re-enable various unintentionally disabled config options + * Enable hugetlbfs on i386, amd64, sparc64 and powerpc64. Closes: #450939 - -- Bastian Blank Fri, 26 Oct 2007 00:15:41 +0200 + -- dann frazier Mon, 12 Nov 2007 22:23:32 -0700 linux-2.6 (2.6.22-6) unstable; urgency=low diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 2565dcaae..3e8fe5df4 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1168,7 +1168,8 @@ CONFIG_EDD=m CONFIG_DELL_RBU=m CONFIG_JBD=m CONFIG_XFS_RT=y -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m diff --git a/debian/config/i386/config b/debian/config/i386/config index 8e332bf28..d140f4f58 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1373,7 +1373,8 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_WBSD=m CONFIG_JBD=m CONFIG_XFS_RT=y -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 index af404677d..664853767 100644 --- a/debian/config/powerpc/config.powerpc64 +++ b/debian/config/powerpc/config.powerpc64 @@ -14,7 +14,8 @@ CONFIG_FORCE_MAX_ZONEORDER=13 # CONFIG_GEN_RTC is not set CONFIG_HANGCHECK_TIMER=m # CONFIG_HOTPLUG_PCI is not set -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y CONFIG_HVC_CONSOLE=y CONFIG_HVCS=m CONFIG_IBMVETH=m diff --git a/debian/config/sparc/config.sparc64 b/debian/config/sparc/config.sparc64 index 8e17584a6..84088a32c 100644 --- a/debian/config/sparc/config.sparc64 +++ b/debian/config/sparc/config.sparc64 @@ -263,7 +263,8 @@ CONFIG_PARPORT_PC=m # CONFIG_BLK_DEV_HPT366 is not set # USB DSL modem support CONFIG_BLK_DEV_PDC202XX_OLD=m -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y # CONFIG_USB_IBMCAM is not set CONFIG_TIGON3=m # CONFIG_RADIO_GEMTEK_PCI is not set diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index edaa29774..e341523d9 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -264,7 +264,8 @@ CONFIG_PARPORT_PC=m # CONFIG_BLK_DEV_HPT366 is not set # USB DSL modem support CONFIG_BLK_DEV_PDC202XX_OLD=m -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y # CONFIG_USB_IBMCAM is not set CONFIG_TIGON3=m # CONFIG_RADIO_GEMTEK_PCI is not set