diff options
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 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 | ||
21 | struct __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 | ||
34 | struct __read_mostly va_alignment va_align = { | ||
35 | .flags = -1, | ||
36 | }; | ||
37 | |||
34 | static unsigned int stack_maxrandom_size(void) | 38 | static 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 | * |