diff options
| author | Dmitry Torokhov | 2005-06-01 02:37:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov | 2005-06-01 02:37:23 -0500 |
| commit | 9d5432979951c8761c2b4517007039b9bcc1c110 (patch) | |
| tree | 9441cb1cd4a7674a2292936bfb42514f33d24cd4 /include/asm-um/page.h | |
| parent | a913829e90e2af7a6e98f5aadcc9fec4dcf1ef64 (diff) | |
| parent | 21e3024cbddb712f6a078bf4132d7682d3c4e35e (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-um/page.h')
| -rw-r--r-- | include/asm-um/page.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-um/page.h b/include/asm-um/page.h index 504ea8e486b0..5afee8a8cdf3 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) |