summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJay Estabrook <jay.estabrook@hp.com>2007-06-01 00:47:05 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 08:18:29 -0700
commitd7083174a2ca5ff80de773d2054caee2f77bf9f9 (patch)
treec4e6c7e1b9a80c7a3933dfb49baf64ff13e8c38b /include
parent5ae0b6c704877d0c6b95dd7c3b1907770ca28b79 (diff)
ALPHA: misc fixes
1. arch/alpha/Kconfig several adjustments: a) additions to the systems list and cleanup of same b) change limits of NR_CPUS and make dep. on platform Note that MARVEL support is limited to 32 CPUs whan using 42-bit KSEG - one needs 48-bit KSEG to handle up to 64, and we've never supported 48-bit KSEG. 2. include/asm-alpha/core_wildfire.h fix a typo that undoubtedly prevents WILDFIRE support from working Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-alpha/core_wildfire.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/core_wildfire.h b/include/asm-alpha/core_wildfire.h
index 12af803d445..cd562f544ba 100644
--- a/include/asm-alpha/core_wildfire.h
+++ b/include/asm-alpha/core_wildfire.h
@@ -295,7 +295,7 @@ __EXTERN_INLINE int wildfire_is_ioaddr(unsigned long addr)
__EXTERN_INLINE int wildfire_is_mmio(const volatile void __iomem *xaddr)
{
- unsigned long addr = (unsigned long)addr;
+ unsigned long addr = (unsigned long)xaddr;
return (addr & 0x100000000UL) == 0;
}