hugepagetlb, include linux/module.h

hugepagetlb, include linux/module.h

[Paul Jackson]

The #include of linux/module.h in several arch/*/mm/hugetlbpage.c files
for EXPORT_SYMBOL(hugetlb_total_pages) was late to the party, and now
appears to be late leaving.  The hugetlb consolidation should have taken
these includes out.

This patch removes the #include of module.h from 4 arch/*/mm/hugetlbpage.c
files.  It is based off 2.6.6-rc2-mm2.

I have only managed to rebuild 1 of these 4 w/o this include, but still
this patch seems "obviously right".

    I rebuilt i386 successfully.

    I tried using the http://developer.osdl.org/dev/plm/cross_compile/
    stuff to compile this for sparc64, but ran afoul of missing PCI
    IDS for the Creator cards on sparc, as Andrew reported last week.

    I don't know how to test the ppc64 build.

    I'm running afoul of some elf32_map breakage with the ia64 build,
    which will likely result in a separate patch.  Still working that ...

The patch, for what it's worth:

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1898  -> 1.1899 
#	arch/ppc64/mm/hugetlbpage.c	1.25    -> 1.26   
#	arch/ia64/mm/hugetlbpage.c	1.25    -> 1.26   
#	arch/sparc64/mm/hugetlbpage.c	1.16    -> 1.17   
#	arch/i386/mm/hugetlbpage.c	1.49    -> 1.50   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/04/26	pj@sgi.com	1.1899
# Now that hugetlb consolidation removed EXPORT_SYMBOL, dont need module.h.
# --------------------------------------------
#
diff -Nru a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c
--- a/arch/i386/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
+++ b/arch/i386/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
@@ -12,7 +12,6 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/sysctl.h>
 #include <asm/mman.h>
diff -Nru a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
--- a/arch/ia64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
+++ b/arch/ia64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
@@ -9,7 +9,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
diff -Nru a/arch/ppc64/mm/hugetlbpage.c b/arch/ppc64/mm/hugetlbpage.c
--- a/arch/ppc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
+++ b/arch/ppc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
@@ -14,7 +14,6 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/sysctl.h>
 #include <asm/mman.h>
diff -Nru a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
--- a/arch/sparc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
+++ b/arch/sparc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
@@ -5,7 +5,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
@@ -14,7 +13,6 @@
 #include <linux/smp_lock.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
-#include <linux/module.h>
 
 #include <asm/mman.h>
 #include <asm/pgalloc.h>


-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

Re: hugepagetlb, include linux/module.h

[Paul Jackson]

Once I hack around the bssprot patch damage to the routine
arch/ia64/ia32/binfmt_elf32.c: elf32_map(), then this patch to remove
#include of module.h from arch/ia64/mm/hugetlbpage.c compiles ok against
2.6.6-rc2-mm2.

As expected.

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

Re: hugepagetlb, include linux/module.h

[Paul Jackson]

And with a couple more hacks (kill ffb_drv.c for lack of PCI IDS,
and random clueless hubstatus variable rename in drivers/usb/core/hub.c),
this removal of #include of linux/module.h compiles for sparc64 as well.

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

Re: hugepagetlb, include linux/module.h

[Herbert Poetzl]

On Mon, Apr 26, 2004 at 04:48:22PM -0700, Paul Jackson wrote:
> The #include of linux/module.h in several arch/*/mm/hugetlbpage.c files
> for EXPORT_SYMBOL(hugetlb_total_pages) was late to the party, and now
> appears to be late leaving.  The hugetlb consolidation should have taken
> these includes out.
> 
> This patch removes the #include of module.h from 4 arch/*/mm/hugetlbpage.c
> files.  It is based off 2.6.6-rc2-mm2.
> 
> I have only managed to rebuild 1 of these 4 w/o this include, but still
> this patch seems "obviously right".
> 
>     I rebuilt i386 successfully.
> 
>     I tried using the http://developer.osdl.org/dev/plm/cross_compile/
>     stuff to compile this for sparc64, but ran afoul of missing PCI
>     IDS for the Creator cards on sparc, as Andrew reported last week.

hmm, maybe this might be useful too:

http://vserver.13thfloor.at/Stuff/Cross/
(especially http://vserver.13thfloor.at/Stuff/Cross/howto.info)

HTH,
Herbert

PS: let me know if you need some help with the compile

>     I don't know how to test the ppc64 build.
> 
>     I'm running afoul of some elf32_map breakage with the ia64 build,
>     which will likely result in a separate patch.  Still working that ...
> 
> The patch, for what it's worth:
> 
> # This is a BitKeeper generated patch for the following project:
> # Project Name: Linux kernel tree
> # This patch format is intended for GNU patch command version 2.5 or higher.
> # This patch includes the following deltas:
> #	           ChangeSet	1.1898  -> 1.1899 
> #	arch/ppc64/mm/hugetlbpage.c	1.25    -> 1.26   
> #	arch/ia64/mm/hugetlbpage.c	1.25    -> 1.26   
> #	arch/sparc64/mm/hugetlbpage.c	1.16    -> 1.17   
> #	arch/i386/mm/hugetlbpage.c	1.49    -> 1.50   
> #
> # The following is the BitKeeper ChangeSet Log
> # --------------------------------------------
> # 04/04/26	pj@sgi.com	1.1899
> # Now that hugetlb consolidation removed EXPORT_SYMBOL, dont need module.h.
> # --------------------------------------------
> #
> diff -Nru a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c
> --- a/arch/i386/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> +++ b/arch/i386/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> @@ -12,7 +12,6 @@
>  #include <linux/pagemap.h>
>  #include <linux/smp_lock.h>
>  #include <linux/slab.h>
> -#include <linux/module.h>
>  #include <linux/err.h>
>  #include <linux/sysctl.h>
>  #include <asm/mman.h>
> diff -Nru a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
> --- a/arch/ia64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> +++ b/arch/ia64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> @@ -9,7 +9,6 @@
>   */
>  
>  #include <linux/config.h>
> -#include <linux/module.h>
>  #include <linux/init.h>
>  #include <linux/fs.h>
>  #include <linux/mm.h>
> diff -Nru a/arch/ppc64/mm/hugetlbpage.c b/arch/ppc64/mm/hugetlbpage.c
> --- a/arch/ppc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> +++ b/arch/ppc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> @@ -14,7 +14,6 @@
>  #include <linux/pagemap.h>
>  #include <linux/smp_lock.h>
>  #include <linux/slab.h>
> -#include <linux/module.h>
>  #include <linux/err.h>
>  #include <linux/sysctl.h>
>  #include <asm/mman.h>
> diff -Nru a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
> --- a/arch/sparc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> +++ b/arch/sparc64/mm/hugetlbpage.c	Mon Apr 26 16:41:14 2004
> @@ -5,7 +5,6 @@
>   */
>  
>  #include <linux/config.h>
> -#include <linux/module.h>
>  #include <linux/init.h>
>  #include <linux/fs.h>
>  #include <linux/mm.h>
> @@ -14,7 +13,6 @@
>  #include <linux/smp_lock.h>
>  #include <linux/slab.h>
>  #include <linux/sysctl.h>
> -#include <linux/module.h>
>  
>  #include <asm/mman.h>
>  #include <asm/pgalloc.h>
> 
> 
> -- 
>                           I won't rest till it's the best ...
>                           Programmer, Linux Scalability
>                           Paul Jackson <pj@sgi.com> 1.650.933.1373
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: hugepagetlb, include linux/module.h

[Paul Jackson]

Thanks, Herbert.  I no longer need to worry about compiling
this particular change - it has propogated far enough that
it's not an issue anymore.

But I will likely consider what you pointed me at for other
work I have in progress ...

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373