Re: [PATCH] Clean up asm/pgalloc.h include (s390)

Re: [PATCH] Clean up asm/pgalloc.h include (s390)

[Russell King]

This patch cleans up needless includes of asm/pgalloc.h from the
arch/s390/ subtree.  This has not been compile tested, so
needs the architecture maintainers (or willing volunteers) to
test.

Please ensure that at least the first two patches have already
been applied to your tree; they can be found at:

	http://lkml.org/lkml/2004/4/18/86
	http://lkml.org/lkml/2004/4/18/87

This patch is part of a larger patch aiming towards getting the
include of asm/pgtable.h out of linux/mm.h, so that asm/pgtable.h
can sanely get at things like mm_struct and friends.

In the event that any of these files fails to build, chances are
you need to include some other header file rather than pgalloc.h.
Normally this is either asm/pgtable.h (unlikely), asm/cacheflush.h
or asm/tlbflush.h.

===== arch/s390/kernel/compat_exec.c 1.4 vs edited =====
--- 1.4/arch/s390/kernel/compat_exec.c	Mon Apr 12 18:54:53 2004
+++ edited/arch/s390/kernel/compat_exec.c	Mon Apr 19 13:41:44 2004
@@ -26,7 +26,6 @@
 #include <linux/security.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 
 #ifdef CONFIG_KMOD
===== arch/s390/kernel/ptrace.c 1.22 vs edited =====
--- 1.22/arch/s390/kernel/ptrace.c	Thu Apr 15 02:37:53 2004
+++ edited/arch/s390/kernel/ptrace.c	Mon Apr 19 13:41:44 2004
@@ -35,7 +35,6 @@
 #include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
===== arch/s390/kernel/s390_ksyms.c 1.22 vs edited =====
--- 1.22/arch/s390/kernel/s390_ksyms.c	Sat Mar 27 11:40:46 2004
+++ edited/arch/s390/kernel/s390_ksyms.c	Mon Apr 19 13:41:44 2004
@@ -14,7 +14,6 @@
 #include <asm/checksum.h>
 #include <asm/cpcmd.h>
 #include <asm/delay.h>
-#include <asm/pgalloc.h>
 #include <asm/setup.h>
 #ifdef CONFIG_IP_MULTICAST
 #include <net/arp.h>
===== arch/s390/kernel/smp.c 1.33 vs edited =====
--- 1.33/arch/s390/kernel/smp.c	Tue Mar  2 03:01:23 2004
+++ edited/arch/s390/kernel/smp.c	Mon Apr 19 13:41:44 2004
@@ -33,7 +33,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/sigp.h>
-#include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/s390_ext.h>
 #include <asm/cpcmd.h>
===== arch/s390/mm/cmm.c 1.2 vs edited =====
--- 1.2/arch/s390/mm/cmm.c	Tue Mar  2 03:01:23 2004
+++ edited/arch/s390/mm/cmm.c	Mon Apr 19 13:41:44 2004
@@ -17,7 +17,6 @@
 #include <linux/sysctl.h>
 #include <linux/ctype.h>
 
-#include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 
 #include "../../../drivers/s390/net/smsgiucv.h"
===== arch/s390/mm/ioremap.c 1.8 vs edited =====
--- 1.8/arch/s390/mm/ioremap.c	Thu Oct  2 08:11:59 2003
+++ edited/arch/s390/mm/ioremap.c	Mon Apr 19 13:41:44 2004
@@ -16,7 +16,6 @@
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 

Re: [PATCH] Clean up asm/pgalloc.h include (s390)

[Martin Schwidefsky]

> This patch cleans up needless includes of asm/pgalloc.h from the
> arch/s390/ subtree.  This has not been compile tested, so
> needs the architecture maintainers (or willing volunteers) to
> test.

Doesn't compile. s390_ksyms needs pgalloc.h for the definition of diag10.
The other includes of pgalloc.h can be removed without a problem.

blue skies,
   Martin

Linux/390 Design & Development, IBM Deutschland Entwicklung GmbH
Schönaicherstr. 220, D-71032 Böblingen, Telefon: 49 - (0)7031 - 16-2247
E-Mail: schwidefsky@de.ibm.com

Re: [PATCH] Clean up asm/pgalloc.h include (s390)

[Russell King]

On Mon, Apr 19, 2004 at 05:56:19PM +0200, Martin Schwidefsky wrote:
> > This patch cleans up needless includes of asm/pgalloc.h from the
> > arch/s390/ subtree.  This has not been compile tested, so
> > needs the architecture maintainers (or willing volunteers) to
> > test.
> 
> Doesn't compile. s390_ksyms needs pgalloc.h for the definition of diag10.
> The other includes of pgalloc.h can be removed without a problem.

Alternatively, could the diag10() prototype be moved somewhere else
(tlbflush or cacheflush?)  Is diag10 a tlb or cache function?  It
isn't clear from the code what diag10() does.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core

Re: [PATCH] Clean up asm/pgalloc.h include (s390)

[Arnd Bergmann]

On Monday 19 April 2004 18:11, Russell King wrote:
> Alternatively, could the diag10() prototype be moved somewhere else
> (tlbflush or cacheflush?)  Is diag10 a tlb or cache function?  It
> isn't clear from the code what diag10() does.

Think of it as some sort of madvise(,,MADV_DONTNEED) or free() in
hardware. I guess the next best place to put it is <asm/system.h>.

	Arnd <><