projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwmon: Define a standard interface for chassis intrusion detection
[platform/kernel/linux-starfive.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
83697e1
..
6bf83af
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-14,6
+14,7
@@
#include <linux/proc_fs.h>
#include <linux/kernel.h>
#include <linux/syscalls.h>
#include <linux/proc_fs.h>
#include <linux/kernel.h>
#include <linux/syscalls.h>
+#include <linux/stackprotector.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/delay.h>
@@
-135,14
+136,14
@@
unsigned int __initdata setup_max_cpus = NR_CPUS;
* greater than 0, limits the maximum number of CPUs activated in
* SMP mode to <NUM>.
*/
* greater than 0, limits the maximum number of CPUs activated in
* SMP mode to <NUM>.
*/
-#ifndef CONFIG_X86_IO_APIC
-static inline void disable_ioapic_setup(void) {};
-#endif
+
+void __weak arch_disable_smp_support(void) { }
static int __init nosmp(char *str)
{
setup_max_cpus = 0;
static int __init nosmp(char *str)
{
setup_max_cpus = 0;
- disable_ioapic_setup();
+ arch_disable_smp_support();
+
return 0;
}
return 0;
}
@@
-152,14
+153,14
@@
static int __init maxcpus(char *str)
{
get_option(&str, &setup_max_cpus);
if (setup_max_cpus == 0)
{
get_option(&str, &setup_max_cpus);
if (setup_max_cpus == 0)
-
disable_ioapic_setup
();
+
arch_disable_smp_support
();
return 0;
}
early_param("maxcpus", maxcpus);
#else
return 0;
}
early_param("maxcpus", maxcpus);
#else
-#define setup_max_cpus NR_CPUS
+const unsigned int setup_max_cpus = NR_CPUS;
#endif
/*
#endif
/*
@@
-540,6
+541,12
@@
asmlinkage void __init start_kernel(void)
*/
lockdep_init();
debug_objects_early_init();
*/
lockdep_init();
debug_objects_early_init();
+
+ /*
+ * Set up the the initial canary ASAP:
+ */
+ boot_init_stack_canary();
+
cgroup_init_early();
local_irq_disable();
cgroup_init_early();
local_irq_disable();