Patchwork sparc: fix hardirq.h removal fallout

login
register
mail settings
Submitter Sam Ravnborg
Date Dec. 21, 2008, 8:45 p.m.
Message ID <20081221204559.GB18284@uranus.ravnborg.org>
Download mbox | patch
Permalink /patch/15175/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sam Ravnborg - Dec. 21, 2008, 8:45 p.m.
When hardirq.h are removed from asm-generic/local.h a few
bits fails to build.  Fix these upfront.
Reported by Alexey.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
---

When I removed hardirq.h from local.h I had to apply
a similar patch like this to drivers/base/topology.c
but I assume this is dealt with before the removal
hits mainline.

Based on the assumption that the topology.c change
is not sparc specific but I did not test this.

The following changes are sparc specific and needed for
sparc64 when hardirq is removed form local.h.

	Sam

 arch/sparc/kernel/mdesc.c |    1 +
 arch/sparc/kernel/sysfs.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
David Miller - Dec. 26, 2008, 11:33 p.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sun, 21 Dec 2008 21:45:59 +0100

> When hardirq.h are removed from asm-generic/local.h a few
> bits fails to build.  Fix these upfront.
> Reported by Alexey.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Applied to sparc-next-2.6, thanks Sam.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index dde52bc..3c539a6 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -11,6 +11,7 @@ 
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
 
+#include <asm/cpudata.h>
 #include <asm/hypervisor.h>
 #include <asm/mdesc.h>
 #include <asm/prom.h>
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 84e5ce1..d28f496 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -8,6 +8,7 @@ 
 #include <linux/percpu.h>
 #include <linux/init.h>
 
+#include <asm/cpudata.h>
 #include <asm/hypervisor.h>
 #include <asm/spitfire.h>