From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Josh Triplett <josh@joshtriplett•org>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Igor Mammedov <imammedo@redhat•com>
Subject: linux-next: manual merge of the tiny tree with the tip tree
Date: Tue, 23 Sep 2014 14:23:12 +1000 [thread overview]
Message-ID: <20140923142312.24cc9580@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 968 bytes --]
Hi Josh,
Today's linux-next merge of the tiny tree got a conflict in
arch/x86/kernel/cpu/common.c between commit ce4b1b16502b ("x86/smpboot:
Initialize secondary CPU only if master CPU will wait for it") from the
tip tree and commit e4a191d1e05b ("x86: Support compiling out userspace
I/O (iopl and ioperm)") from the tiny tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/x86/kernel/cpu/common.c
index 3d05d4699dbd,11e08cefdb6e..000000000000
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1294,10 -1281,7 +1294,9 @@@ void cpu_init(void
struct task_struct *me;
struct tss_struct *t;
unsigned long v;
- int cpu;
+ int cpu = stack_smp_processor_id();
- int i;
+
+ wait_for_master_cpu(cpu);
/*
* Load microcode on this cpu if a valid microcode is available.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-23 4:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 4:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-23 4:32 linux-next: manual merge of the tiny tree with the tip tree Stephen Rothwell
2014-09-23 5:43 ` Ingo Molnar
2014-09-23 6:21 ` Josh Triplett
2014-09-23 8:36 ` Ingo Molnar
2014-10-29 15:52 ` Josh Triplett
2014-09-26 6:45 Stephen Rothwell
2014-11-25 6:03 Stephen Rothwell
2014-11-25 6:16 ` Ingo Molnar
2014-11-25 6:30 ` John Stultz
2014-11-25 7:20 ` Josh Triplett
2014-11-25 6:48 ` Josh Triplett
2014-11-25 10:10 ` Ingo Molnar
2014-11-26 0:04 ` josh
2014-12-08 11:09 ` 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=20140923142312.24cc9580@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=imammedo@redhat$(echo .)com \
--cc=josh@joshtriplett$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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