projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'x86-mm-2021-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
[linux-2.6-microblaze.git]
/
arch
/
x86
/
mm
/
init.c
diff --git
a/arch/x86/mm/init.c
b/arch/x86/mm/init.c
index
fbf41dd
..
75ef19a
100644
(file)
--- a/
arch/x86/mm/init.c
+++ b/
arch/x86/mm/init.c
@@
-1017,7
+1017,7
@@
void __init zone_sizes_init(void)
free_area_init(max_zone_pfns);
}
free_area_init(max_zone_pfns);
}
-__visible DEFINE_PER_CPU_
SHARED_
ALIGNED(struct tlb_state, cpu_tlbstate) = {
+__visible DEFINE_PER_CPU_ALIGNED(struct tlb_state, cpu_tlbstate) = {
.loaded_mm = &init_mm,
.next_asid = 1,
.cr4 = ~0UL, /* fail hard if we screw up cr4 shadow initialization */
.loaded_mm = &init_mm,
.next_asid = 1,
.cr4 = ~0UL, /* fail hard if we screw up cr4 shadow initialization */