diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
| commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
| tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /include/asm-x86/highmem.h | |
| parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/softlockup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/highmem.h')
| -rw-r--r-- | include/asm-x86/highmem.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86/highmem.h b/include/asm-x86/highmem.h index e153f3b44774..4514b16cc723 100644 --- a/include/asm-x86/highmem.h +++ b/include/asm-x86/highmem.h | |||
| @@ -74,6 +74,9 @@ struct page *kmap_atomic_to_page(void *ptr); | |||
| 74 | 74 | ||
| 75 | #define flush_cache_kmaps() do { } while (0) | 75 | #define flush_cache_kmaps() do { } while (0) |
| 76 | 76 | ||
| 77 | extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn, | ||
| 78 | unsigned long end_pfn); | ||
| 79 | |||
| 77 | #endif /* __KERNEL__ */ | 80 | #endif /* __KERNEL__ */ |
| 78 | 81 | ||
| 79 | #endif /* _ASM_HIGHMEM_H */ | 82 | #endif /* _ASM_HIGHMEM_H */ |