diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 12:55:52 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 12:55:56 +1100 |
| commit | 2bf88e1cb7b556a34f750e3dff95b03e8ae83606 (patch) | |
| tree | a4d1d02b35b33994322ad917a11e2527891ec1bd /init | |
| parent | 4923ffc1ba3a1a8fe30418aff905194dee483c15 (diff) | |
| parent | 1098ea741fc4168264185b6782135d029dce435c (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 14 | ||||
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | init/version.c | 4 |
3 files changed, 1 insertions, 19 deletions
diff --git a/init/Kconfig b/init/Kconfig index 58b74b554e58..8b20fa3f872e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -529,7 +529,6 @@ config SRCU config TASKS_RCU bool default n - depends on !UML select SRCU help This option enables a task-based RCU implementation that uses @@ -781,19 +780,6 @@ config RCU_NOCB_CPU_ALL endchoice -config RCU_EXPEDITE_BOOT - bool - default n - help - This option enables expedited grace periods at boot time, - as if rcu_expedite_gp() had been invoked early in boot. - The corresponding rcu_unexpedite_gp() is invoked from - rcu_end_inkernel_boot(), which is intended to be invoked - at the end of the kernel-only boot sequence, just before - init is exec'ed. - - Accept the default if unsure. - endmenu # "RCU Subsystem" config BUILD_BIN2C diff --git a/init/main.c b/init/main.c index 86f5cf0a92a2..ae67c82b4027 100644 --- a/init/main.c +++ b/init/main.c @@ -625,7 +625,6 @@ asmlinkage __visible void __init start_kernel(void) numa_policy_init(); if (late_time_init) late_time_init(); - sched_clock_init(); calibrate_delay(); pidmap_init(); anon_vma_init(); @@ -663,7 +662,6 @@ asmlinkage __visible void __init start_kernel(void) sfi_init_late(); if (efi_enabled(EFI_RUNTIME_SERVICES)) { - efi_late_init(); efi_free_boot_services(); } diff --git a/init/version.c b/init/version.c index fe41a63efed6..5606341e9efd 100644 --- a/init/version.c +++ b/init/version.c @@ -23,9 +23,7 @@ int version_string(LINUX_VERSION_CODE); #endif struct uts_namespace init_uts_ns = { - .kref = { - .refcount = ATOMIC_INIT(2), - }, + .kref = KREF_INIT(2), .name = { .sysname = UTS_SYSNAME, .nodename = UTS_NODENAME, |