[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAOh2x=ny-76y0S=Nukz-Gz7OUZT19evXSVUWmFG2KdLoHcN6wQ@mail.gmail.com>
Date: Tue, 14 Aug 2012 12:50:58 +0530
From: viresh kumar <viresh.kumar@...aro.org>
To: tglx@...utronix.de
Cc: linux-tip-commits@...r.kernel.org, mingo@...nel.org, hpa@...or.com,
linux-kernel@...r.kernel.org, rusty@...tcorp.com.au,
peterz@...radead.org, srivatsa.bhat@...ux.vnet.ibm.com,
namhyung@...nel.org, paulmck@...ux.vnet.ibm.com,
Amit Kucheria <amit.kucheria@...aro.org>,
steve.bannister@....com
Subject: Re: [tip:smp/hotplug] watchdog: Use hotplug thread infrastructure
On Mon, Aug 13, 2012 at 8:43 PM, tip-bot for Thomas Gleixner
<tglx@...utronix.de> wrote:
> Commit-ID: bcd951cf10f24e341defcd002c15a1f4eea13ddb
> Gitweb: http://git.kernel.org/tip/bcd951cf10f24e341defcd002c15a1f4eea13ddb
> Author: Thomas Gleixner <tglx@...utronix.de>
> AuthorDate: Mon, 16 Jul 2012 10:42:38 +0000
> Committer: Thomas Gleixner <tglx@...utronix.de>
> CommitDate: Mon, 13 Aug 2012 17:01:07 +0200
>
> watchdog: Use hotplug thread infrastructure
Hi Thomas,
I am maintaining http://git.linaro.org/gitweb?p=arm/big.LITTLE/mp.git;a=summary
linaro tree for big.LITTLE MP work. I had a branch
per-cpu-thread-hotplug-v3-fixed
with your stuff in it + Paul's fix.
I was rebasing it over 3.6-rc1 and got conflicts, actually a routine is added in
kernel/watchdog.c file, which uses functions removed in your patch:
commit 45226e944ce071d0231949f2fea90969437cd2dc
Author: Sameer Nanda <snanda@...omium.org>
Date: Mon Jul 30 14:40:00 2012 -0700
NMI watchdog: fix for lockup detector breakage on resume
+#ifdef CONFIG_SUSPEND
+/*
+ * On exit from suspend we force an offline->online transition on the boot CPU
+ * so that the PMU state that was lost while in suspended state gets set up
+ * properly for the boot CPU. This information is required for restarting the
+ * NMI watchdog.
+ */
+void lockup_detector_bootcpu_resume(void)
+{
+ void *cpu = (void *)(long)smp_processor_id();
+
+ cpu_callback(&cpu_nfb, CPU_DEAD_FROZEN, cpu);
+ cpu_callback(&cpu_nfb, CPU_UP_PREPARE_FROZEN, cpu);
+ cpu_callback(&cpu_nfb, CPU_ONLINE_FROZEN, cpu);
+}
+#endif
+
Now, cpu_callback is removed in your patch. Can you please share an updated
patch to fix this issue? Or let me know how to handle it?
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists