diff options
| author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
| commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
| tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /include/asm-um/page.h | |
| parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
| parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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; | |||
| 98 | 98 | ||
| 99 | extern unsigned long to_phys(void *virt); | 99 | extern unsigned long to_phys(void *virt); |
| 100 | extern void *to_virt(unsigned long phys); | 100 | extern void *to_virt(unsigned long phys); |
| 101 | #define __pa(virt) to_phys((void *) virt) | 101 | |
| 102 | /* Cast to unsigned long before casting to void * to avoid a warning from | ||
| 103 | * mmap_kmem about cutting a long long down to a void *. Not sure that | ||
| 104 | * casting is the right thing, but 32-bit UML can't have 64-bit virtual | ||
| 105 | * addresses | ||
| 106 | */ | ||
| 107 | #define __pa(virt) to_phys((void *) (unsigned long) virt) | ||
| 102 | #define __va(phys) to_virt((unsigned long) phys) | 108 | #define __va(phys) to_virt((unsigned long) phys) |
| 103 | 109 | ||
| 104 | #define page_to_pfn(page) ((page) - mem_map) | 110 | #define page_to_pfn(page) ((page) - mem_map) |