[PATCH 05/15] ia64: remove use of asm/segment.h

[PATCH 05/15] ia64: remove use of asm/segment.h

[Kumar Gala]

Removed IA64 architecture specific users of asm/segment.h and
asm-ia64/segment.h itself

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>

---
commit 53cbc8f4b0d47965e2d673bcc9dc5e6a8388350b
tree d05c25c406d023dce7c797ede8119b8ab68767e5
parent 352a43ca6e4cb29ca7ee1742a00f3b6d98465a0d
author Kumar K. Gala <kumar.gala@freescale.com> Wed, 24 Aug 2005 10:54:23 -0500
committer Kumar K. Gala <kumar.gala@freescale.com> Wed, 24 Aug 2005 10:54:23 -0500

 arch/ia64/ia32/ia32_signal.c        |    1 -
 arch/ia64/pci/pci.c                 |    1 -
 arch/ia64/sn/kernel/sn2/sn_hwperf.c |    1 -
 include/asm-ia64/segment.h          |    6 ------
 4 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/arch/ia64/ia32/ia32_signal.c b/arch/ia64/ia32/ia32_signal.c
--- a/arch/ia64/ia32/ia32_signal.c
+++ b/arch/ia64/ia32/ia32_signal.c
@@ -29,7 +29,6 @@
 #include <asm/uaccess.h>
 #include <asm/rse.h>
 #include <asm/sigcontext.h>
-#include <asm/segment.h>
 
 #include "ia32priv.h"
 
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -24,7 +24,6 @@
 
 #include <asm/machvec.h>
 #include <asm/page.h>
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/sal.h>
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -36,7 +36,6 @@
 #include <asm/topology.h>
 #include <asm/smp.h>
 #include <asm/semaphore.h>
-#include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <asm/sal.h>
 #include <asm/sn/io.h>
diff --git a/include/asm-ia64/segment.h b/include/asm-ia64/segment.h
deleted file mode 100644
--- a/include/asm-ia64/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_IA64_SEGMENT_H
-#define _ASM_IA64_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_IA64_SEGMENT_H */

Re: [PATCH 05/15] ia64: remove use of asm/segment.h

[Bjorn Helgaas]

On Wednesday 24 August 2005 10:53 am, Kumar Gala wrote:
> Removed IA64 architecture specific users of asm/segment.h and
> asm-ia64/segment.h itself

I posted a similar patch a month ago, but I only removed the
arch/ia64 includes of asm/segment.h.

There are still a few drivers that include asm/segment.h, so
I don't think we should remove asm/segment.h itself just yet.

RE: [PATCH 05/15] ia64: remove use of asm/segment.h

[Luck, Tony]

>There are still a few drivers that include asm/segment.h, so
>I don't think we should remove asm/segment.h itself just yet.

Agreed.  The sequence should be to send patches to get rid of
all "#include <asm/segment.h>" references.

Once they have all gone, then a patch can remove the files.

If you are concerned that people would start adding new
references and you don't want to get into a game of whack-a-mole,
then you could add #warning "include of deprecated asm/segment.h",
but that might be overkill.

I'll apply this for ia64 w/o the deletion.

-Tony

Re: [PATCH 05/15] ia64: remove use of asm/segment.h

[Kumar Gala]

On Aug 24, 2005, at 3:19 PM, Luck, Tony wrote:

>> There are still a few drivers that include asm/segment.h, so
>> I don't think we should remove asm/segment.h itself just yet.
>>
>
> Agreed.  The sequence should be to send patches to get rid of
> all "#include <asm/segment.h>" references.
>
> Once they have all gone, then a patch can remove the files.
>
> If you are concerned that people would start adding new
> references and you don't want to get into a game of whack-a-mole,
> then you could add #warning "include of deprecated asm/segment.h",
> but that might be overkill.
>
> I'll apply this for ia64 w/o the deletion.

I've posted a patch before this to remove all non-architecture users  
of asm/segment.h.

http://www.ussg.iu.edu/hypermail/linux/kernel/0508.3/0099.html

- kumar

RE: [PATCH 05/15] ia64: remove use of asm/segment.h

[Luck, Tony]

>> I'll apply this for ia64 w/o the deletion.

This is now in my test tree.  I will send to Linus soon after
2.6.13 is released.

>I've posted a patch before this to remove all non-architecture users  
>of asm/segment.h.
>
>http://www.ussg.iu.edu/hypermail/linux/kernel/0508.3/0099.html

Good.  After that gets I applied I will delete include/asm-ia64/segment.h

-Tony

Re: [PATCH 05/15] ia64: remove use of asm/segment.h

[Ralf Baechle]

On Wed, Aug 24, 2005 at 02:09:55PM -0600, Bjorn Helgaas wrote:

> On Wednesday 24 August 2005 10:53 am, Kumar Gala wrote:
> > Removed IA64 architecture specific users of asm/segment.h and
> > asm-ia64/segment.h itself
> 
> I posted a similar patch a month ago, but I only removed the
> arch/ia64 includes of asm/segment.h.
> 
> There are still a few drivers that include asm/segment.h, so
> I don't think we should remove asm/segment.h itself just yet.

<asm/segment.h> was replaced by <asm/uaccess.h> in 2.1.4 and we still have
references ...

  Ralf