diff for duplicates of <20201030151758.1241164-13-arnd@kernel.org> diff --git a/a/1.txt b/N1/1.txt index fbe7fca..249228c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -166,7 +166,7 @@ index ce4a5961ca93..36d811ae09ee 100644 local_irq_save(flags); @@ -49,7 +48,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) last_timer_count = st_mfp.tim_dt_c; - } while (last_timer_count = 1); + } while (last_timer_count == 1); clk_total += INT_TICKS; - timer_routine(0, NULL); + legacy_timer_tick(1); diff --git a/a/content_digest b/N1/content_digest index b5fac02..bbfe1ff 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 12/15] m68k: change remaining timers to legacy_timer_tick\0" - "Date\0Fri, 30 Oct 2020 15:17:55 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:55 +0100\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Thomas Gleixner <tglx@linutronix.de>" Arnd Bergmann <arnd@arndb.de> @@ -194,7 +194,7 @@ " \tlocal_irq_save(flags);\n" "@@ -49,7 +48,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id)\n" " \t\tlast_timer_count = st_mfp.tim_dt_c;\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" "+\tlegacy_timer_tick(1);\n" @@ -388,4 +388,4 @@ "-- \n" 2.27.0 -014fa26589c00769df9cff491bba49c654f32f328ccb7d40edb7002965eb9b5a +d04e7cea09170165219830012dc9580d4eb361c3cf887710412f129295cc3bf4
diff --git a/a/1.txt b/N2/1.txt index fbe7fca..0e025b3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -166,7 +166,7 @@ index ce4a5961ca93..36d811ae09ee 100644 local_irq_save(flags); @@ -49,7 +48,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) last_timer_count = st_mfp.tim_dt_c; - } while (last_timer_count = 1); + } while (last_timer_count == 1); clk_total += INT_TICKS; - timer_routine(0, NULL); + legacy_timer_tick(1); @@ -359,3 +359,9 @@ index b01b545a2db0..4c6c409053fd 100644 master_outb(-1, FRAME_CLEAR_REG); -- 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 b5fac02..7fc5316 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 12/15] m68k: change remaining timers to legacy_timer_tick\0" - "Date\0Fri, 30 Oct 2020 15:17:55 +0000\0" + "Date\0Fri, 30 Oct 2020 16:17:55 +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" @@ -194,7 +194,7 @@ " \tlocal_irq_save(flags);\n" "@@ -49,7 +48,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id)\n" " \t\tlast_timer_count = st_mfp.tim_dt_c;\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" "+\tlegacy_timer_tick(1);\n" @@ -386,6 +386,12 @@ " \n" " \tmaster_outb(-1, FRAME_CLEAR_REG);\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 -014fa26589c00769df9cff491bba49c654f32f328ccb7d40edb7002965eb9b5a +7fce1d1367f0325e346b2c2b941cbc781e0f0d9933bd3a0a3516aa4f1b482414
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.