Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758375Ab2EJVJ4 (ORCPT ); Thu, 10 May 2012 17:09:56 -0400 Received: from mail.sf-mail.de ([62.27.20.61]:53480 "EHLO mail.sf-mail.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757447Ab2EJVJx convert rfc822-to-8bit (ORCPT ); Thu, 10 May 2012 17:09:53 -0400 From: Rolf Eike Beer To: linux-parisc@vger.kernel.org Cc: James Bottomley , linux-kernel , torvalds@linux-foundation.org Subject: [PATCH 5/5] parisc: move definition of PAGE0 to asm/page.h Date: Thu, 10 May 2012 23:08:17 +0200 Message-ID: <9994244.7dMrtT61Uk@donald.sf-tec.de> User-Agent: KMail/4.8.3 (Linux/3.2.9-13-desktop; KDE/4.8.3; i686; ; ) In-Reply-To: <4430485.xEvkeJU8MB@donald.sf-tec.de> References: <4430485.xEvkeJU8MB@donald.sf-tec.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5231 Lines: 132 This was defined in asm/pdc.h which needs to include asm/page.h for __PAGE_OFFSET. This leads to an include loop so that page.h eventually will include pdc.h again. While this is no problem because of header guards, it is a problem because some symbols may be undefined. Such an error is this: In file included from /home/buildbot/repos/linux/include/linux/bitops.h:35:0, from /home/buildbot/repos/linux/include/asm-generic/getorder.h:7, from /home/buildbot/repos/linux/arch/parisc/include/asm/page.h:162, from /home/buildbot/repos/linux/arch/parisc/include/asm/pdc.h:346, from /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:16, from /home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h:6, from /home/buildbot/repos/linux/arch/parisc/include/asm/atomic.h:20, from /home/buildbot/repos/linux/include/linux/atomic.h:4, from /home/buildbot/repos/linux/include/linux/sysfs.h:20, from /home/buildbot/repos/linux/include/linux/kobject.h:21, from /home/buildbot/repos/linux/include/linux/device.h:17, from /home/buildbot/repos/linux/include/linux/eisa.h:5, from /home/buildbot/repos/linux/arch/parisc/kernel/pci.c:11: /home/buildbot/repos/linux/arch/parisc/include/asm/bitops.h: In function ‘set_bit’: /home/buildbot/repos/linux/arch/parisc/include/asm/bitops.h:82:2: error: implicit declaration of function ‘_atomic_spin_lock_irqsave’ [-Werror=implicit-function-declaration] /home/buildbot/repos/linux/arch/parisc/include/asm/bitops.h:84:2: error: implicit declaration of function ‘_atomic_spin_unlock_irqrestore’ [-Werror=implicit-function-declaration] Signed-off-by: Rolf Eike Beer --- arch/parisc/include/asm/page.h | 6 ++++++ arch/parisc/include/asm/pdc.h | 7 ------- arch/parisc/kernel/pdc_cons.c | 1 + arch/parisc/kernel/time.c | 1 + drivers/parisc/sba_iommu.c | 1 + drivers/video/console/sticore.c | 2 ++ 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h index a84cc1f..4e0e7db 100644 --- a/arch/parisc/include/asm/page.h +++ b/arch/parisc/include/asm/page.h @@ -160,5 +160,11 @@ extern int npmem_ranges; #include #include +#include + +#define PAGE0 ((struct zeropage *)__PAGE_OFFSET) + +/* DEFINITION OF THE ZERO-PAGE (PAG0) */ +/* based on work by Jason Eckhardt (jason@equator.com) */ #endif /* _PARISC_PAGE_H */ diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h index 4ca510b..7f0f2d2 100644 --- a/arch/parisc/include/asm/pdc.h +++ b/arch/parisc/include/asm/pdc.h @@ -343,8 +343,6 @@ #ifdef __KERNEL__ -#include /* for __PAGE_OFFSET */ - extern int pdc_type; /* Values for pdc_type */ @@ -677,11 +675,6 @@ static inline char * os_id_to_string(u16 os_id) { #endif /* __KERNEL__ */ -#define PAGE0 ((struct zeropage *)__PAGE_OFFSET) - -/* DEFINITION OF THE ZERO-PAGE (PAG0) */ -/* based on work by Jason Eckhardt (jason@equator.com) */ - /* flags of the device_path */ #define PF_AUTOBOOT 0x80 #define PF_AUTOSEARCH 0x40 diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c index 4f00459..9bbd2a5 100644 --- a/arch/parisc/kernel/pdc_cons.c +++ b/arch/parisc/kernel/pdc_cons.c @@ -50,6 +50,7 @@ #include #include #include +#include /* for PAGE0 */ #include /* for iodc_call() proto and friends */ static DEFINE_SPINLOCK(pdc_console_lock); diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 7c07743..70e105d 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 8644d53..42cfcd9 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c @@ -44,6 +44,7 @@ #include #include /* for proc_mckinley_root */ #include /* for proc_runway_root */ +#include /* for PAGE0 */ #include /* for PDC_MODEL_* */ #include /* for is_pdc_pat() */ #include diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 6468a29..39571f9 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -22,7 +22,9 @@ #include #include +#include #include +#include #include #include -- 1.7.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/