From a6b5aae538b8e1abfe85965329fb1361f89fa157 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Fri, 13 Oct 2006 22:32:50 +0000 Subject: [PATCH] * [ia64] Enable CONFIG_HUGETLBFS svn path=/dists/trunk/linux-2.6/; revision=7605 --- debian/arch/ia64/config | 5 +++-- debian/changelog | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index be3bf1b14..66a538f74 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -33,7 +33,7 @@ CONFIG_SELECT_MEMORY_MODEL=y CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_IA64_SGI_SN_XP=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=17 CONFIG_IA32_SUPPORT=y CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=m @@ -1134,7 +1134,8 @@ CONFIG_JBD=m CONFIG_FS_MBCACHE=m CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=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/changelog b/debian/changelog index 70900b00c..399c880c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,15 +31,16 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low [ dann frazier ] * bugfix/sky2-receive-FIFO-fix.patch: fix sky2 hangs on some chips Thanks to Stephen Hemminger for the patch. (Closes: #391382) + * [ia64] Enable CONFIG_HUGETLBFS [ Sven Luther ] * [powerpc] Added AMD74xx driver module to the powerpc64 flavour (Closes: #391861). [ Kyle McMartin ] - * [hppa] Force CROSS_COMPILE=hppa64-linux-gnu- (closes: #389296) + * [hppa] Force CROSS_COMPILE=hppa64-linux-gnu- (closes: #389296) - -- Kyle McMartin Thu, 12 Oct 2006 15:30:52 -0400 + -- dann frazier Fri, 13 Oct 2006 16:08:43 -0600 linux-2.6 (2.6.18-2) unstable; urgency=low