aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-09-09 07:14:18 +0200
committerIngo Molnar <mingo@kernel.org>2014-09-09 07:14:18 +0200
commit9c2f65317357b21b8d289ac79c314a87dcb199f4 (patch)
tree85ec488b9272f97348d1ba5384bd99963f499013
parent961fa95879f8925e5e9e05d5f775c5cb5a0519fa (diff)
parentcc99535eb4049c730cac421d403d079593cb31ae (diff)
downloadtip-9c2f65317357b21b8d289ac79c314a87dcb199f4.tar.gz
Merge branch 'x86/urgent'
-rw-r--r--arch/x86/mm/mmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index 25e7e1372bb26e..919b91205cd4be 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -31,7 +31,7 @@
#include <linux/sched.h>
#include <asm/elf.h>
-struct __read_mostly va_alignment va_align = {
+struct va_alignment __read_mostly va_align = {
.flags = -1,
};