---

yaml --- r: 269519 b: refs/heads/master c: 9387f77 h: refs/heads/master i: 269517: ed05303 269515: a2741e5 269511: 20f1230 269503: 0bf35c5 v: v3
git-mirror · Aug 6, 2011 · f09d74c · f09d74c
1 parent d63b82b
commit f09d74c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fa8b035085e7320c15875c1f6b03b290ca2dd66
+refs/heads/master: 9387f774d61b01ab71bade85e6d0bfab0b3419bd
diff --git a/trunk/arch/x86/kernel/sys_x86_64.c b/trunk/arch/x86/kernel/sys_x86_64.c
@@ -18,10 +18,6 @@
 #include <asm/ia32.h>
 #include <asm/syscalls.h>
 
-struct __read_mostly va_alignment va_align = {
-	.flags = -1,
-};
-
 /*
  * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
  *

diff --git a/trunk/arch/x86/mm/mmap.c b/trunk/arch/x86/mm/mmap.c
@@ -31,6 +31,10 @@
 #include <linux/sched.h>
 #include <asm/elf.h>
 
+struct __read_mostly va_alignment va_align = {
+	.flags = -1,
+};
+
 static unsigned int stack_maxrandom_size(void)
 {
 	unsigned int max = 0;
@@ -42,7 +46,6 @@ static unsigned int stack_maxrandom_size(void)
 	return max;
 }
 
-
 /*
  * Top of mmap area (just below the process stack).
  *