merge fs/hugetlb into mm/hugetlb.c

Having the common hugetlb code split over two files is rather confusing. Let's keep everything in a single file, ala tmpfs, and also remove the superflous HUGETLBFS that was implied by HUGETLB_PAGE.

William, is the merged copyright statement okay?

@@ -919,13 +919,6 @@
 
 	  See <file:Documentation/filesystems/tmpfs.txt> for details.
 
-config HUGETLBFS
-	bool "HugeTLB file system support"
-	depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || X86_64 || BROKEN
-
-config HUGETLB_PAGE
-	def_bool HUGETLBFS
-
 config RAMFS
 	bool
 	default y

===== fs/Makefile 1.64 vs edited =====

@@ -51,7 +51,6 @@
 obj-$(CONFIG_EXT2_FS)		+= ext2/
 obj-$(CONFIG_CRAMFS)		+= cramfs/
 obj-$(CONFIG_RAMFS)		+= ramfs/
-obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
 obj-$(CONFIG_CODA_FS)		+= coda/
 obj-$(CONFIG_MINIX_FS)		+= minix/
 obj-$(CONFIG_FAT_FS)		+= fat/

===== fs/hugetlbfs/Makefile 1.2 vs edited =====

@@ -1,7 +0,0 @@
-#
-# Makefile for the linux ramfs routines.
-#
-
-obj-$(CONFIG_HUGETLBFS) += hugetlbfs.o
-
-hugetlbfs-objs := inode.o

===== fs/hugetlbfs/inode.c 1.54 vs edited =====

@@ -74,6 +74,10 @@
 	  used to provide more virtual memory than the actual RAM present
 	  in your computer.  If unsure say Y.
 
+config HUGETLB_PAGE
+	bool "HugeTLB file system support"
+	depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || X86_64 || BROKEN
+
 config SYSVIPC
 	bool "System V IPC"
 	depends on MMU

===== mm/Makefile 1.29 vs edited =====

@@ -13,7 +13,7 @@
 			   $(mmu-y)
 
 obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o thrash.o
-obj-$(CONFIG_HUGETLBFS)	+= hugetlb.o
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlb.o
 obj-$(CONFIG_NUMA) 	+= mempolicy.o
 obj-$(CONFIG_SHMEM) += shmem.o
 obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o

===== mm/hugetlb.c 1.12 vs edited =====

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Probably a sane change, but it would seriously screw over Chris Lameter. Later?

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

the demand paging thing? it'll need some more work first anyway.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

It'll need a shitload of work if we move all the files around when he's not looking.

Later, please. Yours is just a three-minute patch, no?
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

The copyright looks fine. I guess this consolidation has no chance of breaking arches, so it can't hurt.

-- wli
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>