diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 | ||||
| -rw-r--r-- | init/Makefile | 2 | ||||
| -rw-r--r-- | init/main.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig index d0590c7..be8b7f5 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -579,7 +579,7 @@ config RCU_FANOUT_EXACT config RCU_FAST_NO_HZ bool "Accelerate last non-dyntick-idle CPU's grace periods" - depends on NO_HZ && SMP && !PREEMPT_RT_FULL + depends on NO_HZ && SMP default n help This option causes RCU to attempt to accelerate grace periods in @@ -946,7 +946,6 @@ config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on EXPERIMENTAL depends on CGROUP_SCHED - depends on !PREEMPT_RT_FULL default n help This feature lets you explicitly allocate real CPU bandwidth @@ -1505,7 +1504,6 @@ config SLUB config SLOB depends on EXPERT bool "SLOB (Simple Allocator)" - depends on !PREEMPT_RT_FULL help SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but diff --git a/init/Makefile b/init/Makefile index 88cf473..7bc47ee 100644 --- a/init/Makefile +++ b/init/Makefile @@ -33,4 +33,4 @@ silent_chk_compile.h = : include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ - "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)" + "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" diff --git a/init/main.c b/init/main.c index 2d80a11..cee4b5c 100644 --- a/init/main.c +++ b/init/main.c @@ -70,7 +70,6 @@ #include <linux/perf_event.h> #include <linux/file.h> #include <linux/ptrace.h> -#include <linux/posix-timers.h> #include <asm/io.h> #include <asm/bugs.h> @@ -503,7 +502,6 @@ asmlinkage void __init start_kernel(void) setup_command_line(command_line); setup_nr_cpu_ids(); setup_per_cpu_areas(); - softirq_early_init(); smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ build_all_zonelists(NULL, NULL); |