diff for duplicates of <20141029084250.GA8939@mwanda> diff --git a/a/1.txt b/N1/1.txt index 4079dd3..79521bf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,8 @@ index ebc4c73..a7c5c59 100644 @@ -168,8 +168,8 @@ static int __init hangcheck_init(void) printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\n", VERSION_STR, hangcheck_tick, hangcheck_margin); - hangcheck_tsc_margin - (unsigned long long)(hangcheck_margin + hangcheck_tick); + hangcheck_tsc_margin = +- (unsigned long long)(hangcheck_margin + hangcheck_tick); - hangcheck_tsc_margin *= (unsigned long long)TIMER_FREQ; + (unsigned long long)hangcheck_margin + hangcheck_tick; + hangcheck_tsc_margin *= TIMER_FREQ; diff --git a/a/content_digest b/N1/content_digest index 7f983d0..4e4bb70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] hangcheck-timer: cleanup casting in hangcheck_init()\0" - "Date\0Wed, 29 Oct 2014 08:42:50 +0000\0" + "Date\0Wed, 29 Oct 2014 11:42:50 +0300\0" "To\0Arnd Bergmann <arnd@arndb.de>\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" linux-kernel@vger.kernel.org @@ -24,7 +24,8 @@ "@@ -168,8 +168,8 @@ static int __init hangcheck_init(void)\n" " \tprintk(\"Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\\n\",\n" " \t VERSION_STR, hangcheck_tick, hangcheck_margin);\n" - " \thangcheck_tsc_margin -\t\t(unsigned long long)(hangcheck_margin + hangcheck_tick);\n" + " \thangcheck_tsc_margin =\n" + "-\t\t(unsigned long long)(hangcheck_margin + hangcheck_tick);\n" "-\thangcheck_tsc_margin *= (unsigned long long)TIMER_FREQ;\n" "+\t\t(unsigned long long)hangcheck_margin + hangcheck_tick;\n" "+\thangcheck_tsc_margin *= TIMER_FREQ;\n" @@ -32,4 +33,4 @@ " \thangcheck_tsc = ktime_get_ns();\n" " \tmod_timer(&hangcheck_ticktock, jiffies + (hangcheck_tick*HZ));" -76f016afaba3f3be43a8bc3f540f64aeffc7761cdb179f8263fbbe20af869842 +f61becd7d352b119fc09d515f5a202e76907dd73938227ccda02bfa14540a536
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.