diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:09:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:09:30 -0500 |
| commit | 3995f4c5327595b51482bdac8c189736262eb6e0 (patch) | |
| tree | ef768d0ecf243a2376bfc646b847964313146d3e /include/asm-arm/memory.h | |
| parent | 05814450070f13b671fc9dbf89477677aa0258cb (diff) | |
| parent | fe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/memory.h')
| -rw-r--r-- | include/asm-arm/memory.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index 3e572364ee73..3d7f08bd9030 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h | |||
| @@ -58,6 +58,12 @@ | |||
| 58 | #endif | 58 | #endif |
| 59 | 59 | ||
| 60 | /* | 60 | /* |
| 61 | * Convert a physical address to a Page Frame Number and back | ||
| 62 | */ | ||
| 63 | #define __phys_to_pfn(paddr) ((paddr) >> PAGE_SHIFT) | ||
| 64 | #define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) | ||
| 65 | |||
| 66 | /* | ||
| 61 | * The module space lives between the addresses given by TASK_SIZE | 67 | * The module space lives between the addresses given by TASK_SIZE |
| 62 | * and PAGE_OFFSET - it must be within 32MB of the kernel text. | 68 | * and PAGE_OFFSET - it must be within 32MB of the kernel text. |
| 63 | */ | 69 | */ |