diff for duplicates of <20201030151758.1241164-10-arnd@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 3486542..66baf6c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,7 +59,7 @@ index ce923a523695..ce4a5961ca93 100644 DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL_GPL(rtc_lock); @@ -49,6 +50,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) - } while (last_timer_count = 1); + } while (last_timer_count == 1); clk_total += INT_TICKS; timer_routine(0, NULL); + timer_heartbeat(); diff --git a/a/content_digest b/N1/content_digest index 5084eb7..e5292eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020201030151758.1241164-1-arnd@kernel.org\0" "From\0Arnd Bergmann <arnd@kernel.org>\0" "Subject\0[PATCH v2 09/15] m68k: split heartbeat out of timer function\0" - "Date\0Fri, 30 Oct 2020 15:17:52 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:52 +0100\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Thomas Gleixner <tglx@linutronix.de>" Arnd Bergmann <arnd@arndb.de> @@ -87,7 +87,7 @@ " DEFINE_SPINLOCK(rtc_lock);\n" " EXPORT_SYMBOL_GPL(rtc_lock);\n" "@@ -49,6 +50,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id)\n" - " \t} while (last_timer_count = 1);\n" + " \t} while (last_timer_count == 1);\n" " \tclk_total += INT_TICKS;\n" " \ttimer_routine(0, NULL);\n" "+\ttimer_heartbeat();\n" @@ -175,4 +175,4 @@ "-- \n" 2.27.0 -00993ab83707f9203c9f01370235502d5368d1cf9e203c544fba9e62e6cbad2a +e1f19b69177a3ad68179c68fc3e471413be3454ca077c0410dc8076e257cb551
diff --git a/a/1.txt b/N2/1.txt index 3486542..6654f0b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -59,7 +59,7 @@ index ce923a523695..ce4a5961ca93 100644 DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL_GPL(rtc_lock); @@ -49,6 +50,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) - } while (last_timer_count = 1); + } while (last_timer_count == 1); clk_total += INT_TICKS; timer_routine(0, NULL); + timer_heartbeat(); @@ -146,3 +146,9 @@ index 1c696906c159..b01b545a2db0 100644 return IRQ_HANDLED; -- 2.27.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 5084eb7..64ee728 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,29 @@ "ref\020201030151758.1241164-1-arnd@kernel.org\0" "From\0Arnd Bergmann <arnd@kernel.org>\0" "Subject\0[PATCH v2 09/15] m68k: split heartbeat out of timer function\0" - "Date\0Fri, 30 Oct 2020 15:17:52 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:52 +0100\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Thomas Gleixner <tglx@linutronix.de>" - Arnd Bergmann <arnd@arndb.de> - Russell King <linux@armlinux.org.uk> - Tony Luck <tony.luck@intel.com> + "Cc\0Sam Creasey <sammy@sammy.net>" Fenghua Yu <fenghua.yu@intel.com> - Greg Ungerer <gerg@linux-m68k.org> - Finn Thain <fthain@telegraphics.com.au> - Philip Blundell <philb@gnu.org> - Joshua Thompson <funaho@jurai.org> - Sam Creasey <sammy@sammy.net> - James E.J. Bottomley <James.Bottomley@hansenpartnership.com> - Helge Deller <deller@gmx.de> - Daniel Lezcano <daniel.lezcano@linaro.org> - John Stultz <john.stultz@linaro.org> - Stephen Boyd <sboyd@kernel.org> Linus Walleij <linus.walleij@linaro.org> + Tony Luck <tony.luck@intel.com> linux-ia64@vger.kernel.org Parisc List <linux-parisc@vger.kernel.org> + Arnd Bergmann <arnd@arndb.de> + Stephen Boyd <sboyd@kernel.org> + Philip Blundell <philb@gnu.org> + Helge Deller <deller@gmx.de> + Daniel Lezcano <daniel.lezcano@linaro.org> + Russell King <linux@armlinux.org.uk> + Finn Thain <fthain@telegraphics.com.au> + James E.J. Bottomley <James.Bottomley@hansenpartnership.com> linux-m68k <linux-m68k@lists.linux-m68k.org> + John Stultz <john.stultz@linaro.org> Linux ARM <linux-arm-kernel@lists.infradead.org> - " Geert Uytterhoeven <geert@linux-m68k.org>\0" + Geert Uytterhoeven <geert@linux-m68k.org> + Thomas Gleixner <tglx@linutronix.de> + Greg Ungerer <gerg@linux-m68k.org> + " Joshua Thompson <funaho@jurai.org>\0" "\00:1\0" "b\0" "From: Arnd Bergmann <arnd@arndb.de>\n" @@ -87,7 +87,7 @@ " DEFINE_SPINLOCK(rtc_lock);\n" " EXPORT_SYMBOL_GPL(rtc_lock);\n" "@@ -49,6 +50,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id)\n" - " \t} while (last_timer_count = 1);\n" + " \t} while (last_timer_count == 1);\n" " \tclk_total += INT_TICKS;\n" " \ttimer_routine(0, NULL);\n" "+\ttimer_heartbeat();\n" @@ -173,6 +173,12 @@ " \t}\n" " \treturn IRQ_HANDLED;\n" "-- \n" - 2.27.0 + "2.27.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -00993ab83707f9203c9f01370235502d5368d1cf9e203c544fba9e62e6cbad2a +6c373a9d95cab567df6187b7cf6e1a1f0dbe3b35b38b0a7c68b4611a80057a78
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.