Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'parisc' (PA-RISC compile fixes)
Merge PA-RISC compile fixes from Rolf Eike Beer:
"Since commit d66acc39c7ce ("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
+17
-8
+2
-1
arch/parisc/include/asm/hardware.h
+2
-1
arch/parisc/include/asm/hardware.h
···
2
2
#define _PARISC_HARDWARE_H
3
3
4
4
#include <linux/mod_devicetable.h>
5
-
#include <asm/pdc.h>
6
5
7
6
#define HWTYPE_ANY_ID PA_HWTYPE_ANY_ID
8
7
#define HVERSION_ANY_ID PA_HVERSION_ANY_ID
···
94
95
#define HPHW_MC 15
95
96
#define HPHW_FAULTY 31
96
97
98
+
struct parisc_device_id;
97
99
98
100
/* hardware.c: */
99
101
extern const char *parisc_hardware_description(struct parisc_device_id *id);
100
102
extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);
101
103
102
104
struct pci_dev;
105
+
struct hardware_path;
103
106
104
107
/* drivers.c: */
105
108
extern struct parisc_device *alloc_pa_dev(unsigned long hpa,
+6
arch/parisc/include/asm/page.h
+6
arch/parisc/include/asm/page.h
···
160
160
161
161
#include <asm-generic/memory_model.h>
162
162
#include <asm-generic/getorder.h>
163
+
#include <asm/pdc.h>
164
+
165
+
#define PAGE0 ((struct zeropage *)__PAGE_OFFSET)
166
+
167
+
/* DEFINITION OF THE ZERO-PAGE (PAG0) */
168
+
/* based on work by Jason Eckhardt (jason@equator.com) */
163
169
164
170
#endif /* _PARISC_PAGE_H */
-7
arch/parisc/include/asm/pdc.h
-7
arch/parisc/include/asm/pdc.h
···
343
343
344
344
#ifdef __KERNEL__
345
345
346
-
#include <asm/page.h> /* for __PAGE_OFFSET */
347
-
348
346
extern int pdc_type;
349
347
350
348
/* Values for pdc_type */
···
674
676
}
675
677
676
678
#endif /* __KERNEL__ */
677
-
678
-
#define PAGE0 ((struct zeropage *)__PAGE_OFFSET)
679
-
680
-
/* DEFINITION OF THE ZERO-PAGE (PAG0) */
681
-
/* based on work by Jason Eckhardt (jason@equator.com) */
682
679
683
680
/* flags of the device_path */
684
681
#define PF_AUTOBOOT 0x80
+2
arch/parisc/include/asm/pgtable.h
+2
arch/parisc/include/asm/pgtable.h
+2
arch/parisc/include/asm/spinlock.h
+2
arch/parisc/include/asm/spinlock.h
+1
arch/parisc/kernel/pdc_cons.c
+1
arch/parisc/kernel/pdc_cons.c
+1
arch/parisc/kernel/time.c
+1
arch/parisc/kernel/time.c
+1
drivers/parisc/sba_iommu.c
+1
drivers/parisc/sba_iommu.c
···
44
44
#include <asm/ropes.h>
45
45
#include <asm/mckinley.h> /* for proc_mckinley_root */
46
46
#include <asm/runway.h> /* for proc_runway_root */
47
+
#include <asm/page.h> /* for PAGE0 */
47
48
#include <asm/pdc.h> /* for PDC_MODEL_* */
48
49
#include <asm/pdcpat.h> /* for is_pdc_pat() */
49
50
#include <asm/parisc-device.h>