mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] Remove "#ifdef linux" from linux/a.out.h
@ 2011-10-11 14:30 Joseph S. Myers
  0 siblings, 0 replies; 2+ messages in thread
From: Joseph S. Myers @ 2011-10-11 14:30 UTC (permalink / raw)
  To: linux-kernel

The <linux/a.out.h> header contains "#ifdef linux".  GCC's fixincludes
then creates its own copy of the installed header with this changed to
"#ifdef __linux__".  There should be no need for "#ifdef linux" in
Linux kernel headers, so this patch removes the conditional.

Signed-off-by: Joseph Myers <joseph@codesourcery.com>
---
Previous submission: http://lkml.org/lkml/2006/10/6/201
--- linux-3.0/include/linux/a.out.h.orig	2011-08-04 21:59:21.000000000 -0700
+++ linux-3.0/include/linux/a.out.h	2011-10-11 07:21:33.775483226 -0700
@@ -129,7 +129,6 @@ enum machine_type {
 #define SEGMENT_SIZE PAGE_SIZE
 #endif
 
-#ifdef linux
 #ifdef __KERNEL__
 #include <asm/page.h>
 #else
@@ -146,7 +145,6 @@ enum machine_type {
 #endif
 #endif
 #endif
-#endif
 
 #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
 

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH] Remove "#ifdef linux" from linux/a.out.h
@ 2006-10-06 17:14 Joseph S. Myers
  0 siblings, 0 replies; 2+ messages in thread
From: Joseph S. Myers @ 2006-10-06 17:14 UTC (permalink / raw)
  To: linux-kernel; +Cc: David Woodhouse

The <linux/a.out.h> header contains "#ifdef linux".  GCC's fixincludes
then creates its own copy of the installed header with this changed to
"#ifdef __linux__".  There should be no need for "#ifdef linux" in
Linux kernel headers, so this patch removes the conditional.  With
this patch, fixincludes (from GCC 4.1) makes no changes to the headers
installed by "make headers_install" on MIPS (I haven't tested on other
architectures).

Signed-off-by: Joseph Myers <joseph@codesourcery.com>
---
Index: include/linux/a.out.h
===================================================================
--- include/linux/a.out.h
+++ include/linux/a.out.h
@@ -127,7 +127,6 @@
 #define SEGMENT_SIZE PAGE_SIZE
 #endif
 
-#ifdef linux
 #include <asm/page.h>
 #if defined(__i386__) || defined(__mc68000__)
 #define SEGMENT_SIZE	1024
@@ -136,7 +135,6 @@
 #define SEGMENT_SIZE	PAGE_SIZE
 #endif
 #endif
-#endif
 
 #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
 



-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-11 14:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-11 14:30 [PATCH] Remove "#ifdef linux" from linux/a.out.h Joseph S. Myers
  -- strict thread matches above, loose matches on Subject: below --
2006-10-06 17:14 Joseph S. Myers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®