diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:46:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:46:28 -0400 |
| commit | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (patch) | |
| tree | 91e06602f4d3abb6812ea8c9bc9ba4501e14c84e /include/asm-mips/mmzone.h | |
| parent | 0274aa2506fd2fe89a58dd6cd64d3b3f7b976af8 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-mips/mmzone.h')
| -rw-r--r-- | include/asm-mips/mmzone.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-mips/mmzone.h b/include/asm-mips/mmzone.h index 29ee13be0b2a..d721143dbd47 100644 --- a/include/asm-mips/mmzone.h +++ b/include/asm-mips/mmzone.h | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | #include <asm/page.h> | 8 | #include <asm/page.h> |
| 9 | #include <mmzone.h> | 9 | #include <mmzone.h> |
| 10 | 10 | ||
| 11 | #ifdef CONFIG_DISCONTIGMEM | ||
| 12 | |||
| 11 | #define kvaddr_to_nid(kvaddr) pa_to_nid(__pa(kvaddr)) | 13 | #define kvaddr_to_nid(kvaddr) pa_to_nid(__pa(kvaddr)) |
| 12 | #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) | 14 | #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) |
| 13 | 15 | ||
| @@ -36,4 +38,6 @@ | |||
| 36 | /* XXX: FIXME -- wli */ | 38 | /* XXX: FIXME -- wli */ |
| 37 | #define kern_addr_valid(addr) (0) | 39 | #define kern_addr_valid(addr) (0) |
| 38 | 40 | ||
| 41 | #endif /* CONFIG_DISCONTIGMEM */ | ||
| 42 | |||
| 39 | #endif /* _ASM_MMZONE_H_ */ | 43 | #endif /* _ASM_MMZONE_H_ */ |