Promotion of kernel.lnx.4.4-160930.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1054226   Ifefb2f1cf6c24af7bc46fc62797955b8c8ad5815   perf: Add cpu isolation awareness
1055668   Ibb8afffdc1e4780a48d085918cb6d6cf84cc0dba   msm: camera: Export IR LED device to mm-qcamera-daemon
1065513   I45690b239c73f636538b864f0c4a7e539a02eedb   input: touchscreen: Change dev_pm_ops for Goodix driver
1069068   Ie19fececd9d2bc6cd3328a6c63c956bcc9eed9a6   arm64: process: Reduce the no. of bytes of data around r
1064336   I18a27267eebdca2c87bf4bffc11a120822cdc7c2   msm: ipa3: hal: change FnR prints to low
1063261   Id38c8e21a853907c884bccd2978f2fd0a547a1ca   wil6210: fix wiphy registration sequence
1067981   I3f78196927501f582c36d5815096581185d797b4   soc: qcom: glink: Fix uninitialzed return value.
1065513   I3a00fb46106f859128f0fa9b8c99b5d6ba24bc7b   input: touchscreen: Code clean-up for Goodix driver
1054226   I2c62af441fb9e5ba9f29719853a63e4c8f2d031b   defconfig: msm: Disable core control helper
1054000   I783b7df9c7e0253e5dc88bd60e0b5300e26fba56   drivers: soc: Enable APR driver to use audio notifier
1044635 1053246   I8c5b8ffc62d34a44bfb47ec4f11477d4320d30a8   misc: qcom: qdsp6v2: SSR recovery support for NT decoder
1001175   I7d1e4d5cc421b800d2f00b6d23f6ff19ba4c4c7d   msm: pcie: configurable PERST propagation delay
1067178   I9951f061ad22cc91eba1c75aba3bdfbdde904cb9   ASoC: wcd934x: Add dapm ignore suspend for backend dais
1068464   I479e23db73a64e0fc1371e6b5abfaf1c8969954b   ARM: dts: msm: correct PM8005 S1 min/max voltage for msm
1053827   Icee01f6ba95e469acac9eed6bf2fdbc83947f5a8   msm: kgsl: Revisit the GPU snapshot dumping
1068464   I8539ca3a3456b9562e7ff0e48fd7824c15cea68f   regulator: cpr3-mmss-regulator: update reference voltage
1066695   I11e71639291479d544849d0f8672b9384fa34d0a   ARM: dts: msm: Add SMP2P entries for MSMTRITON
1064336   Ie1f0f48ffc1fd67fc8a2074d3d334fb8cd29c99f   msm: ipa3: change FnR prints to low
1054000   I15325c1385eaa0f0cca2c07130f2b4a997d98e1f   drivers: soc: Add Audio Notifier, PDR, and SSR drivers
1071217   I37e6f76b60ef0085d102c5d98179b467f6b77dee   ARM: dts: msm: Add bus name to venus pil for MSMCOBALT
1060610   I88b6c0748e6683b2f11b751840ab26e3ed397b70   ASoC: wcd9335: add handset speaker gain mixer control
1054000   Ief6e89b003aa1e2b02f33e21e3cb17f8731425ad   ASoC: msmcobalt: Add Audio Notifier, PDR, and SSR to Kco
1054226   I62acddeb707fc7d5626580166b3466e63f45fd89   core_ctl_helper: Remove code since it is not used anymor
1056661   Ida0d2d010f7bd226d7e2221f63e64a1d7e5a9075   ARM: dts: msm: Remove 710Mhz frequency for A540v2 GPU.
1063261   I51e58438672a45d210df5db3ac813e656cb525df   wil6210: change HALP logging category to IRQ
1062271   If462fe3d82f139d72547f82dc7eb564f83cb35bf   ASoC: msm: initialize the params array before using it
1054226   I4f1514ba5bac2e259a1105fcafb31d6a92ddd249   sched/core_ctl: Integrate core control with cpu isolatio
1063261   Ibc1e6dc2994268a60384b7d9bd459abc3791a0c4   wil6210: fix protection of wil->scan_request
1066424   Ic6dd2d1e7f829630dc6eae5ff74fae04f7fc7f9b   ARM: dts: msm: enable more FG interrupts for PMICOBALT
1066695   I82e992df1bfa1113843a0772ca8b88e48050dd8d   ARM: dts: msm: Add glink_pkt devices for MSMTRITON
1069455   Ibae066276b099ffb78c72a890a689f83e4df56a9   thermal: tsens: Update sensor ID index
1054226   Ice1a9503666a2b720bdb324289ca55ceb33097cd   cpumask: Add cpu isolation support
1054226   I96505aeb9d07a6fa3a2c28648ffa299e0cfa2e41   sched/core_ctl: Refactor cpu data
1054226   Ib911a0d34c250c4df020bdb265b92d2b8df8db93   timer: Do not require CPUSETS to be enabled for migratio
1054226   Ie4c6cb1496ae3490d81681f1ad51c8103caa0014   soc: qcom: watchdog_v2: Add support for cpu isolation
1068464   I3fbfa4c1fc5a6b4f30f8acaf659d2abcc05a7d16   ARM: dts: msm: modify VDD_GFX CPR ceiling voltages for m
1066695   I1aaeec4eea40fedbadf8b6008233dbd6ce5b3312   ARM: dts: msm: Add ipc-spinlock entry for MSMTRITON
1054226   Icc4d1c183e993b4b3c9b96ec9779c234e73ecab7   hrtimer: make sure PINNED flag is cleared after removing
1069455   I63e2a0a29f6bbe787fa10170c28569cf692d2807   ARM: dts: msm: Update TSENS sensor ID for MSMCOBALT
1070187   Id2de8e2ac94476c1a4927f719f2987a31d692ab5   ARM: dts: msm: modify VDD_APC0/1 CPR voltages for msmcob
1065513   I0a9037eac6e30a6319919043dd2ef1c226663af9   input: touchscreen: Remove irq polling from Goodix drive
1065513   I5132854367330a9b47f678409cbe6a45f2b5abb3   msm: reap unused kernel files
1063261   I20bc8d4b2b58fc3235ec3fe778738055d7535276   wil6210: extract firmware capabilities from FW file
1069380   Ic332f87666e405edbf3511671828ba824af1f3a2   ARM: dts: msm: Fix smem rpm xprt entry for msmfalcon
1054226   I8624e0659b86b7b8fa425a3fafdb0784fe005124   timer: create timer_quiesce_cpu() to isolate CPU from ti
1056910   I09fcc019133f4d37b7be3287da8e0733e40fc0ac   sched: constrain HMP scheduler tunable range with in bet
1063261   Ib5c55a37208d76505658635b12afc88552d5a220   wil6210: support rx key setting for all TIDs
1071204   Ib44789559c69e5808ed362cf9191486c93b2b66e   msm: mink: Accept zero args for invoke command
1071752   I1dddc7df26caa1556e57128603afd32b2613ebde   soc: qcom: pil: add PBL spare error status
1066569   I99ce1e5940506a5e65debfe822460c210a276b00   thermal: adc_tm: Initialize ADC parameters
1054000   I2ab027d4a6e2cb98df5358e24f6bebacd9aecca7   drivers: soc: Add Kconfigs for Audio Notifier, PDR, and
1002389   Id74650d5c4aaf9f84a56372f60ff5a40374e8f7b   diag: Fix possible buffer corruption by proper typecasti
1054226   I5975f1e5d7a1947dc5ee1cf8a0c16ec88b0fc6fb   defconfig: msmcortex: Enable core control
1065513   I3ade13181957d327ad9d0266b1999a4b0f2d8d1a   input: touchscreen: Add threaded irq support to Goodix d
1069084   I916e37bd79a6645bdc186a78a65051ce1c4dd475   soc: qcom: Listen to SUBSYS_AFTER_SHUTDOWN notification
1054226   I401de0b52fa6d20573187265ee56edd543b1419e   vmstat: Add cpu isolation awareness
1066422   Id9f28a0eeb2a904aca41eb46d0215d80287e0b88   qcom-charger: fg-util: add float decode function
1071363   I542fab59eadbea404c0001d25315172cc993488b   ASoC: wcd934x: Avoid pop during dsd path tear down
1054226   I51259ea41e3bd5cdba50b718201a6840174a7224   hrtimer: create hrtimer_quiesce_cpu() to isolate CPU fro
1054226   I5d849dfd29aa5bb594454473768d7db1da258028   sched/tick: Ensure timers does not get queued on isolate
1054226   I7b50778615541a64f9956573757c7f28748c4f69   irq: Make irq affinity function cpu isolation aware
1068946   I6943b7f5565ad95eddb9e3d30de5efbc47106e3d   qpnp-smb2: support batteryless platforms
1054226   I83e9fbb800df259616a145d311b50627dc42a5ff   pmqos: Enable cpu isolation awareness
1054226   I632f37874ef79887ee1202a028ef734f392d6ed0   hrtimer.h: prevent pinned timer state from breaking inac
1066695   I53657de1a41e727b29793f02c7f2c1a43db1c96c   ARM: dts: msm: Add G-Link SSR entries for MSMTRITON
1055668   I63da161f90bce2c33d1e7e9d5822c8635e307fd5   msm: camera: Export IR CUT device to mm-qcamera-daemon
1054226   I88a728ee1d54aaa887fab52e5e40d1d4e4fc69ca   watchdog: Add support for cpu isolation
1070189   I791941fbede4b136c3f24d15b7fb0b60dd5477e6   ASoC: wcd934x: Check for null pointer before access
1066695   I6ee171881943d8ab77445ede1c6ee714ed171d4d   ARM: dts: msm: Add SMEM entry for MSMTRITON
1054226   I370e404001344e635a663822b07557abbe0f6f52   timer: Add function to migrate timers
1046649   I941f91eeba01f4e7aa5427056bc57875e7edf197   msm: kgsl: Add memory and periphery clock control for A5
1068888   I5637e52be59ea9504ea6ae317394bef0c28c7865   net: ipc_router: fix NULL pointer de-reference issue
1066695   I276db2a07870864fca046627a615a30bc4e3936e   ARM: dts: msm: Add IPC Router devices for MSMTRITON
1067981   I82b08ff548a9abb0538a0ba24f699a99547ec7b7   soc: qcom: glink_ssr: Fix uninitialized variable
1066695   I1e59ec8028e128a764d3a79d446b5e8d650937b1   ARM: dts: msm: Add G-Link SMEM Transport entries for MSM
1054226   I24d6e91b6dff468c640c2fe3a37a7f31b6f0c79a   timer: Ensure timers are not running before migrating
1054226   I65943d8e4a9eac1f9f5a40ad5aaf166679215f48   trace: Move core control trace events to scheduler
1065513   I280f2201c69838ad4da8eb94e9f10768f54ed457   input: touchscreen: Fix issues in suspend path
1065513   I6c18e153ddf18667ca83d47df20c71bce6dbfa21   input: touchscreen: Remove redundant code from Goodix dr
1055668   I2e04fa47efd1454bb487eca67bd9ceaeab3e9edf   msm: camera: Add a driver to control IR LED device
1054226   Ia78e701468ea3828195c2a15c9cf9fafd099804a   core_ctrl: Move core control into kernel
1054226   If2d30000f068afc50db953940f4636ef6a089b24   sched/core: Add trace point for cpu isolation
1057562   I76c9a9e44755a4a77e6cffb1dc07f5b28c8b34b8   Migrate mpq demux driver from kernel 3.18 to 4.4
1036232   If6c273d9a86f9fc4bc841388b11b96c385dc64f4   net: cnss: Add support to get fw files for QCA SDIO targ
1068464   I2b0a8e5353c9bce25c965a8b6ead7494454466c9   ARM: dts: msm: modify VDD_GFX CPR voltage adjustments fo
1065513   Ic2b1b2562b63ccecdf15bdc64ad7e45996d196d3   input: touchscreen: Add debugfs support for suspend/resu
1070872   I6cbe4167ab9d980b75f4fefdd4add0d8e8adaef8   ARM: dts: msm: add slimbus7 and slimbus8 cpu dais for ms
1054226   If3b3770e547971809e789ea7c8033c48ec2aa92d   hrtimer: update timer->state with 'pinned' information
1064336   I5cfadb3ee7cb339b89b0c428bae46d3802476eb9   msm: ipa3: increase SSR tag timeout
1055668   I30d1c4e6c40b8e58a70f06db9e05231b4c7f676f   msm: camera: Add a driver to control IR CUT device
1054226   I0bbddb56238c2958c5987877c5bfc3e79afa67cc   sched: add cpu isolation support
1051762   Ife6146d28c8bc834a79e861959eca03e58e12d5e   ASoC: msm: qdsp6v2: Change device switch handling
1063261   I95c14c0fe7a33c078eb7d9aa44dd97a64f9b0fae   wil6210: align to latest auto generated wmi.h
1063261   I169e0c94edf5df31336af1ede36900ec337f4314   wil6210: align to latest auto generated wmi.h
1071938   I7ab180e06ececf8136903ee04565b8b4a2bf3524   icnss: update logs for QMI rejected messages
1057065   Ie6234ae30ad47a063982e5cc50f4ecedf1f61de2   msm: pcie: verify EP is accessible before conf restore
993625   I2c99df5de44a6fd924ce7f5921db0e1cf3ba5d11   msm: pil: Adding function name and buffer size informati
1065983   I12154b0aa315fde6dd92267d4c8f4a78a6f0236f   ASoC: msmcobalt: send ANC config for WCD9340 codec
1071464   Ic3ef2229fa8552301e09dfb912e79e044a81324f   usb: dwc3: fix overriding core clock rate to default max
1054000   Ib88a71e2fdb2b58fd5f87a65cb7d3253884f2d97   ASoC: msmcobalt: Enable msmcobalt to use audio notifier
1063261   Ifb92501aab14843309fed8e1214a867b2ccccfce   wil6210: Fix driver down flow
1065983   I8c83f6305dbc0a40b67bf2ffd53d37a0abdcf953   ASoC: wcd934x: enable rate converter clock for AANC
1054226   I07702bb5b738c1c75c49a2ca4cb08be0231ccb12   smp: Do not wake up all idle CPUs
1063261   Id17271823d167677a323dd1f52c7de4c6025b56e   wil6210: prevent usage of incorrect TX hwtail
1063261   I79f8522ae84dd209cb98c3bbc52cfaeb199dd342   wil6210: fix stop p2p device handling
1057562   Ia50bd897f6bf4c0ea7adc27d53a657090a09e229   Migrate demux driver from kernel 3.18 to 4.4
1066563   I0e21c5966e0072eab826c92fc332c54e11cb0b23   thermal: tsens: Update readl call in msm_tsens_get_temp(
1054226   I6a13e8dda99130ca794e5b6f51600f4c57a3e921   drivers/base: cpu: Add node for cpu isolation

Change-Id: If82c9559e44520d270bc164fcb86b382b71301ff
CRs-Fixed: 1036232, 1069455, 1071204, 1001175, 1053827, 1057562, 1060610, 1068946, 1071363, 1071938, 1068888, 1069380, 1069068, 1065983, 1055668, 1066695, 1067981, 1063261, 1064336, 1067178, 1066422, 1066424, 1065513, 1066569, 1070189, 1057065, 1068464, 1071217, 1066563, 1069084, 1070187, 993625, 1053246, 1070872, 1051762, 1046649, 1056661, 1062271, 1002389, 1071752, 1056910, 1054000, 1044635, 1054226, 1071464

2 files changed, 106 insertions, 36 deletions

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index fa909f9fd559..1b0117198a08 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -880,7 +880,7 @@ static int enqueue_hrtimer(struct hrtimer *timer,
 
 	base->cpu_base->active_bases |= 1 << base->index;
 
-	timer->state = HRTIMER_STATE_ENQUEUED;
+	timer->state |= HRTIMER_STATE_ENQUEUED;
 
 	return timerqueue_add(&base->active, &timer->node);
 }
@@ -900,11 +900,9 @@ static void __remove_hrtimer(struct hrtimer *timer,
 			     u8 newstate, int reprogram)
 {
 	struct hrtimer_cpu_base *cpu_base = base->cpu_base;
-	u8 state = timer->state;
 
-	timer->state = newstate;
-	if (!(state & HRTIMER_STATE_ENQUEUED))
-		return;
+	if (!(timer->state & HRTIMER_STATE_ENQUEUED))
+		goto out;
 
 	if (!timerqueue_del(&base->active, &timer->node))
 		cpu_base->active_bases &= ~(1 << base->index);
@@ -921,6 +919,13 @@ static void __remove_hrtimer(struct hrtimer *timer,
 	if (reprogram && timer == cpu_base->next_timer)
 		hrtimer_force_reprogram(cpu_base, 1);
 #endif
+
+out:
+	/*
+	* We need to preserve PINNED state here, otherwise we may end up
+	* migrating pinned hrtimers as well.
+	*/
+	timer->state = newstate | (timer->state & HRTIMER_STATE_PINNED);
 }
 
 /*
@@ -949,6 +954,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool rest
 			state = HRTIMER_STATE_INACTIVE;
 
 		__remove_hrtimer(timer, base, state, reprogram);
+		timer->state &= ~HRTIMER_STATE_PINNED;
 		return 1;
 	}
 	return 0;
@@ -1002,6 +1008,10 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
 
 	timer_stats_hrtimer_set_start_info(timer);
 
+	/* Update pinned state */
+	timer->state &= ~HRTIMER_STATE_PINNED;
+	timer->state |= (!!(mode & HRTIMER_MODE_PINNED)) << HRTIMER_PINNED_SHIFT;
+
 	leftmost = enqueue_hrtimer(timer, new_base);
 	if (!leftmost)
 		goto unlock;
@@ -1176,8 +1186,8 @@ bool hrtimer_active(const struct hrtimer *timer)
 		cpu_base = READ_ONCE(timer->base->cpu_base);
 		seq = raw_read_seqcount_begin(&cpu_base->seq);
 
-		if (timer->state != HRTIMER_STATE_INACTIVE ||
-		    cpu_base->running == timer)
+		if (((timer->state & ~HRTIMER_STATE_PINNED) !=
+		      HRTIMER_STATE_INACTIVE) || cpu_base->running == timer)
 			return true;
 
 	} while (read_seqcount_retry(&cpu_base->seq, seq) ||
@@ -1614,13 +1624,17 @@ static void init_hrtimers_cpu(int cpu)
 	hrtimer_init_hres(cpu_base);
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
-
+#if defined(CONFIG_HOTPLUG_CPU)
 static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
-				struct hrtimer_clock_base *new_base)
+				 struct hrtimer_clock_base *new_base,
+				 bool remove_pinned)
 {
 	struct hrtimer *timer;
 	struct timerqueue_node *node;
+	struct timerqueue_head pinned;
+	int is_pinned;
+
+	timerqueue_init_head(&pinned);
 
 	while ((node = timerqueue_getnext(&old_base->active))) {
 		timer = container_of(node, struct hrtimer, node);
@@ -1633,6 +1647,13 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
 		 * under us on another CPU
 		 */
 		__remove_hrtimer(timer, old_base, HRTIMER_STATE_ENQUEUED, 0);
+
+		is_pinned = timer->state & HRTIMER_STATE_PINNED;
+		if (!remove_pinned && is_pinned) {
+			timerqueue_add(&pinned, &timer->node);
+			continue;
+		}
+
 		timer->base = new_base;
 		/*
 		 * Enqueue the timers on the new cpu. This does not
@@ -1644,17 +1665,23 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
 		 */
 		enqueue_hrtimer(timer, new_base);
 	}
+
+	/* Re-queue pinned timers for non-hotplug usecase */
+	while ((node = timerqueue_getnext(&pinned))) {
+		timer = container_of(node, struct hrtimer, node);
+
+		timerqueue_del(&pinned, &timer->node);
+		enqueue_hrtimer(timer, old_base);
+	}
 }
 
-static void migrate_hrtimers(int scpu)
+static void __migrate_hrtimers(int scpu, bool remove_pinned)
 {
 	struct hrtimer_cpu_base *old_base, *new_base;
+	unsigned long flags;
 	int i;
 
-	BUG_ON(cpu_online(scpu));
-	tick_cancel_sched_timer(scpu);
-
-	local_irq_disable();
+	local_irq_save(flags);
 	old_base = &per_cpu(hrtimer_bases, scpu);
 	new_base = this_cpu_ptr(&hrtimer_bases);
 	/*
@@ -1666,7 +1693,7 @@ static void migrate_hrtimers(int scpu)
 
 	for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
 		migrate_hrtimer_list(&old_base->clock_base[i],
-				     &new_base->clock_base[i]);
+				     &new_base->clock_base[i], remove_pinned);
 	}
 
 	raw_spin_unlock(&old_base->lock);
@@ -1674,7 +1701,20 @@ static void migrate_hrtimers(int scpu)
 
 	/* Check, if we got expired work to do */
 	__hrtimer_peek_ahead_timers();
-	local_irq_enable();
+	local_irq_restore(flags);
+}
+
+static void migrate_hrtimers(int scpu)
+{
+	BUG_ON(cpu_online(scpu));
+	tick_cancel_sched_timer(scpu);
+
+	__migrate_hrtimers(scpu, true);
+}
+
+void hrtimer_quiesce_cpu(void *cpup)
+{
+	__migrate_hrtimers(*(int *)cpup, false);
 }
 
 #endif /* CONFIG_HOTPLUG_CPU */
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 51896272fcde..0efb3916f5a4 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1620,56 +1620,86 @@ signed long __sched schedule_timeout_uninterruptible(signed long timeout)
 }
 EXPORT_SYMBOL(schedule_timeout_uninterruptible);
 
-#ifdef CONFIG_HOTPLUG_CPU
-static void migrate_timer_list(struct tvec_base *new_base, struct hlist_head *head)
+#if defined(CONFIG_HOTPLUG_CPU)
+static void migrate_timer_list(struct tvec_base *new_base,
+			       struct hlist_head *head, bool remove_pinned)
 {
 	struct timer_list *timer;
 	int cpu = new_base->cpu;
+	struct hlist_node *n;
+	int is_pinned;
 
-	while (!hlist_empty(head)) {
-		timer = hlist_entry(head->first, struct timer_list, entry);
-		/* We ignore the accounting on the dying cpu */
-		detach_timer(timer, false);
+	hlist_for_each_entry_safe(timer, n, head, entry) {
+		is_pinned = timer->flags & TIMER_PINNED_ON_CPU;
+		if (!remove_pinned && is_pinned)
+			continue;
+
+		detach_if_pending(timer, get_timer_base(timer->flags), false);
 		timer->flags = (timer->flags & ~TIMER_BASEMASK) | cpu;
 		internal_add_timer(new_base, timer);
 	}
 }
 
-static void migrate_timers(int cpu)
+static void __migrate_timers(int cpu, bool wait, bool remove_pinned)
 {
 	struct tvec_base *old_base;
 	struct tvec_base *new_base;
+	unsigned long flags;
 	int i;
 
-	BUG_ON(cpu_online(cpu));
 	old_base = per_cpu_ptr(&tvec_bases, cpu);
 	new_base = get_cpu_ptr(&tvec_bases);
 	/*
 	 * The caller is globally serialized and nobody else
 	 * takes two locks at once, deadlock is not possible.
 	 */
-	spin_lock_irq(&new_base->lock);
+	spin_lock_irqsave(&new_base->lock, flags);
 	spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
 
-	BUG_ON(old_base->running_timer);
+	if (wait) {
+		/* Ensure timers are done running before continuing */
+		while (old_base->running_timer) {
+			spin_unlock(&old_base->lock);
+			spin_unlock_irqrestore(&new_base->lock, flags);
+			cpu_relax();
+			spin_lock_irqsave(&new_base->lock, flags);
+			spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
+		}
+	} else {
+		BUG_ON(old_base->running_timer);
+	}
 
 	for (i = 0; i < TVR_SIZE; i++)
-		migrate_timer_list(new_base, old_base->tv1.vec + i);
+		migrate_timer_list(new_base, old_base->tv1.vec + i,
+				   remove_pinned);
 	for (i = 0; i < TVN_SIZE; i++) {
-		migrate_timer_list(new_base, old_base->tv2.vec + i);
-		migrate_timer_list(new_base, old_base->tv3.vec + i);
-		migrate_timer_list(new_base, old_base->tv4.vec + i);
-		migrate_timer_list(new_base, old_base->tv5.vec + i);
+		migrate_timer_list(new_base, old_base->tv2.vec + i,
+				remove_pinned);
+		migrate_timer_list(new_base, old_base->tv3.vec + i,
+				remove_pinned);
+		migrate_timer_list(new_base, old_base->tv4.vec + i,
+				remove_pinned);
+		migrate_timer_list(new_base, old_base->tv5.vec + i,
+				remove_pinned);
 	}
 
-	old_base->active_timers = 0;
-	old_base->all_timers = 0;
-
 	spin_unlock(&old_base->lock);
-	spin_unlock_irq(&new_base->lock);
+	spin_unlock_irqrestore(&new_base->lock, flags);
 	put_cpu_ptr(&tvec_bases);
 }
 
+/* Migrate timers from 'cpu' to this_cpu */
+static void migrate_timers(int cpu)
+{
+	BUG_ON(cpu_online(cpu));
+	__migrate_timers(cpu, false, true);
+}
+
+void timer_quiesce_cpu(void *cpup)
+{
+	__migrate_timers(*(int *)cpup, true, false);
+}
+
 static int timer_cpu_notify(struct notifier_block *self,
 				unsigned long action, void *hcpu)
 {