projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: generate flask headers during kernel build
[firefly-linux-kernel-4.4.55.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index 34971becbd3c6f2db9e011c9c09f070e7eaf3c71..7449819a4805b14dd3c68d7300cc54ce5d4b8044 100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-18,7
+18,6
@@
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/delay.h>
-#include <linux/utsname.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/smp_lock.h>
@@
-68,6
+67,7
@@
#include <linux/async.h>
#include <linux/kmemcheck.h>
#include <linux/kmemtrace.h>
#include <linux/async.h>
#include <linux/kmemcheck.h>
#include <linux/kmemtrace.h>
+#include <linux/sfi.h>
#include <linux/shmem_fs.h>
#include <trace/boot.h>
#include <linux/shmem_fs.h>
#include <trace/boot.h>
@@
-359,11
+359,6
@@
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#else
#else
-#if NR_CPUS > BITS_PER_LONG
-cpumask_t cpu_mask_all __read_mostly = CPU_MASK_ALL;
-EXPORT_SYMBOL(cpu_mask_all);
-#endif
-
/* Setup number of possible processor ids */
int nr_cpu_ids __read_mostly = NR_CPUS;
EXPORT_SYMBOL(nr_cpu_ids);
/* Setup number of possible processor ids */
int nr_cpu_ids __read_mostly = NR_CPUS;
EXPORT_SYMBOL(nr_cpu_ids);
@@
-668,12
+663,12
@@
asmlinkage void __init start_kernel(void)
#endif
thread_info_cache_init();
cred_init();
#endif
thread_info_cache_init();
cred_init();
- fork_init(
num_phys
pages);
+ fork_init(
totalram_
pages);
proc_caches_init();
buffer_init();
key_init();
security_init();
proc_caches_init();
buffer_init();
key_init();
security_init();
- vfs_caches_init(
num_phys
pages);
+ vfs_caches_init(
totalram_
pages);
radix_tree_init();
signals_init();
/* rootfs populating might need page-writeback */
radix_tree_init();
signals_init();
/* rootfs populating might need page-writeback */
@@
-689,6
+684,7
@@
asmlinkage void __init start_kernel(void)
check_bugs();
acpi_early_init(); /* before LAPIC and SMP init */
check_bugs();
acpi_early_init(); /* before LAPIC and SMP init */
+ sfi_init_late();
ftrace_init();
ftrace_init();