--- zzzz-none-000/linux-2.6.19.2/drivers/char/mspec.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/char/mspec.c	2007-01-11 07:38:19.000000000 +0000
@@ -72,11 +72,7 @@
 	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
@@ -215,7 +211,7 @@
 	if (vdata->type == MSPEC_FETCHOP)
 		paddr = TO_AMO(maddr);
 	else
-		paddr = maddr & ~__IA64_UNCACHED_OFFSET;
+		paddr = __pa(TO_CAC(maddr));
 
 	pfn = paddr >> PAGE_SHIFT;
 
@@ -339,7 +335,6 @@
 	 * 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()) {
@@ -368,7 +363,6 @@
 			goto free_scratch_pages;
 		}
 	}
-#endif
 	ret = misc_register(&cached_miscdev);
 	if (ret) {
 		printk(KERN_ERR "%s: failed to register device %i\n",