From: Roman Zippel <zippel@linux-m68k.org>
To: linuxppc-dev@ozlabs.org
Subject: [PATCH 4/8] fix include wrapper
Date: Sun, 25 Sep 2005 00:43:35 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.61.0509250042460.19169@scrub.home> (raw)
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 */
reply other threads:[~2005-09-24 22:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.61.0509250042460.19169@scrub.home \
--to=zippel@linux-m68k.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).