summaryrefslogtreecommitdiffstats
path: root/include/asm-um/page.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-05-28 15:51:53 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-28 16:46:11 -0700
commitb9e0d0696c9e86d4e40b23039feefb8c377cb524 (patch)
tree028004d8d06b9d5f8f6202c616a3e6f0063505ee /include/asm-um/page.h
parent226d97ec3e47b54ecc13f6ea3c300dc6a1b290c3 (diff)
downloadop-kernel-dev-b9e0d0696c9e86d4e40b23039feefb8c377cb524.zip
op-kernel-dev-b9e0d0696c9e86d4e40b23039feefb8c377cb524.tar.gz
[PATCH] uml: fix a couple of warnings
Eliminate an unused variable warning in ptrace.c and a size mismatch warning by adding a cast to __pa. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um/page.h')
-rw-r--r--include/asm-um/page.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-um/page.h b/include/asm-um/page.h
index 504ea8e..5afee8a 100644
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
@@ -98,7 +98,13 @@ extern unsigned long uml_physmem;
extern unsigned long to_phys(void *virt);
extern void *to_virt(unsigned long phys);
-#define __pa(virt) to_phys((void *) virt)
+
+/* Cast to unsigned long before casting to void * to avoid a warning from
+ * mmap_kmem about cutting a long long down to a void *. Not sure that
+ * casting is the right thing, but 32-bit UML can't have 64-bit virtual
+ * addresses
+ */
+#define __pa(virt) to_phys((void *) (unsigned long) virt)
#define __va(phys) to_virt((unsigned long) phys)
#define page_to_pfn(page) ((page) - mem_map)
OpenPOWER on IntegriCloud