diff options
| author | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
| commit | 97a2847d064e2fdd2e3cd4ff14cad2f377f0677a (patch) | |
| tree | e49ce105dc6febc25dc3ceba6070ea3998c7330c /arch/arm/include/asm/page.h | |
| parent | e99a03c6f50a699d63b5751e3e88f84e43b037a7 (diff) | |
| parent | d2d0395fd1778d4bf714adc5bfd23a5d748d7802 (diff) | |
| download | talos-op-linux-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.tar.gz talos-op-linux-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.zip | |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing
Reiserfs locking fixes.
Diffstat (limited to 'arch/arm/include/asm/page.h')
| -rw-r--r-- | arch/arm/include/asm/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index 6363f3d1d505..4355f0ec44d6 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h @@ -142,7 +142,9 @@ extern void __cpu_copy_user_highpage(struct page *to, struct page *from, #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) extern void copy_page(void *to, const void *from); +#ifdef CONFIG_KUSER_HELPERS #define __HAVE_ARCH_GATE_AREA 1 +#endif #ifdef CONFIG_ARM_LPAE #include <asm/pgtable-3level-types.h> |
