projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad058e9
)
MIPS: IP27: Fix clash with NMI_OFFSET from hardirq.h
author
Thomas Bogendoerfer
<tsbogend@alpha.franken.de>
Tue, 21 Apr 2009 21:31:12 +0000
(23:31 +0200)
committer
Ralf Baechle
<ralf@linux-mips.org>
Thu, 14 May 2009 12:50:27 +0000
(13:50 +0100)
There was already a define for NMI_OFFSET in asm/sn/addr.h, which now
clashes with linux/hardirq.h. Rename the one in sn/addr.h to fix IP27
builds..
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/sn/addrs.h
patch
|
blob
|
history
diff --git
a/arch/mips/include/asm/sn/addrs.h
b/arch/mips/include/asm/sn/addrs.h
index
fec9bdd
..
3a56d90
100644
(file)
--- a/
arch/mips/include/asm/sn/addrs.h
+++ b/
arch/mips/include/asm/sn/addrs.h
@@
-359,11
+359,11
@@
TO_NODE_UNCAC((nasid), LAUNCH_OFFSET(nasid, slice))
#define LAUNCH_SIZE(nasid) KLD_LAUNCH(nasid)->size
-#define
NMI_OFFSET(nasid, slice)
\
+#define
SN_NMI_OFFSET(nasid, slice)
\
(KLD_NMI(nasid)->offset + \
KLD_NMI(nasid)->stride * (slice))
#define NMI_ADDR(nasid, slice) \
- TO_NODE_UNCAC((nasid), NMI_OFFSET(nasid, slice))
+ TO_NODE_UNCAC((nasid),
SN_
NMI_OFFSET(nasid, slice))
#define NMI_SIZE(nasid) KLD_NMI(nasid)->size
#define KLCONFIG_OFFSET(nasid) KLD_KLCONFIG(nasid)->offset