Skip to contentSkip to conversation

Remove asm/segment.h from low hanging architectures

PATCH Applied Kumar Gala 9 participants 27 messages Aug 24, 2005 – Aug 25, 2005

Subsystems (5)
MIPS s390 SPARC + UltraSPARC (sparc/sparc64) Alpha port +1 more subsystems
lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

cover Remove asm/segment.h from low hanging architectures

The following set of patches removes the use and existence of asm/segment.h from the architecture ports that it was fairly trivial to do so. I need to work with the arch maintainers on the following architectures since they use asm/segment.h heavily:

m32r
um
frv
h8300
i386
m68knommu
m68k
v850
x86_64

If any arch maintainers want to go a head kill asm/segment.h in that last I would be very appreciative.

Thanks

- kumar

author
#1 lore raw

PATCH 1/15 alpha: remove use of asm/segment.h

Removed Alpha architecture specific users of asm/segment.h and asm-alpha/segment.h itself

Signed-off-by Kumar Gala <[email protected]>

---
commit 19150fe1698293dc2c4f4f48c6b05d83595544e6
tree 9c45366378a1c34d755da01efc162bd7d80d48ab
parent acda3853951d4b9dbe97dffbefd6d2a4fd9d3df0
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:33:40 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:33:40 -0500

 arch/alpha/kernel/smc37c669.c |    1 -
 arch/alpha/kernel/smc37c93x.c |    1 -
 include/asm-alpha/segment.h   |    6 ------
 3 files changed, 0 insertions(+), 8 deletions(-)
arch/alpha/kernel/smc37c669.c +0 -1
@@ -11,7 +11,6 @@
 
 #include <asm/hwrpb.h>
 #include <asm/io.h>
-#include <asm/segment.h>
 
 #if 0
 # define DBG_DEVS(args)         printk args
arch/alpha/kernel/smc37c93x.c +0 -1
@@ -12,7 +12,6 @@
 
 #include <asm/hwrpb.h>
 #include <asm/io.h>
-#include <asm/segment.h>
 
 #define SMC_DEBUG 0
include/asm-alpha/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef __ALPHA_SEGMENT_H
-#define __ALPHA_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif
author
#2 lore raw

PATCH 2/15 arm26: remove use of asm/segment.h

In reply to Kumar Gala

Removed ARM26 architecture specific users of asm/segment.h and asm-alpha/segment.h itself.

Signed-off-by Kumar Gala <[email protected]>

---
commit 1d8c8bf789b6925529d84f3ad787cf973763793f
tree 8b009fca0a2f15ac71e72f09d16330990609c4bc
parent 19150fe1698293dc2c4f4f48c6b05d83595544e6
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:40:11 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:40:11 -0500

 arch/arm26/mm/init.c        |    1 -
 include/asm-arm26/segment.h |   11 -----------
 2 files changed, 0 insertions(+), 12 deletions(-)
arch/arm26/mm/init.c +0 -1
@@ -24,7 +24,6 @@
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
 
-#include <asm/segment.h>
 #include <asm/mach-types.h>
 #include <asm/dma.h>
 #include <asm/hardware.h>
include/asm-arm26/segment.h deleted +0 -11
deleted file mode 100644
@@ -1,11 +0,0 @@
-#ifndef __ASM_ARM_SEGMENT_H
-#define __ASM_ARM_SEGMENT_H
-
-#define __KERNEL_CS   0x0
-#define __KERNEL_DS   0x0
-
-#define __USER_CS     0x1
-#define __USER_DS     0x1
-
-#endif /* __ASM_ARM_SEGMENT_H */
-
author
#3 lore raw

PATCH 3/15 arm: remove use of asm/segment.h

In reply to Kumar Gala

Removed asm-arm/segment.h as its not used by anything.

Signed-off-by Kumar Gala <[email protected]>

---
commit 13e9876eff93029eb24affd8842db94035c370f5
tree acb6c189dd89aef958961eedba5641449865c5aa
parent 1d8c8bf789b6925529d84f3ad787cf973763793f
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:42:30 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:42:30 -0500

 include/asm-arm/segment.h |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
include/asm-arm/segment.h deleted +0 -11
deleted file mode 100644
@@ -1,11 +0,0 @@
-#ifndef __ASM_ARM_SEGMENT_H
-#define __ASM_ARM_SEGMENT_H
-
-#define __KERNEL_CS   0x0
-#define __KERNEL_DS   0x0
-
-#define __USER_CS     0x1
-#define __USER_DS     0x1
-
-#endif /* __ASM_ARM_SEGMENT_H */
-
author
#4 lore raw

PATCH 4/15 cris: remove use of asm/segment.h

In reply to Kumar Gala

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

Signed-off-by Kumar Gala <[email protected]>

---
commit 352a43ca6e4cb29ca7ee1742a00f3b6d98465a0d
tree b3816f312ed0b9206e344ceb62bb4f82a5c469e6
parent 13e9876eff93029eb24affd8842db94035c370f5
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:47:26 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:47:26 -0500

 arch/cris/arch-v10/kernel/fasttimer.c |    1 -
 arch/cris/kernel/sys_cris.c           |    1 -
 include/asm-cris/processor.h          |    4 ++++
 include/asm-cris/segment.h            |    8 --------
 include/asm-cris/thread_info.h        |    1 -
 5 files changed, 4 insertions(+), 11 deletions(-)
arch/cris/arch-v10/kernel/fasttimer.c +0 -1
@@ -105,7 +105,6 @@
 #include <linux/time.h>
 #include <linux/delay.h>
 
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/delay.h>
arch/cris/kernel/sys_cris.c +0 -1
@@ -24,7 +24,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
-#include <asm/segment.h>
 
 /*
  * sys_pipe() is the normal C calling standard for creating
include/asm-cris/processor.h +4 -0
@@ -21,6 +21,10 @@
  */
 #define TASK_UNMAPPED_BASE      (PAGE_ALIGN(TASK_SIZE / 3))
 
+typedef struct {
+	unsigned long seg;
+} mm_segment_t;
+
 /* THREAD_SIZE is the size of the task_struct/kernel_stack combo.
  * normally, the stack is found by doing something like p + THREAD_SIZE
  * in CRIS, a page is 8192 bytes, which seems like a sane size
include/asm-cris/segment.h deleted +0 -8
deleted file mode 100644
@@ -1,8 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-typedef struct {
-  unsigned long seg;
-} mm_segment_t;
-
-#endif
include/asm-cris/thread_info.h +0 -1
@@ -15,7 +15,6 @@
 #include <asm/types.h>
 #include <asm/processor.h>
 #include <asm/arch/thread_info.h>
-#include <asm/segment.h>
 #endif
author
#5 lore raw

PATCH 5/15 ia64: remove use of asm/segment.h

In reply to Kumar Gala

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

Signed-off-by Kumar Gala <[email protected]>

---
commit 53cbc8f4b0d47965e2d673bcc9dc5e6a8388350b
tree d05c25c406d023dce7c797ede8119b8ab68767e5
parent 352a43ca6e4cb29ca7ee1742a00f3b6d98465a0d
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:54:23 -0500 committer Kumar K. Gala <[email protected]> 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(-)
arch/ia64/ia32/ia32_signal.c +0 -1
@@ -29,7 +29,6 @@
 #include <asm/uaccess.h>
 #include <asm/rse.h>
 #include <asm/sigcontext.h>
-#include <asm/segment.h>
 
 #include "ia32priv.h"
arch/ia64/pci/pci.c +0 -1
@@ -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>
arch/ia64/sn/kernel/sn2/sn_hwperf.c +0 -1
@@ -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>
include/asm-ia64/segment.h deleted +0 -6
deleted file mode 100644
@@ -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 */
#6 lore raw

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

Quoted 2 lines · Kumar Gala

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.

#7 lore raw

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

Quoted 9 lines · Bjorn Helgaas
Quoted 2 lines · Kumar Gala

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

author
#8 lore raw

PATCH 6/15 mips: remove use of asm/segment.h

In reply to Kumar Gala

Removed MIPS architecture specific users of asm/segment.h and asm-mips/segment.h itself

Signed-off-by Kumar Gala <[email protected]>

---
commit 8f20e153d5d5c3efd95835e814fae7b3ccbfcd08
tree 17e9ae88b3fe1762302179a4ea08e61360805a29
parent 503a812c1f9cef08e6f96b2b2cf1f32bbfef2bc6
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:59:09 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:59:09 -0500

 arch/mips/au1000/db1x00/mirage_ts.c |    1 -
 include/asm-mips/segment.h          |    6 ------
 2 files changed, 0 insertions(+), 7 deletions(-)
arch/mips/au1000/db1x00/mirage_ts.c +0 -1
@@ -44,7 +44,6 @@
 #include <linux/smp_lock.h>
 #include <linux/wait.h>
 
-#include <asm/segment.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/delay.h>
include/asm-mips/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_SEGMENT_H */
Applied
#9 lore raw

Re: [PATCH 06/15] mips: remove use of asm/segment.h

Quoted 2 lines · Kumar Gala

Removed MIPS architecture specific users of asm/segment.h and asm-mips/segment.h itself

Thanks, applied.

Ralf

author
#10 lore raw

PATCH 7/15 parisc: remove use of asm/segment.h

In reply to Kumar Gala

Removed asm-parisc/segment.h as its not used by anything.

Signed-off-by Kumar Gala <[email protected]>

---
commit e2a2b88b3c3d60b07be7908579bb772e6bd4cd01
tree f87e38b7cfa643825a937c2d4a65a042ebfe263d
parent 18c435f8b99db307732a02a07bf2099ad64174db
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:32:02 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:32:02 -0500

 include/asm-parisc/segment.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
include/asm-parisc/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef __PARISC_SEGMENT_H
-#define __PARISC_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif
#11 lore raw

Re: [parisc-linux] [PATCH 07/15] parisc: remove use of asm/segment.h

Quoted 1 line · Kumar Gala

Removed asm-parisc/segment.h as its not used by anything.

Did you already remove all the uses outside the parisc-specific bits of the tree, eg ISDN, media/video/, sound/oss/, etc?

If so, ACK, otherwise, NAK.

Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain
#12 lore raw

Re: [parisc-linux] [PATCH 07/15] parisc: remove use of asm/segment.h

Quoted 9 lines · Matthew Wilcox
Quoted 2 lines · Kumar Gala

Removed asm-parisc/segment.h as its not used by anything.

Did you already remove all the uses outside the parisc-specific bits of the tree, eg ISDN, media/video/, sound/oss/, etc?

If so, ACK, otherwise, NAK.

I did remove them. I should have included a reference to the patch that did this:

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

- kumar

#13 lore raw

Re: [parisc-linux] [PATCH 07/15] parisc: remove use of asm/segment.h

In reply to Matthew Wilcox
Quoted 9 lines · Matthew Wilcox
Quoted 2 lines · Kumar Gala

Removed asm-parisc/segment.h as its not used by anything.

Did you already remove all the uses outside the parisc-specific bits of the tree, eg ISDN, media/video/, sound/oss/, etc?

If so, ACK, otherwise, NAK.

I did remove them. I should have included a reference to the patch that did this:

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

- kumar

author
#14 lore raw

PATCH 8/15 ppc32: remove use of asm/segment.h

In reply to Kumar Gala

Removed ppc32 architecture specific users of asm/segment.h and asm-ppc/segment.h itself

Signed-off-by Kumar Gala <[email protected]>

---
commit 503a812c1f9cef08e6f96b2b2cf1f32bbfef2bc6
tree b61a93eb582e90fafda6ff9d064b2ab25e7d3ede
parent 21a31cb366a764793dc532b525b95bfc3e1723a2
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:58:02 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:58:02 -0500

 arch/ppc/kernel/temp.c         |    1 -
 arch/ppc/kernel/time.c         |    1 -
 arch/ppc/platforms/chrp_time.c |    1 -
 arch/ppc/syslib/prep_nvram.c   |    1 -
 include/asm-ppc/segment.h      |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)
arch/ppc/kernel/temp.c +0 -1
@@ -21,7 +21,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/reg.h>
 #include <asm/nvram.h>
arch/ppc/kernel/time.c +0 -1
@@ -58,7 +58,6 @@
 #include <linux/init.h>
 #include <linux/profile.h>
 
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/nvram.h>
 #include <asm/cache.h>
arch/ppc/platforms/chrp_time.c +0 -1
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/bcd.h>
 
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/nvram.h>
 #include <asm/prom.h>
arch/ppc/syslib/prep_nvram.c +0 -1
@@ -15,7 +15,6 @@
 #include <linux/ioport.h>
 
 #include <asm/sections.h>
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/prep_nvram.h>
include/asm-ppc/segment.h deleted +0 -1
deleted file mode 100644
@@ -1 +0,0 @@
-#include <asm/uaccess.h>
author
#15 lore raw

PATCH 9/15 ppc64: remove use of asm/segment.h

In reply to Kumar Gala

Removed PPC64 architecture specific users of asm/segment.h and asm-ppc64/segment.h itself

Signed-off-by Kumar Gala <[email protected]>

---
commit 21a31cb366a764793dc532b525b95bfc3e1723a2
tree 2c40ec80e781b61fef42e5914d8f336dc72f2200
parent 53cbc8f4b0d47965e2d673bcc9dc5e6a8388350b
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:55:55 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 10:55:55 -0500

 arch/ppc64/kernel/time.c    |    1 -
 include/asm-ppc64/segment.h |    6 ------
 2 files changed, 0 insertions(+), 7 deletions(-)
arch/ppc64/kernel/time.c +0 -1
@@ -51,7 +51,6 @@
 #include <linux/cpu.h>
 #include <linux/security.h>
 
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/nvram.h>
include/asm-ppc64/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef __PPC64_SEGMENT_H
-#define __PPC64_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* __PPC64_SEGMENT_H */
author
#16 lore raw

PATCH 10/15 s390: remove use of asm/segment.h

In reply to Kumar Gala

Removed S390 architecture specific users of asm/segment.h and asm-s390/segment.h itself

Signed-off-by Kumar Gala <[email protected]>

---
commit 6ee9ded730a875d63e42add1c3094eca7d5a6cdf
tree 5d340a409fd593e5f5d7e71467a038fd90def51b
parent 8f20e153d5d5c3efd95835e814fae7b3ccbfcd08
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:01:20 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:01:20 -0500

 arch/s390/kernel/ptrace.c  |    1 -
 include/asm-s390/segment.h |    4 ----
 2 files changed, 0 insertions(+), 5 deletions(-)
arch/s390/kernel/ptrace.c +0 -1
@@ -34,7 +34,6 @@
 #include <linux/audit.h>
 #include <linux/signal.h>
 
-#include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
include/asm-s390/segment.h deleted +0 -4
deleted file mode 100644
@@ -1,4 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-#endif
author
#17 lore raw

PATCH 11/15 sh64: remove use of asm/segment.h

In reply to Kumar Gala

Removed asm-sh64/segment.h as its not used by anything.

Signed-off-by Kumar Gala <[email protected]>

---
commit 36b349eaba7a399c06219d3553d571261dbf6333
tree 5ac502496f084585407bf5d8fd9040a489525edf
parent ab81566ace65ac748c885d696c11b5ae839fb328
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:33:32 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:33:32 -0500

 include/asm-sh64/segment.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
include/asm-sh64/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_SEGMENT_H */
author
#18 lore raw

PATCH 12/15 sh: remove use of asm/segment.h

In reply to Kumar Gala

Removed asm-sh/segment.h as its not used by anything.

Signed-off-by Kumar Gala <[email protected]>

---
commit ab81566ace65ac748c885d696c11b5ae839fb328
tree e36ec9a52dc26db8bc20e1c57a9dce5e2b58fd39
parent e2a2b88b3c3d60b07be7908579bb772e6bd4cd01
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:32:48 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:32:48 -0500

 include/asm-sh/segment.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
include/asm-sh/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH_SEGMENT_H
-#define __ASM_SH_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* __ASM_SH_SEGMENT_H */
author
#19 lore raw

PATCH 13/15 sparc64: remove use of asm/segment.h

In reply to Kumar Gala

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

Signed-off-by Kumar Gala <[email protected]>

---
commit 4c42a86cb24cd46d20ccb883b196e29bef6df18f
tree 83888c48157ecf0783f19cd73634d6446ac29482
parent 6ee9ded730a875d63e42add1c3094eca7d5a6cdf
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:04:10 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:04:10 -0500

 b/arch/sparc64/kernel/setup.c     |    1 -
 b/include/asm-sparc64/processor.h |    1 -
 include/asm-sparc64/segment.h     |    6 ------
 3 files changed, 8 deletions(-)
arch/sparc64/kernel/setup.c +0 -1
@@ -33,7 +33,6 @@
 #include <linux/cpu.h>
 #include <linux/initrd.h>
 
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/processor.h>
include/asm-sparc64/processor.h +0 -1
@@ -18,7 +18,6 @@
 #include <asm/a.out.h>
 #include <asm/pstate.h>
 #include <asm/ptrace.h>
-#include <asm/segment.h>
 #include <asm/page.h>
 
 /* The sparc has no problems with write protection */
include/asm-sparc64/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef __SPARC64_SEGMENT_H
-#define __SPARC64_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif
author
#20 lore raw

PATCH 14/15 sparc: remove use of asm/segment.h

In reply to Kumar Gala

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

Signed-off-by Kumar Gala <[email protected]>

---
commit bd988bbd37cb610800f19ac6891a519c81c96d95
tree dff7982106a16af59a65c158631f76d9fa118a1e
parent 4c42a86cb24cd46d20ccb883b196e29bef6df18f
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:14:02 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:14:02 -0500

 arch/sparc/kernel/setup.c     |    1 -
 arch/sparc/kernel/tick14.c    |    1 -
 arch/sparc/kernel/time.c      |    1 -
 arch/sparc/mm/fault.c         |    1 -
 arch/sparc/mm/init.c          |    1 -
 include/asm-sparc/processor.h |    1 -
 include/asm-sparc/segment.h   |    6 ------
 include/asm-sparc/system.h    |    1 -
 8 files changed, 0 insertions(+), 13 deletions(-)
arch/sparc/kernel/setup.c +0 -1
@@ -32,7 +32,6 @@
 #include <linux/spinlock.h>
 #include <linux/root_dev.h>
 
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/processor.h>
arch/sparc/kernel/tick14.c +0 -1
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/oplib.h>
-#include <asm/segment.h>
 #include <asm/timer.h>
 #include <asm/mostek.h>
 #include <asm/system.h>
arch/sparc/kernel/time.c +0 -1
@@ -32,7 +32,6 @@
 #include <linux/profile.h>
 
 #include <asm/oplib.h>
-#include <asm/segment.h>
 #include <asm/timer.h>
 #include <asm/mostek.h>
 #include <asm/system.h>
arch/sparc/mm/fault.c +0 -1
@@ -23,7 +23,6 @@
 #include <linux/module.h>
 
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/memreg.h>
arch/sparc/mm/init.c +0 -1
@@ -25,7 +25,6 @@
 #include <linux/bootmem.h>
 
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/vac-ops.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
include/asm-sparc/processor.h +0 -1
@@ -19,7 +19,6 @@
 #include <asm/ptrace.h>
 #include <asm/head.h>
 #include <asm/signal.h>
-#include <asm/segment.h>
 #include <asm/btfixup.h>
 #include <asm/page.h>
include/asm-sparc/segment.h deleted +0 -6
deleted file mode 100644
@@ -1,6 +0,0 @@
-#ifndef __SPARC_SEGMENT_H
-#define __SPARC_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif
include/asm-sparc/system.h +0 -1
@@ -9,7 +9,6 @@
 #include <linux/threads.h>	/* NR_CPUS */
 #include <linux/thread_info.h>
 
-#include <asm/segment.h>
 #include <asm/page.h>
 #include <asm/psr.h>
 #include <asm/ptrace.h>
maintainer
#21 lore raw

Re: [PATCH 14/15] sparc: remove use of asm/segment.h

Both sparc64 and sparc patches applied, thanks Kumar.

author
#22 lore raw

PATCH 15/15 xtensa: remove use of asm/segment.h

In reply to Kumar Gala

Removed asm-xtensa/segment.h as its not used by anything.

Signed-off-by Kumar Gala <[email protected]>

---
commit 51e70a5236bf8f2f30f1a86513c18e05e3cb6fee
tree 57c39eaf3761a71b9d78c25893f7696fdc703915
parent 36b349eaba7a399c06219d3553d571261dbf6333
author Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:37:29 -0500 committer Kumar K. Gala <[email protected]> Wed, 24 Aug 2005 11:37:29 -0500

 include/asm-xtensa/segment.h |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
include/asm-xtensa/segment.h deleted +0 -16
deleted file mode 100644
@@ -1,16 +0,0 @@
-/*
- * include/asm-xtensa/segment.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_SEGMENT_H
-#define _XTENSA_SEGMENT_H
-
-#include <asm/uaccess.h>
-
-#endif	/* _XTENSA_SEGEMENT_H */
#23 lore raw
In reply to Kumar Gala
Quoted 2 lines · Kumar Gala

The following set of patches removes the use and existence of asm/segment.h from the architecture ports

You've broken various things by doing this because some driver code rightly or wrongly uses segment.h. That is fine because they shouldn't do so. However asm/segment.h isn't supoosed to be removed on architectures that use segments- like x86, and x86-64. There it is a real arch private file and shouldn't be disappearing.

It shouldn't be leaking into drivers any more (eg mxser.c is an offender there)

#24 lore raw
Quoted 6 lines · Alan Cox
Quoted 3 lines · Kumar Gala

The following set of patches removes the use and existence of asm/segment.h from the architecture ports

Quoted 8 lines

You've broken various things by doing this because some driver code rightly or wrongly uses segment.h. That is fine because they shouldn't do so. However asm/segment.h isn't supoosed to be removed on architectures that use segments- like x86, and x86-64. There it is a real arch private file and shouldn't be disappearing.

It shouldn't be leaking into drivers any more (eg mxser.c is an offender there)

Ok, so it sounds like my patch to remove drivers from include asm/segment.h is fine, and we will leave it up to the various arch maintainers to decide if they want to keep asm/segment.h for arch specific usage.

- kumar

#25 lore raw
In reply to Alan Cox
Quoted 7 lines · Alan Cox
Quoted 3 lines · Kumar Gala

The following set of patches removes the use and existence of asm/segment.h from the architecture ports

Quoted 10 lines

You've broken various things by doing this because some driver code rightly or wrongly uses segment.h. That is fine because they shouldn't do so. However asm/segment.h isn't supoosed to be removed on architectures that use segments- like x86, and x86-64. There it is a real arch private file and shouldn't be disappearing.

It shouldn't be leaking into drivers any more (eg mxser.c is an offender there)

Yes, agree totally, i386 _requires_ asm/segment.h. It is used in low-level trap handling and bootup code from assembly files. In addition, even parts of userspace on i386 depend on asm/segment.h, although that is a different beast.

It is a total bug if generic drivers include it, there is simply no reason to use segment.h unless you have to use segmentation. Ideally, all includes of segment.h should be confined to architectures that require it, and limited to either arch/foo or include/asm-foo.

I'm looking at -rc6-mm1, and I see the following bad guys:

./drivers/char/mxser.c:#include <asm/segment.h>
./drivers/char/speakup/speakup_drvcommon.c:#include <asm/segment.h> /* for put_user_byte */
./drivers/isdn/hisax/hisax.h:#include <asm/segment.h> ./drivers/media/video/adv7170.c:#include <asm/segment.h> ./drivers/media/video/adv7175.c:#include <asm/segment.h> ./drivers/media/video/bt819.c:#include <asm/segment.h> ./drivers/media/video/bt856.c:#include <asm/segment.h> ./drivers/media/video/saa7111.c:#include <asm/segment.h> ./drivers/media/video/saa7114.c:#include <asm/segment.h> ./drivers/media/video/saa7185.c:#include <asm/segment.h> ./drivers/serial/68328serial.c:#include <asm/segment.h> ./drivers/serial/crisv10.c:#include <asm/segment.h> ./drivers/serial/icom.c:#include <asm/segment.h> ./drivers/serial/mcfserial.c:#include <asm/segment.h> ./drivers/video/q40fb.c:#include <asm/segment.h> ./include/linux/isdn.h:#include <asm/segment.h> ./sound/oss/os.h:#include <asm/segment.h>

Zach

#26 lore raw
Quoted 3 lines · Zachary Amsden

Yes, agree totally, i386 _requires_ asm/segment.h. It is used in low-level trap handling and bootup code from assembly files. In addition,

but keeping the header under that name will just encorage people to put it back into drivers, after all it compiles on i386..

Let's rename it even for i386.

Quoted 2 lines

even parts of userspace on i386 depend on asm/segment.h, although that is a different beast.

That's a problem of glibc-kernheaders (or insert alternative $name here)