diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 08:52:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 08:52:53 -0800 |
| commit | 48beb121f0600070184a4265bae77e7d8382f747 (patch) | |
| tree | 278de829018e6e28be16da8817c18dd92f45dc73 /mm/nommu.c | |
| parent | dbf3b7ddbaaf65c7da9b99a686b25fd06fd75073 (diff) | |
| parent | 7b02190c27091f7b4614d9a655981ae20520d22c (diff) | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/debug_pagealloc: fix build failure on ppc and some other archs
nilfs2: fix deadlock of segment constructor over I_SYNC flag
MAINTAINERS: remove SUPERH website
memcg, shmem: fix shmem migration to use lrucare
mm: export "high_memory" symbol on !MMU
.mailmap: update Konstantin Khlebnikov's email address
mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index b51eadf6d952..28bd8c4dff6f 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -59,6 +59,7 @@ #endif void *high_memory; +EXPORT_SYMBOL(high_memory); struct page *mem_map; unsigned long max_mapnr; unsigned long highest_memmap_pfn; |