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

Commit d60b9c16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc' (PA-RISC compile fixes) 

Merge PA-RISC compile fixes from Rolf Eike Beer:
 "Since commit d66acc39 ("bitops: Optimise get_order()") getorder.h
  includes log2.h which leads to an include loop on PA-RISC, bringing a
  bunch of other breakage to light.  This patchset fixes the compilation
  of the current state of 3.4 on HPPA.

  Unchanged against the first version, just added an Ack by Grant."

* emailed from Rolf Eike Beer <eike-kernel@sf-tec.de>: (5 patches)
  parisc: move definition of PAGE0 to asm/page.h
  parisc: add missing include of asm/page.h to asm/pgtable.h
  parisc: drop include of asm/pdc.h from asm/hardware.h
  parisc: add missing forward declarations in asm/hardware.h
  parisc: add missing includes in asm/spinlock.h
parents 7c283324 4a8a0788

arch/parisc/include/asm/hardware.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _PARISC_HARDWARE_H

#define _PARISC_HARDWARE_H





#include <linux/mod_devicetable.h>

#include <linux/mod_devicetable.h>

#include <asm/pdc.h>





#define HWTYPE_ANY_ID		PA_HWTYPE_ANY_ID

#define HWTYPE_ANY_ID		PA_HWTYPE_ANY_ID

#define HVERSION_ANY_ID		PA_HVERSION_ANY_ID

#define HVERSION_ANY_ID		PA_HVERSION_ANY_ID
@@ -95,12 +94,14 @@ struct bc_module { 
#define HPHW_MC	       15

#define HPHW_MC	       15

#define HPHW_FAULTY    31

#define HPHW_FAULTY    31





struct parisc_device_id;





/* hardware.c: */

/* hardware.c: */

extern const char *parisc_hardware_description(struct parisc_device_id *id);

extern const char *parisc_hardware_description(struct parisc_device_id *id);

extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);

extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);





struct pci_dev;

struct pci_dev;

struct hardware_path;





/* drivers.c: */

/* drivers.c: */

extern struct parisc_device *alloc_pa_dev(unsigned long hpa,

extern struct parisc_device *alloc_pa_dev(unsigned long hpa,

arch/parisc/include/asm/page.h

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




#include <asm-generic/memory_model.h>

#include <asm-generic/memory_model.h>

#include <asm-generic/getorder.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 */
 
#endif /* _PARISC_PAGE_H */

arch/parisc/include/asm/pdc.h

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




#ifdef __KERNEL__

#ifdef __KERNEL__





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



extern int pdc_type;

extern int pdc_type;





/* Values for pdc_type */

/* Values for pdc_type */
@@ -677,11 +675,6 @@ static inline char * os_id_to_string(u16 os_id) { 




#endif /* __KERNEL__ */

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

/* flags of the device_path */

#define	PF_AUTOBOOT	0x80

#define	PF_AUTOBOOT	0x80

#define	PF_AUTOSEARCH	0x40

#define	PF_AUTOSEARCH	0x40

arch/parisc/include/asm/pgtable.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,8 @@ struct vm_area_struct; 




#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLY__ */





#include <asm/page.h>



#define pte_ERROR(e) \

#define pte_ERROR(e) \

	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))

	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))

#define pmd_ERROR(e) \

#define pmd_ERROR(e) \

arch/parisc/include/asm/spinlock.h

+2 −0
Original line number Original line Diff line number Diff line 
#ifndef __ASM_SPINLOCK_H

#ifndef __ASM_SPINLOCK_H

#define __ASM_SPINLOCK_H

#define __ASM_SPINLOCK_H





#include <asm/barrier.h>

#include <asm/ldcw.h>

#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/spinlock_types.h>

#include <asm/spinlock_types.h>