Bläddra i källkod

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>
Borislav Petkov 14 år sedan
förälder
incheckning
9387f774d6
2 ändrade filer med 4 tillägg och 5 borttagningar
  1. 0 4
      arch/x86/kernel/sys_x86_64.c
  2. 4 1
      arch/x86/mm/mmap.c

+ 0 - 4
arch/x86/kernel/sys_x86_64.c

@@ -18,10 +18,6 @@
 #include <asm/ia32.h>
 #include <asm/ia32.h>
 #include <asm/syscalls.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.
  * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
  *
  *

+ 4 - 1
arch/x86/mm/mmap.c

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