public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Benjamin Herrenschmidt <benh@kernel•crashing.org>,
	Mike Travis <travis@sgi•com>
Subject: linux-next: manual merge of the rr tree with Linus' tree
Date: Mon, 29 Jun 2009 13:43:46 +1000	[thread overview]
Message-ID: <20090629134346.62f043c0.sfr@canb.auug.org.au> (raw)

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/powerpc/platforms/powermac/setup.c between commit
7ccbe504b5ee766d33211a507189a06f3079b29b ("powerpc/pmac: Fix issues with
PowerMac "PowerSurge" SMP") from Linus' tree and commit
67e33aa4710019a5ee52979f7a9c6458729ab2ab
("cpumask:use-cpumap-accessors-powerpc") from the rr tree.

The code modified by the latter was moved to
arch/powerpc/platforms/powermac/smp.c by the former, so I applied the
latter change to this other file (see below).

There is another use of cpu_set in this file as well (which I did not
change).
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 6d4da7b..da12c48 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -952,7 +952,7 @@ void __init pmac_setup_smp(void)
 		int cpu;
 
 		for (cpu = 1; cpu < 4 && cpu < NR_CPUS; ++cpu)
-			cpu_set(cpu, cpu_possible_map);
+			set_cpu_possible(cpu, true);
 		smp_ops = &psurge_smp_ops;
 	}
 #endif /* CONFIG_PPC32 */

             reply	other threads:[~2009-06-29  3:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-29  3:43 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-21  2:11 linux-next: manual merge of the rr tree with Linus' tree Stephen Rothwell
2012-05-23  2:15 Stephen Rothwell
2010-01-18  4:06 Stephen Rothwell
2010-01-12  2:13 Stephen Rothwell
2009-12-17  2:07 Stephen Rothwell
2009-09-15  3:26 Stephen Rothwell
2009-08-24  3:07 Stephen Rothwell
2009-07-06  2:05 Stephen Rothwell
2009-06-24  3:08 Stephen Rothwell
2009-06-12  3:54 Stephen Rothwell
2009-05-27  3:55 Stephen Rothwell
2009-04-16  2:19 Stephen Rothwell

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=20090629134346.62f043c0.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=benh@kernel$(echo .)crashing.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rusty@rustcorp$(echo .)com.au \
    --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