diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2011-08-06 14:31:38 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-08-06 11:44:57 -0700 |
| commit | 9387f774d61b01ab71bade85e6d0bfab0b3419bd (patch) | |
| tree | 951ee27408fe07ac9907059eef430502cd45c1db /arch | |
| parent | 8fa8b035085e7320c15875c1f6b03b290ca2dd66 (diff) | |
| download | op-kernel-dev-9387f774d61b01ab71bade85e6d0bfab0b3419bd.zip op-kernel-dev-9387f774d61b01ab71bade85e6d0bfab0b3419bd.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/sys_x86_64.c | 4 | ||||
| -rw-r--r-- | arch/x86/mm/mmap.c | 5 |
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 aaa8d09..fe7d2da 100644 --- a/arch/x86/kernel/sys_x86_64.c +++ b/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/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index d4c0736..4b5ba85 100644 --- a/arch/x86/mm/mmap.c +++ b/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). * |
