* [PATCH 0/6] PA-RISC: fix compile
@ 2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
0 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 17:52 UTC (permalink / raw)
To: linux-parisc
Cc: linux-kernel, David Howells, Arnd Bergmann, H. Peter Anvin,
James Bottomley
[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]
Since d66acc39c7cee323733c8503b9de1821a56dff7e (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.
Rolf Eike Beer (6):
use linux/bitops.h instead of linux/log2.h to get fls()
parisc: add missing includes in asm/spinlock.h
parisc: add missing forward declarations in asm/hardware.h
parisc: drop include of asm/pdc.h from asm/hardware.h
parisc: add missing include of asm/page.h to asm/pgtable.h
parisc: move definition of PAGE0 to asm/page.h
arch/parisc/include/asm/hardware.h | 3 ++-
arch/parisc/include/asm/page.h | 6 ++++++
arch/parisc/include/asm/pdc.h | 7 -------
arch/parisc/include/asm/pgtable.h | 2 ++
arch/parisc/include/asm/spinlock.h | 2 ++
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 ++
include/asm-generic/getorder.h | 2 +-
10 files changed, 18 insertions(+), 9 deletions(-)
--
1.7.9.2
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/6] PA-RISC: fix compile
@ 2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
0 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer, eike-kernel @ 2012-04-21 17:52 UTC (permalink / raw)
To: linux-parisc
Cc: linux-kernel, David Howells, Arnd Bergmann, H. Peter Anvin,
James Bottomley
[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]
Since d66acc39c7cee323733c8503b9de1821a56dff7e (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.
Rolf Eike Beer (6):
use linux/bitops.h instead of linux/log2.h to get fls()
parisc: add missing includes in asm/spinlock.h
parisc: add missing forward declarations in asm/hardware.h
parisc: drop include of asm/pdc.h from asm/hardware.h
parisc: add missing include of asm/page.h to asm/pgtable.h
parisc: move definition of PAGE0 to asm/page.h
arch/parisc/include/asm/hardware.h | 3 ++-
arch/parisc/include/asm/page.h | 6 ++++++
arch/parisc/include/asm/pdc.h | 7 -------
arch/parisc/include/asm/pgtable.h | 2 ++
arch/parisc/include/asm/spinlock.h | 2 ++
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 ++
include/asm-generic/getorder.h | 2 +-
10 files changed, 18 insertions(+), 9 deletions(-)
--
1.7.9.2
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/6] parisc: add missing forward declarations in asm/hardware.h
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
(?)
@ 2012-04-21 18:15 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:15 UTC (permalink / raw)
To: linux-parisc
=46ixes this warnings:
In file included from /home/buildbot/repos/linux/arch/parisc/include/as=
m/processor.h:15:0,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/spinlock.h:4,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/atomic.h:20,
from /home/buildbot/repos/linux/include/linux/atomic.h=
:4,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/bitops.h:11,
from /home/buildbot/repos/linux/include/linux/bitops.h=
:22,
from /home/buildbot/repos/linux/include/linux/kernel.h=
:19,
from /home/buildbot/repos/linux/include/linux/sched.h:=
55,
from /home/buildbot/repos/linux/arch/parisc/kernel/asm=
-offsets.c:31:
/home/buildbot/repos/linux/arch/parisc/include/asm/hardware.h:106:10: w=
arning: =E2=80=98struct hardware_path=E2=80=99 declared inside paramete=
r list [enabled by default]
/home/buildbot/repos/linux/arch/parisc/include/asm/hardware.h:106:10: w=
arning: its scope is only this definition or declaration, which is prob=
ably not what you want [enabled by default]
/home/buildbot/repos/linux/arch/parisc/include/asm/hardware.h:116:59: w=
arning: =E2=80=98struct hardware_path=E2=80=99 declared inside paramete=
r list [enabled by default]
/home/buildbot/repos/linux/arch/parisc/include/asm/hardware.h:118:47: w=
arning: =E2=80=98struct hardware_path=E2=80=99 declared inside paramete=
r list [enabled by default]
/home/buildbot/repos/linux/arch/parisc/include/asm/hardware.h:119:57: w=
arning: =E2=80=98struct hardware_path=E2=80=99 declared inside paramete=
r list [enabled by default]
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
arch/parisc/include/asm/hardware.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/a=
sm/hardware.h
index 4e96268..036e703 100644
--- a/arch/parisc/include/asm/hardware.h
+++ b/arch/parisc/include/asm/hardware.h
@@ -95,12 +95,14 @@ struct bc_module {
#define HPHW_MC 15
#define HPHW_FAULTY 31
=20
+struct parisc_device_id;
=20
/* hardware.c: */
extern const char *parisc_hardware_description(struct parisc_device_id=
*id);
extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);
=20
struct pci_dev;
+struct hardware_path;
=20
/* drivers.c: */
extern struct parisc_device *alloc_pa_dev(unsigned long hpa,
--=20
1.7.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc"=
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/6] parisc: drop include of asm/pdc.h from asm/hardware.h
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
(?)
(?)
@ 2012-04-21 18:17 ` Rolf Eike Beer
2012-04-24 1:34 ` Grant Grundler
-1 siblings, 1 reply; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:17 UTC (permalink / raw)
To: linux-parisc
It seems none of the symbols defined by pdc.h is needed, but it introdu=
ces an
include loop causing compile errors:
In file included from /home/buildbot/repos/linux/arch/parisc/include/as=
m/spinlock.h:4:0,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/atomic.h:20,
from /home/buildbot/repos/linux/include/linux/atomic.h=
:4,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/bitops.h:56,
from /home/buildbot/repos/linux/include/linux/bitops.h=
:35,
from /home/buildbot/repos/linux/include/asm-generic/ge=
torder.h:7,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/page.h:162,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/pdc.h:346,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/hardware.h:5,
from /home/buildbot/repos/linux/arch/parisc/kernel/har=
dware.c:30:
/home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:74:16: e=
rror: field =E2=80=98cpu_type=E2=80=99 has incomplete type
/home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:77:20: e=
rror: field =E2=80=98model=E2=80=99 has incomplete type
/home/buildbot/repos/linux/arch/parisc/include/asm/processor.h: In func=
tion =E2=80=98parisc_requires_coherency=E2=80=99:
/home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:349:36: =
error: =E2=80=98mako=E2=80=99 undeclared (first use in this function)
/home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:349:36: =
note: each undeclared identifier is reported only once for each functio=
n it appears in
/home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:350:30: =
error: =E2=80=98mako2=E2=80=99 undeclared (first use in this function)
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
arch/parisc/include/asm/hardware.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/a=
sm/hardware.h
index 036e703..d1d864b 100644
--- a/arch/parisc/include/asm/hardware.h
+++ b/arch/parisc/include/asm/hardware.h
@@ -2,7 +2,6 @@
#define _PARISC_HARDWARE_H
=20
#include <linux/mod_devicetable.h>
-#include <asm/pdc.h>
=20
#define HWTYPE_ANY_ID PA_HWTYPE_ANY_ID
#define HVERSION_ANY_ID PA_HVERSION_ANY_ID
--=20
1.7.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc"=
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/6] parisc: add missing include of asm/page.h to asm/pgtable.h
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (2 preceding siblings ...)
(?)
@ 2012-04-21 18:20 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:20 UTC (permalink / raw)
To: linux-parisc
Fixes these errors:
In file included from /home/buildbot/repos/linux/arch/parisc/include/asm/io.h:5:0,
from /home/buildbot/repos/linux/include/linux/io.h:22,
from /home/buildbot/repos/linux/include/linux/pci.h:54,
from /home/buildbot/repos/linux/arch/parisc/kernel/setup.c:35:
/home/buildbot/repos/linux/arch/parisc/include/asm/pgtable.h:92:6: warning: "PAGE_SHIFT" is not defined [-Wundef]
/home/buildbot/repos/linux/arch/parisc/include/asm/pgtable.h:92:6: warning: "PAGE_SHIFT" is not defined [-Wundef]
/home/buildbot/repos/linux/arch/parisc/include/asm/pgtable.h:92:6: warning: "BITS_PER_PTE_ENTRY" is not defined [-Wundef]
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
arch/parisc/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 22dadeb..ee99f23 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -44,6 +44,8 @@ struct vm_area_struct;
#endif /* !__ASSEMBLY__ */
+#include <asm/page.h>
+
#define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
#define pmd_ERROR(e) \
--
1.7.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 6/6] parisc: move definition of PAGE0 to asm/page.h
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (3 preceding siblings ...)
(?)
@ 2012-04-21 18:22 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:22 UTC (permalink / raw)
To: linux-parisc
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/ge=
torder.h:7,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/page.h:162,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/pdc.h:346,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/processor.h:16,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/spinlock.h:6,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/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=
=2Ec:11:
/home/buildbot/repos/linux/arch/parisc/include/asm/bitops.h: In functio=
n =E2=80=98set_bit=E2=80=99:
/home/buildbot/repos/linux/arch/parisc/include/asm/bitops.h:82:2: error=
: implicit declaration of function =E2=80=98_atomic_spin_lock_irqsave=E2=
=80=99 [-Werror=3Dimplicit-function-declaration]
/home/buildbot/repos/linux/arch/parisc/include/asm/bitops.h:84:2: error=
: implicit declaration of function =E2=80=98_atomic_spin_unlock_irqrest=
ore=E2=80=99 [-Werror=3Dimplicit-function-declaration]
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
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/p=
age.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;
=20
#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) */
=20
#endif /* _PARISC_PAGE_H */
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pd=
c.h
index 4ca510b..7f0f2d2 100644
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
@@ -343,8 +343,6 @@
=20
#ifdef __KERNEL__
=20
-#include <asm/page.h> /* for __PAGE_OFFSET */
-
extern int pdc_type;
=20
/* Values for pdc_type */
@@ -677,11 +675,6 @@ static inline char * os_id_to_string(u16 os_id) {
=20
#endif /* __KERNEL__ */
=20
-#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_con=
s.c
index 4f00459..9bbd2a5 100644
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -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 */
=20
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 <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>
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 <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>
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/st=
icore.c
index 6468a29..39571f9 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -22,7 +22,9 @@
#include <linux/font.h>
=20
#include <asm/hardware.h>
+#include <asm/page.h>
#include <asm/parisc-device.h>
+#include <asm/pdc.h>
#include <asm/cacheflush.h>
#include <asm/grfioctl.h>
=20
--=20
1.7.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc"=
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/6] parisc: add missing includes in asm/spinlock.h
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (4 preceding siblings ...)
(?)
@ 2012-04-21 18:23 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:23 UTC (permalink / raw)
To: linux-parisc
This leads to this errors:
In file included from /home/buildbot/repos/linux/arch/parisc/include/as=
m/atomic.h:20:0,
from /home/buildbot/repos/linux/include/linux/atomic.h=
:4,
from /home/buildbot/repos/linux/arch/parisc/include/as=
m/bitops.h:56,
from /home/buildbot/repos/linux/include/linux/bitops.h=
:22,
from /home/buildbot/repos/linux/include/linux/kernel.h=
:19,
from /home/buildbot/repos/linux/include/linux/sched.h:=
55,
from /home/buildbot/repos/linux/arch/parisc/kernel/asm=
-offsets.c:31:
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h: In funct=
ion =E2=80=98arch_spin_is_locked=E2=80=99:
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h:9:2: erro=
r: implicit declaration of function =E2=80=98__ldcw_align=E2=80=99 [-We=
rror=3Dimplicit-function-declaration]
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h:9:29: war=
ning: initialization makes pointer from integer without a cast [enabled=
by default]
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h: In funct=
ion =E2=80=98arch_spin_lock_flags=E2=80=99:
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h:22:2: err=
or: implicit declaration of function =E2=80=98mb=E2=80=99 [-Werror=3Dim=
plicit-function-declaration]
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h:23:4: war=
ning: assignment makes pointer from integer without a cast [enabled by =
default]
/home/buildbot/repos/linux/arch/parisc/include/asm/spinlock.h:24:2: err=
or: implicit declaration of function =E2=80=98__ldcw=E2=80=99 [-Werror=3D=
implicit-function-declaration]
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
arch/parisc/include/asm/spinlock.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/a=
sm/spinlock.h
index 804aa28..3516e0b 100644
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
@@ -1,6 +1,8 @@
#ifndef __ASM_SPINLOCK_H
#define __ASM_SPINLOCK_H
=20
+#include <asm/barrier.h>
+#include <asm/ldcw.h>
#include <asm/processor.h>
#include <asm/spinlock_types.h>
=20
--=20
1.7.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc"=
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/6] use linux/bitops.h instead of linux/log2.h to get fls()
@ 2012-04-21 18:23 ` Rolf Eike Beer, eike-kernel
0 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:23 UTC (permalink / raw)
To: linux-parisc; +Cc: linux-kernel, David Howells, Arnd Bergmann, H. Peter Anvin
Since d66acc39c7cee323733c8503b9de1821a56dff7e (bitops: Optimise get_order())
getorder.h includes log2.h to get fls() and fls64(). They are not defined in
log2.h, but in bitops.h. This works since log2.h includes bitops.h, but we
should do it properly to not get any bad surprises if log2.h changes.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
include/asm-generic/getorder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index 65e4468..563114f 100644
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
@@ -4,7 +4,7 @@
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
-#include <linux/log2.h>
+#include <linux/bitops.h>
/*
* Runtime evaluation of get_order()
--
1.7.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/6] use linux/bitops.h instead of linux/log2.h to get fls()
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (5 preceding siblings ...)
(?)
@ 2012-04-21 18:23 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-04-21 18:23 UTC (permalink / raw)
To: linux-parisc; +Cc: linux-kernel, David Howells, Arnd Bergmann, H. Peter Anvin
Since d66acc39c7cee323733c8503b9de1821a56dff7e (bitops: Optimise get_order())
getorder.h includes log2.h to get fls() and fls64(). They are not defined in
log2.h, but in bitops.h. This works since log2.h includes bitops.h, but we
should do it properly to not get any bad surprises if log2.h changes.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
include/asm-generic/getorder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index 65e4468..563114f 100644
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
@@ -4,7 +4,7 @@
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
-#include <linux/log2.h>
+#include <linux/bitops.h>
/*
* Runtime evaluation of get_order()
--
1.7.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/6] use linux/bitops.h instead of linux/log2.h to get fls()
@ 2012-04-21 18:23 ` Rolf Eike Beer, eike-kernel
0 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer, eike-kernel @ 2012-04-21 18:23 UTC (permalink / raw)
To: linux-parisc; +Cc: linux-kernel, David Howells, Arnd Bergmann, H. Peter Anvin
Since d66acc39c7cee323733c8503b9de1821a56dff7e (bitops: Optimise get_order())
getorder.h includes log2.h to get fls() and fls64(). They are not defined in
log2.h, but in bitops.h. This works since log2.h includes bitops.h, but we
should do it properly to not get any bad surprises if log2.h changes.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
include/asm-generic/getorder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index 65e4468..563114f 100644
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
@@ -4,7 +4,7 @@
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
-#include <linux/log2.h>
+#include <linux/bitops.h>
/*
* Runtime evaluation of get_order()
--
1.7.9.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 4/6] parisc: drop include of asm/pdc.h from asm/hardware.h
2012-04-21 18:17 ` [PATCH 4/6] parisc: drop include of asm/pdc.h from asm/hardware.h Rolf Eike Beer
@ 2012-04-24 1:34 ` Grant Grundler
0 siblings, 0 replies; 14+ messages in thread
From: Grant Grundler @ 2012-04-24 1:34 UTC (permalink / raw)
To: Rolf Eike Beer; +Cc: linux-parisc
On Sat, Apr 21, 2012 at 11:17 AM, Rolf Eike Beer <eike-kernel@sf-tec.de=
> wrote:
> It seems none of the symbols defined by pdc.h is needed,
Rolf,
I looked through both files and I agree whatever dependency might have
exsisted, doesn't appear to now.
thanks for cleaning this up,
grant
> but it introduces an
> include loop causing compile errors:
>
> In file included from /home/buildbot/repos/linux/arch/parisc/include/=
asm/spinlock.h:4:0,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/arch/parisc/include/asm/atomic.h:20,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/include/linux/atomic.h:4,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/arch/parisc/include/asm/bitops.h:56,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/include/linux/bitops.h:35,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/include/asm-generic/getorder.h:7,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/arch/parisc/include/asm/page.h:162,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/arch/parisc/include/asm/pdc.h:346,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/arch/parisc/include/asm/hardware.h:5,
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 from /home/bu=
ildbot/repos/linux/arch/parisc/kernel/hardware.c:30:
> /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:74:16:=
error: field =E2=80=98cpu_type=E2=80=99 has incomplete type
> /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:77:20:=
error: field =E2=80=98model=E2=80=99 has incomplete type
> /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h: In fu=
nction =E2=80=98parisc_requires_coherency=E2=80=99:
> /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:349:36=
: error: =E2=80=98mako=E2=80=99 undeclared (first use in this function)
> /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:349:36=
: note: each undeclared identifier is reported only once for each funct=
ion it appears in
> /home/buildbot/repos/linux/arch/parisc/include/asm/processor.h:350:30=
: error: =E2=80=98mako2=E2=80=99 undeclared (first use in this function=
)
>
> Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
> ---
> =C2=A0arch/parisc/include/asm/hardware.h | =C2=A0 =C2=A01 -
> =C2=A01 file changed, 1 deletion(-)
>
> diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include=
/asm/hardware.h
> index 036e703..d1d864b 100644
> --- a/arch/parisc/include/asm/hardware.h
> +++ b/arch/parisc/include/asm/hardware.h
> @@ -2,7 +2,6 @@
> =C2=A0#define _PARISC_HARDWARE_H
>
> =C2=A0#include <linux/mod_devicetable.h>
> -#include <asm/pdc.h>
>
> =C2=A0#define HWTYPE_ANY_ID =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0PA_HWTY=
PE_ANY_ID
> =C2=A0#define HVERSION_ANY_ID =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0PA_HVERSION_ANY_ID
> --
> 1.7.9.2
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-paris=
c" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at =C2=A0http://vger.kernel.org/majordomo-info.ht=
ml
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc"=
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/6] PA-RISC: fix compile
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (7 preceding siblings ...)
(?)
@ 2012-05-01 13:28 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-05-01 13:28 UTC (permalink / raw)
To: linux-parisc
Cc: linux-kernel, David Howells, Arnd Bergmann, H. Peter Anvin,
James Bottomley
[-- Attachment #1: Type: text/plain, Size: 930 bytes --]
Rolf Eike Beer wrote:
> Since d66acc39c7cee323733c8503b9de1821a56dff7e (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.
>
> Rolf Eike Beer (6):
> use linux/bitops.h instead of linux/log2.h to get fls()
> parisc: add missing includes in asm/spinlock.h
> parisc: add missing forward declarations in asm/hardware.h
> parisc: drop include of asm/pdc.h from asm/hardware.h
> parisc: add missing include of asm/page.h to asm/pgtable.h
> parisc: move definition of PAGE0 to asm/page.h
Ping? #4 meanwhile got an ACK from Grant, I have not received any other
comments. James, could you please take the latter 5 if you don't feel
comfortable with the first one? That one is just a cleanup and makes no
difference (yet) if things work or not.
Eike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] use linux/bitops.h instead of linux/log2.h to get fls()
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (8 preceding siblings ...)
(?)
@ 2012-05-10 20:49 ` Rolf Eike Beer
-1 siblings, 0 replies; 14+ messages in thread
From: Rolf Eike Beer @ 2012-05-10 20:49 UTC (permalink / raw)
To: linux-kernel; +Cc: David Howells, Arnd Bergmann, H. Peter Anvin, torvalds
Since d66acc39c7cee323733c8503b9de1821a56dff7e (bitops: Optimise get_order())
getorder.h includes log2.h to get fls() and fls64(). They are not defined in
log2.h, but in bitops.h. This works since log2.h includes bitops.h, but we
should do it properly to not get any bad surprises if log2.h changes.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
include/asm-generic/getorder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index 65e4468..563114f 100644
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
@@ -4,7 +4,7 @@
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
-#include <linux/log2.h>
+#include <linux/bitops.h>
/*
* Runtime evaluation of get_order()
--
1.7.9.2
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] use linux/bitops.h instead of linux/log2.h to get fls()
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
` (9 preceding siblings ...)
(?)
@ 2012-05-12 9:53 ` David Howells
-1 siblings, 0 replies; 14+ messages in thread
From: David Howells @ 2012-05-12 9:53 UTC (permalink / raw)
To: Rolf Eike Beer
Cc: dhowells, linux-kernel, Arnd Bergmann, H. Peter Anvin, torvalds
Rolf Eike Beer <eike-kernel@sf-tec.de> wrote:
> -#include <linux/log2.h>
That is still required as get_order() uses ilog2().
David
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-05-12 9:53 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-21 17:52 [PATCH 0/6] PA-RISC: fix compile Rolf Eike Beer
2012-04-21 17:52 ` Rolf Eike Beer, eike-kernel
2012-04-21 18:15 ` [PATCH 3/6] parisc: add missing forward declarations in asm/hardware.h Rolf Eike Beer
2012-04-21 18:17 ` [PATCH 4/6] parisc: drop include of asm/pdc.h from asm/hardware.h Rolf Eike Beer
2012-04-24 1:34 ` Grant Grundler
2012-04-21 18:20 ` [PATCH 5/6] parisc: add missing include of asm/page.h to asm/pgtable.h Rolf Eike Beer
2012-04-21 18:22 ` [PATCH 6/6] parisc: move definition of PAGE0 to asm/page.h Rolf Eike Beer
2012-04-21 18:23 ` [PATCH 2/6] parisc: add missing includes in asm/spinlock.h Rolf Eike Beer
2012-04-21 18:23 ` [PATCH 1/6] use linux/bitops.h instead of linux/log2.h to get fls() Rolf Eike Beer
2012-04-21 18:23 ` Rolf Eike Beer
2012-04-21 18:23 ` Rolf Eike Beer, eike-kernel
2012-05-01 13:28 ` [PATCH 0/6] PA-RISC: fix compile Rolf Eike Beer
2012-05-10 20:49 ` [PATCH] use linux/bitops.h instead of linux/log2.h to get fls() Rolf Eike Beer
2012-05-12 9:53 ` David Howells
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.