[PATCH 4/8] fix include wrapper

Roman Zippel zippel at linux-m68k.org
Sun Sep 25 08:43:35 EST 2005


Outside the include protection must only be comments, so that cpp can
optimize the header scan.

---

 include/asm-ppc/current.h |    4 ++--
 include/asm-ppc/io.h      |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

Index: linux/include/asm-ppc/current.h
===================================================================
--- linux.orig/include/asm-ppc/current.h	2005-09-23 16:19:24.000000000 +0200
+++ linux/include/asm-ppc/current.h	2005-09-23 16:20:24.000000000 +0200
@@ -1,11 +1,11 @@
-#ifdef __KERNEL__
 #ifndef _PPC_CURRENT_H
 #define _PPC_CURRENT_H
+#ifdef __KERNEL__
 
 /*
  * We keep `current' in r2 for speed.
  */
 register struct task_struct *current asm ("r2");
 
-#endif /* !(_PPC_CURRENT_H) */
 #endif /* __KERNEL__ */
+#endif /* !(_PPC_CURRENT_H) */
Index: linux/include/asm-ppc/io.h
===================================================================
--- linux.orig/include/asm-ppc/io.h	2005-09-23 16:19:24.000000000 +0200
+++ linux/include/asm-ppc/io.h	2005-09-23 16:20:24.000000000 +0200
@@ -1,6 +1,6 @@
-#ifdef __KERNEL__
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
+#ifdef __KERNEL__
 
 #include <linux/config.h>
 #include <linux/string.h>
@@ -546,8 +546,6 @@ struct pci_dev;
 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
 extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
 
-#endif /* _PPC_IO_H */
-
 #ifdef CONFIG_8260_PCI9
 #include <asm/mpc8260_pci9.h>
 #endif
@@ -564,3 +562,4 @@ extern void pci_iounmap(struct pci_dev *
 #define xlate_dev_kmem_ptr(p)	p
 
 #endif /* __KERNEL__ */
+#endif /* _PPC_IO_H */



More information about the Linuxppc-dev mailing list