drm/nouveau: use bo->base.size instead of mem->num_pages

[linux-2.6-microblaze.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index a626e78..53b2788 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -40,6 +40,7 @@
 #include <linux/security.h>
 #include <linux/smp.h>
 #include <linux/profile.h>
+#include <linux/kfence.h>
 #include <linux/rcupdate.h>
 #include <linux/moduleparam.h>
 #include <linux/kallsyms.h>
@@ -74,7 +75,6 @@
 #include <linux/kgdb.h>
 #include <linux/ftrace.h>
 #include <linux/async.h>
-#include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
 #include <linux/perf_event.h>
@@ -97,6 +97,7 @@
 #include <linux/mem_encrypt.h>
 #include <linux/kcsan.h>
 #include <linux/init_syscalls.h>
+#include <linux/stackdepot.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -825,7 +826,9 @@ static void __init mm_init(void)
         */
        page_ext_init_flatmem();
        init_mem_debugging_and_hardening();
+       kfence_alloc_pool();
        report_meminit();
+       stack_depot_init();
        mem_init();
        /* page_owner must be initialized after buddy is ready */
        page_ext_init_flatmem_late();
@@ -956,6 +959,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
        hrtimers_init();
        softirq_init();
        timekeeping_init();
+       kfence_init();
 
        /*
         * For best initial stack canary entropy, prepare it after:
@@ -1054,7 +1058,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
 
        acpi_subsystem_init();
        arch_post_acpi_subsys_init();
-       sfi_init_late();
        kcsan_init();
 
        /* Do the rest non-__init'ed, we're now alive */
@@ -1423,6 +1426,7 @@ static int __ref kernel_init(void *unused)
        async_synchronize_full();
        kprobe_free_init_mem();
        ftrace_free_init_mem();
+       kgdb_free_init_mem();
        free_initmem();
        mark_readonly();