From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, Mike Travis <travis@sgi•com>,
Sebastien Dugue <sebastien.dugue@bull•net>,
Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the rr_cpumask tree
Date: Fri, 2 Jan 2009 13:43:36 +1100 [thread overview]
Message-ID: <20090102134336.b799ae75.sfr@canb.auug.org.au> (raw)
Hi Rusty,
Today's linux-next merge of the rr_cpumask tree got a conflict in
kernel/time/tick-common.c between commit
5762ba1873b0bb9faa631aaa02f533c2b9837f82 ("hrtimers: allow the
hot-unplugging of all cpus") from the timers tree and commit
6b954823c24f04ed026a8517f6bab5abda279db8 ("cpumask: convert kernel time
functions") from the rr_cpumask tree.
I fixed it up (see below) and can carry the fix as necessary.,
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/time/tick-common.c
index b21410b,63e05d4..0000000
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@@ -274,21 -274,6 +274,21 @@@ out_bc
}
/*
+ * Transfer the do_timer job away from a dying cpu.
+ *
+ * Called with interrupts disabled.
+ */
+static void tick_handover_do_timer(int *cpup)
+{
+ if (*cpup == tick_do_timer_cpu) {
- int cpu = first_cpu(cpu_online_map);
++ int cpu = cpumask_first(cpu_online_map);
+
- tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu :
++ tick_do_timer_cpu = (cpu < nr_cpu_ids) ? cpu :
+ TICK_DO_TIMER_NONE;
+ }
+}
+
+/*
* Shutdown an event device on a given cpu:
*
* This is called on a life CPU, when a CPU is dead. So we cannot
next reply other threads:[~2009-01-02 2:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-02 2:43 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-01-02 2:35 linux-next: manual merge of the rr_cpumask tree Stephen Rothwell
2009-01-02 5:47 ` Rusty Russell
2009-01-02 6:21 ` Stephen Rothwell
2009-01-02 17:21 ` Mike Travis
2009-01-02 9:59 ` Ingo Molnar
2009-01-02 12:52 ` Ingo Molnar
2008-12-15 6:09 Stephen Rothwell
2008-12-15 6:09 Stephen Rothwell
2008-12-15 6:41 ` Rusty Russell
2008-12-15 16:27 ` Mike Travis
2008-12-15 18:40 ` Mike Travis
2008-12-16 5:40 ` Rusty Russell
2008-12-16 6:02 ` Mike Travis
2008-12-16 6:09 ` Stephen Rothwell
2008-12-16 16:03 ` Mike Travis
2008-12-16 20:55 ` Ingo Molnar
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=20090102134336.b799ae75.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sebastien.dugue@bull$(echo .)net \
--cc=travis@sgi$(echo .)com \
/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