diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /include/asm-generic/memory_model.h | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'include/asm-generic/memory_model.h')
| -rw-r--r-- | include/asm-generic/memory_model.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index 8078cbd2c016..30d8d33491dd 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | #define __page_to_pfn(pg) \ | 54 | #define __page_to_pfn(pg) \ |
| 55 | ({ struct page *__pg = (pg); \ | 55 | ({ struct page *__pg = (pg); \ |
| 56 | int __sec = page_to_section(__pg); \ | 56 | int __sec = page_to_section(__pg); \ |
| 57 | __pg - __section_mem_map_addr(__nr_to_section(__sec)); \ | 57 | (unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec))); \ |
| 58 | }) | 58 | }) |
| 59 | 59 | ||
| 60 | #define __pfn_to_page(pfn) \ | 60 | #define __pfn_to_page(pfn) \ |