Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a8a0788 authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Linus Torvalds
Browse files

parisc: move definition of PAGE0 to asm/page.h 



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 include/linux/bitops.h:35:0,
                 from include/asm-generic/getorder.h:7,
                 from arch/parisc/include/asm/page.h:162,
                 from arch/parisc/include/asm/pdc.h:346,
                 from arch/parisc/include/asm/processor.h:16,
                 from arch/parisc/include/asm/spinlock.h:6,
                 from arch/parisc/include/asm/atomic.h:20,
                 from include/linux/atomic.h:4,
                 from include/linux/sysfs.h:20,
                 from include/linux/kobject.h:21,
                 from include/linux/device.h:17,
                 from include/linux/eisa.h:5,
                 from arch/parisc/kernel/pci.c:11:
arch/parisc/include/asm/bitops.h: In function ‘set_bit’:
arch/parisc/include/asm/bitops.h:82:2: error: implicit declaration of function ‘_atomic_spin_lock_irqsave’ [-Werror=implicit-function-declaration]
arch/parisc/include/asm/bitops.h:84:2: error: implicit declaration of function ‘_atomic_spin_unlock_irqrestore’ [-Werror=implicit-function-declaration]

Signed-off-by: default avatarRolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9b05b1ec

arch/parisc/include/asm/page.h

+6 −0
Original line number Diff line number Diff line
@@ -160,5 +160,11 @@ extern int npmem_ranges; 


#include <asm-generic/memory_model.h>

#include <asm-generic/getorder.h>

#include <asm/pdc.h>



#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 */

arch/parisc/include/asm/pdc.h

+0 −7
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ 


#ifdef __KERNEL__



#include <asm/page.h> /* 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

arch/parisc/kernel/pdc_cons.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/init.h>

#include <linux/major.h>

#include <linux/tty.h>

#include <asm/page.h>		/* for PAGE0 */

#include <asm/pdc.h>		/* for iodc_call() proto and friends */



static DEFINE_SPINLOCK(pdc_console_lock);

arch/parisc/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/uaccess.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/page.h>

#include <asm/param.h>

#include <asm/pdc.h>

#include <asm/led.h>

drivers/parisc/sba_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <asm/ropes.h>

#include <asm/mckinley.h>	/* for proc_mckinley_root */

#include <asm/runway.h>		/* for proc_runway_root */

#include <asm/page.h>		/* for PAGE0 */

#include <asm/pdc.h>		/* for PDC_MODEL_* */

#include <asm/pdcpat.h>		/* for is_pdc_pat() */

#include <asm/parisc-device.h>