diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /arch/mips/include/asm/mmzone.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'arch/mips/include/asm/mmzone.h')
| -rw-r--r-- | arch/mips/include/asm/mmzone.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mmzone.h b/arch/mips/include/asm/mmzone.h new file mode 100644 index 000000000000..f53ec54c92ff --- /dev/null +++ b/arch/mips/include/asm/mmzone.h | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* | ||
| 2 | * Written by Kanoj Sarcar (kanoj@sgi.com) Aug 99 | ||
| 3 | * Rewritten for Linux 2.6 by Christoph Hellwig (hch@lst.de) Jan 2004 | ||
| 4 | */ | ||
| 5 | #ifndef _ASM_MMZONE_H_ | ||
| 6 | #define _ASM_MMZONE_H_ | ||
| 7 | |||
| 8 | #include <asm/page.h> | ||
| 9 | #include <mmzone.h> | ||
| 10 | |||
| 11 | #ifdef CONFIG_DISCONTIGMEM | ||
| 12 | |||
| 13 | #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) | ||
| 14 | |||
| 15 | #endif /* CONFIG_DISCONTIGMEM */ | ||
| 16 | |||
| 17 | #endif /* _ASM_MMZONE_H_ */ | ||