diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/arc/mm/highmem.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/arc/mm/highmem.c')
| -rw-r--r-- | arch/arc/mm/highmem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c index 04f83322c9fd..77ff64a874a1 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c | |||
| @@ -61,6 +61,7 @@ void *kmap(struct page *page) | |||
| 61 | 61 | ||
| 62 | return kmap_high(page); | 62 | return kmap_high(page); |
| 63 | } | 63 | } |
| 64 | EXPORT_SYMBOL(kmap); | ||
| 64 | 65 | ||
| 65 | void *kmap_atomic(struct page *page) | 66 | void *kmap_atomic(struct page *page) |
| 66 | { | 67 | { |