From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jason Wessel <jason.wessel@windriver•com>
Subject: linux-next: manual merge of the percpu tree with the kgdb tree
Date: Fri, 30 Oct 2009 19:20:38 +1100 [thread overview]
Message-ID: <20091030192038.381eba2d.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
kernel/softlockup.c between commit
b460e1994445b5ebb97aaec0c29f893c246bd830 ("softlockup: add
sched_clock_tick() to avoid kernel warning on kgdb resume") from the kgdb
tree and commit 1871e52c76dd95895caeb772f845a1718dcbcd75 ("percpu: make
percpu symbols under kernel/ and mm/ unique") from the percpu tree.
Just context changes. I fixed it up (see below) and can carry the
changes as necessary.
I do wonder if the local variable name changes in the percpu tree change
were a good idea?
I also needed a further merge fixup (see further below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc kernel/softlockup.c
index a85ace2,d225790..0000000
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@@ -125,15 -117,7 +125,15 @@@ void softlockup_tick(void
return;
}
- if (touch_timestamp == 0) {
+ if (touch_ts == 0) {
+ if (unlikely(softlock_touch_sync[this_cpu])) {
+ /*
+ * If the time stamp was touched atomically
+ * make sure the scheduler tick is up to date.
+ */
+ softlock_touch_sync[this_cpu] = 0;
+ sched_clock_tick();
+ }
__touch_softlockup_watchdog();
return;
}
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 30 Oct 2009 18:58:07 +1100
Subject: [PATCH] percpu: merge fixup for variable renaming
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/softlockup.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 560a01d..57f1295 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -84,7 +84,7 @@ static int softlock_touch_sync[NR_CPUS];
void touch_softlockup_watchdog_sync(void)
{
softlock_touch_sync[raw_smp_processor_id()] = 1;
- __raw_get_cpu_var(touch_timestamp) = 0;
+ __raw_get_cpu_var(softlockup_touch_ts) = 0;
}
void touch_all_softlockup_watchdogs(void)
--
1.6.5.2
next reply other threads:[~2009-10-30 8:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-30 8:20 Stephen Rothwell [this message]
2009-10-30 10:00 ` linux-next: manual merge of the percpu tree with the kgdb tree Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091030192038.381eba2d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=jason.wessel@windriver$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox