[PATCH] ppc32: removed usage of <asm/segment.h>

Made <asm/segment.h> a dummy include like it is in ppc64 and removed any
users if it in arch/ppc.

Signed-off-by: Kumar Gala <redacted>

---
commit f63ab7e926d6c5e96de501ec9eac7f28af188a65
tree adcc67a572ec8e4d1520a7a5493ea909028e76f9
parent d88b795bc4c4b59c29a98e2a551c2ad4d65901c5
author Kumar K. Gala [off-list ref] Tue, 16 Aug 2005 16:59:22 -0500
committer Kumar K. Gala [off-list ref] Tue, 16 Aug 2005 16:59:22 -0500

 arch/ppc/kernel/temp.c         |    1 -
 arch/ppc/kernel/time.c         |    1 -
 arch/ppc/platforms/chrp_time.c |    1 -
 include/asm-ppc/segment.h      |    7 ++++++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/ppc/kernel/temp.c b/arch/ppc/kernel/temp.c
--- a/arch/ppc/kernel/temp.c
+++ b/arch/ppc/kernel/temp.c

@@ -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>

diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
--- a/arch/ppc/kernel/time.c
+++ b/arch/ppc/kernel/time.c

@@ -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>

diff --git a/arch/ppc/platforms/chrp_time.c b/arch/ppc/platforms/chrp_time.c
--- a/arch/ppc/platforms/chrp_time.c
+++ b/arch/ppc/platforms/chrp_time.c

@@ -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>

diff --git a/include/asm-ppc/segment.h b/include/asm-ppc/segment.h
--- a/include/asm-ppc/segment.h
+++ b/include/asm-ppc/segment.h

@@ -1 +1,6 @@
-#include <asm/uaccess.h>
+#ifndef __PPC_SEGMENT_H
+#define __PPC_SEGMENT_H
+
+/* Only here because we have some old header files that expect it.. */
+
+#endif /* __PPC_SEGMENT_H */

Kumar Gala writes:

Made <asm/segment.h> a dummy include like it is in ppc64 and removed any
users if it in arch/ppc.

Why can't we just delete asm-ppc/segment.h (and asm-ppc64/segment.h
too, for that matter) entirely?

Paul.

From: Paul Mackerras <redacted>
Date: Wed, 17 Aug 2005 11:38:20 +1000

Kumar Gala writes:

quoted

Made <asm/segment.h> a dummy include like it is in ppc64 and removed any
users if it in arch/ppc.

Why can't we just delete asm-ppc/segment.h (and asm-ppc64/segment.h
too, for that matter) entirely?

I concur, in fact we should really kill that thing off entirely.

On Aug 16, 2005, at 10:33 PM, David S. Miller wrote:

From: Paul Mackerras <redacted>
Date: Wed, 17 Aug 2005 11:38:20 +1000

quoted

Kumar Gala writes:

quoted

Made <asm/segment.h> a dummy include like it is in ppc64 and removed

any

quoted

quoted

users if it in arch/ppc.

Why can't we just delete asm-ppc/segment.h (and asm-ppc64/segment.h
too, for that matter) entirely?

I concur, in fact we should really kill that thing off entirely.

I'm all for killing it off entirely but got some feedback that on  
i386 segment.h can be included by userspace programs.

Here is the in kernel consumers that are outside of arch specific  
directories:

./drivers/char/mxser.c:#include <asm/segment.h>
./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>

- kumar

On Wed, 17 Aug 2005, Kumar Gala wrote:

I'm all for killing it off entirely but got some feedback that on i386
segment.h can be included by userspace programs.

Here is the in kernel consumers that are outside of arch specific directories:

./drivers/video/q40fb.c:#include <asm/segment.h>

M68k-only, so doesn't affect ppc.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

On Wed, Aug 17, 2005 at 12:43:37AM -0500, Kumar Gala wrote:

quoted

I concur, in fact we should really kill that thing off entirely.

I'm all for killing it off entirely but got some feedback that on  
i386 segment.h can be included by userspace programs.

No kernel headers can be included by userland anymore.