[kernel] r7605 - in dists/trunk/linux-2.6/debian: . arch/ia64

[Dann Frazier]

Author: dannf
Date: Fri Oct 13 22:32:50 2006
New Revision: 7605

Modified:
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/changelog

Log:
* [ia64] Enable CONFIG_HUGETLBFS

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Fri Oct 13 22:32:50 2006
@@ -33,7 +33,7 @@
 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_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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 13 22:32:50 2006
@@ -31,15 +31,16 @@
   [ 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 <kyle at debian.org>  Thu, 12 Oct 2006 15:30:52 -0400
+ -- dann frazier <dannf at debian.org>  Fri, 13 Oct 2006 16:08:43 -0600
 
 linux-2.6 (2.6.18-2) unstable; urgency=low