diff --git a/[refs] b/[refs] index d8281ff5aaf4..cbabdfbfdef1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1648e4f805063137b55b869666e936ffd4419cdf +refs/heads/master: a81b6314e0aa480b8ac6dd02779d44cd0bee0a34 diff --git a/trunk/arch/x86/mm/numa_32.c b/trunk/arch/x86/mm/numa_32.c index 3daefa04ace5..d2530062fe00 100644 --- a/trunk/arch/x86/mm/numa_32.c +++ b/trunk/arch/x86/mm/numa_32.c @@ -257,7 +257,7 @@ void resume_map_numa_kva(pgd_t *pgd_base) } #endif -static unsigned long calculate_numa_remap_pages(void) +static __init unsigned long calculate_numa_remap_pages(void) { int nid; unsigned long size, reserve_pages = 0;