|
@@ -896,17 +896,15 @@ void __init pgtable_cache_init(void)
|
|
|
panic("pgtable_cache_init(): Cannot create pgd cache");
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_DEBUG_PAGEALLOC
|
|
|
-static long __write_once initfree;
|
|
|
-#else
|
|
|
static long __write_once initfree = 1;
|
|
|
-#endif
|
|
|
+static bool __write_once set_initfree_done;
|
|
|
|
|
|
/* Select whether to free (1) or mark unusable (0) the __init pages. */
|
|
|
static int __init set_initfree(char *str)
|
|
|
{
|
|
|
long val;
|
|
|
if (kstrtol(str, 0, &val) == 0) {
|
|
|
+ set_initfree_done = true;
|
|
|
initfree = val;
|
|
|
pr_info("initfree: %s free init pages\n",
|
|
|
initfree ? "will" : "won't");
|
|
@@ -919,6 +917,11 @@ static void free_init_pages(char *what, unsigned long begin, unsigned long end)
|
|
|
{
|
|
|
unsigned long addr = (unsigned long) begin;
|
|
|
|
|
|
+ /* Prefer user request first */
|
|
|
+ if (!set_initfree_done) {
|
|
|
+ if (debug_pagealloc_enabled())
|
|
|
+ initfree = 0;
|
|
|
+ }
|
|
|
if (kdata_huge && !initfree) {
|
|
|
pr_warn("Warning: ignoring initfree=0: incompatible with kdata=huge\n");
|
|
|
initfree = 1;
|