From f09d74cb9cd79b9b846a296ab4085730d07b9dff Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Sat, 6 Aug 2011 14:31:38 +0200
Subject: [PATCH] --- yaml --- r: 269519 b: refs/heads/master c:
 9387f774d61b01ab71bade85e6d0bfab0b3419bd h: refs/heads/master i:   269517:
 ed05303f790b08c9507f8c9167a1560e0a15b346   269515:
 a2741e56ddc0f9a89702f0f7b1dbbd3238a97274   269511:
 20f12309e837ff4de4c656f21ebee2aef4fc4047   269503:
 0bf35c5b0aa0eb334dbf505f44a99feadc86dbb0 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/sys_x86_64.c | 4 ----
 trunk/arch/x86/mm/mmap.c           | 5 ++++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8c536f2eeb5b..b8b8cda3359a 100644
--- 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
index aaa8d09c7195..fe7d2dac7fa3 100644
--- 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
index d4c073630175..4b5ba85eb5c9 100644
--- 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).
  *