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 #include -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 #include +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). *