aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2011-08-06 08:31:38 -0400
committerH. Peter Anvin <hpa@zytor.com>2011-08-06 14:44:57 -0400
commit9387f774d61b01ab71bade85e6d0bfab0b3419bd (patch)
tree951ee27408fe07ac9907059eef430502cd45c1db
parent8fa8b035085e7320c15875c1f6b03b290ca2dd66 (diff)
x86-32, amd: Move va_align definition to unbreak 32-bit build
hpa reported that dfb09f9b7ab03fd367740e541a5caf830ed56726 breaks 32-bit builds with the following error message: /home/hpa/kernel/linux-tip.cpu/arch/x86/kernel/cpu/amd.c:437: undefined reference to `va_align' /home/hpa/kernel/linux-tip.cpu/arch/x86/kernel/cpu/amd.c:436: undefined reference to `va_align' This is due to the fact that va_align is a global in a 64-bit only compilation unit. Move it to mmap.c where it is visible to both subarches. Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Link: http://lkml.kernel.org/r/1312633899-1131-1-git-send-email-bp@amd64.org Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/kernel/sys_x86_64.c4
-rw-r--r--arch/x86/mm/mmap.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index aaa8d09c7195..fe7d2dac7fa3 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -18,10 +18,6 @@
18#include <asm/ia32.h> 18#include <asm/ia32.h>
19#include <asm/syscalls.h> 19#include <asm/syscalls.h>
20 20
21struct __read_mostly va_alignment va_align = {
22 .flags = -1,
23};
24
25/* 21/*
26 * Align a virtual address to avoid aliasing in the I$ on AMD F15h. 22 * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27 * 23 *
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index d4c073630175..4b5ba85eb5c9 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -31,6 +31,10 @@
31#include <linux/sched.h> 31#include <linux/sched.h>
32#include <asm/elf.h> 32#include <asm/elf.h>
33 33
34struct __read_mostly va_alignment va_align = {
35 .flags = -1,
36};
37
34static unsigned int stack_maxrandom_size(void) 38static unsigned int stack_maxrandom_size(void)
35{ 39{
36 unsigned int max = 0; 40 unsigned int max = 0;
@@ -42,7 +46,6 @@ static unsigned int stack_maxrandom_size(void)
42 return max; 46 return max;
43} 47}
44 48
45
46/* 49/*
47 * Top of mmap area (just below the process stack). 50 * Top of mmap area (just below the process stack).
48 * 51 *