From d7083174a2ca5ff80de773d2054caee2f77bf9f9 Mon Sep 17 00:00:00 2001 From: Jay Estabrook Date: Fri, 1 Jun 2007 00:47:05 -0700 Subject: 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 Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-alpha/core_wildfire.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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; } -- cgit v1.2.3