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@xxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxxx> Date: Fri, 30 Oct 2009 18:58:07 +1100 Subject: [PATCH] percpu: merge fixup for variable renaming Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html