diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:33:11 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:33:11 +0000 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /mm/highmem.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'mm/highmem.c')
| -rw-r--r-- | mm/highmem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 781e754a75a..693394daa2e 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -29,6 +29,11 @@ #include <linux/kgdb.h> #include <asm/tlbflush.h> + +#if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32) +DEFINE_PER_CPU(int, __kmap_atomic_idx); +#endif + /* * Virtual_count is not a pure "count". * 0 means that it is not mapped, and has not been mapped @@ -43,7 +48,6 @@ unsigned long totalhigh_pages __read_mostly; EXPORT_SYMBOL(totalhigh_pages); -DEFINE_PER_CPU(int, __kmap_atomic_idx); EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx); unsigned int nr_free_highpages (void) |