The patch titled
mspec build fix
has been added to the -mm tree. Its filename is
mspec-build-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mspec build fix
From: Jes Sorensen <jes@xxxxxxx>
Fix MSPEC driver to build for non SN2 enabled configs as the driver should
work in cached and uncached modes (no fetchop) on these systems. In
addition make MSPEC select IA64_UNCACHED_ALLOCATOR, which is required for
it.
Signed-off-by: Jes Sorensen <jes@xxxxxxx>
Cc: Fernando Luis Vzquez Cao <fernando@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/Kconfig | 1 +
drivers/char/mspec.c | 8 +++++++-
include/asm-ia64/sn/addrs.h | 6 +++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff -puN drivers/char/Kconfig~mspec-build-fix drivers/char/Kconfig
--- a/drivers/char/Kconfig~mspec-build-fix
+++ a/drivers/char/Kconfig
@@ -412,6 +412,7 @@ config SGI_MBCS
config MSPEC
tristate "Memory special operations driver"
depends on IA64
+ select IA64_UNCACHED_ALLOCATOR
help
If you have an ia64 and you want to enable memory special
operations support (formerly known as fetchop), say Y here,
diff -puN drivers/char/mspec.c~mspec-build-fix drivers/char/mspec.c
--- a/drivers/char/mspec.c~mspec-build-fix
+++ a/drivers/char/mspec.c
@@ -72,7 +72,11 @@ enum {
MSPEC_UNCACHED
};
+#ifdef CONFIG_SGI_SN
static int is_sn2;
+#else
+#define is_sn2 0
+#endif
/*
* One of these structures is allocated when an mspec region is mmaped. The
@@ -211,7 +215,7 @@ mspec_nopfn(struct vm_area_struct *vma,
if (vdata->type == MSPEC_FETCHOP)
paddr = TO_AMO(maddr);
else
- paddr = __pa(TO_CAC(maddr));
+ paddr = maddr & ~__IA64_UNCACHED_OFFSET;
pfn = paddr >> PAGE_SHIFT;
@@ -335,6 +339,7 @@ mspec_init(void)
* The fetchop device only works on SN2 hardware, uncached and cached
* memory drivers should both be valid on all ia64 hardware
*/
+#ifdef CONFIG_SGI_SN
if (ia64_platform_is("sn2")) {
is_sn2 = 1;
if (is_shub2()) {
@@ -363,6 +368,7 @@ mspec_init(void)
goto free_scratch_pages;
}
}
+#endif
ret = misc_register(&cached_miscdev);
if (ret) {
printk(KERN_ERR "%s: failed to register device %i\n",
diff -puN include/asm-ia64/sn/addrs.h~mspec-build-fix include/asm-ia64/sn/addrs.h
--- a/include/asm-ia64/sn/addrs.h~mspec-build-fix
+++ a/include/asm-ia64/sn/addrs.h
@@ -136,9 +136,13 @@
*/
#define TO_PHYS(x) (TO_PHYS_MASK & (x))
#define TO_CAC(x) (CAC_BASE | TO_PHYS(x))
+#ifdef CONFIG_SGI_SN
#define TO_AMO(x) (AMO_BASE | TO_PHYS(x))
#define TO_GET(x) (GET_BASE | TO_PHYS(x))
-
+#else
+#define TO_AMO(x) ({ BUG(); x; })
+#define TO_GET(x) ({ BUG(); x; })
+#endif
/*
* Covert from processor physical address to II/TIO physical address:
_
Patches currently in -mm which might be from jes@xxxxxxx are
origin.patch
mspec-build-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
