From: Greg Ungerer <gerg@snapgear•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Geert Uytterhoeven <geert@linux-m68k•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: Re: linux-next: manual merge of the tip tree with the m68knommu tree
Date: Wed, 21 Mar 2012 11:35:48 +1000 [thread overview]
Message-ID: <4F693074.3010002@snapgear.com> (raw)
In-Reply-To: <20120321113852.93618d6fa5977e9a71caa298@canb.auug.org.au>
Hi Stephen,
On 21/03/12 10:38, Stephen Rothwell wrote:
> Hi Greg, Geert,
>
> On Fri, 2 Mar 2012 13:49:03 +1100 Stephen Rothwell<sfr@canb•auug.org.au> wrote:
>>
>> Today's linux-next merge of the tip tree got conflicts in
>> arch/m68k/kernel/process_no.c and arch/m68k/kernel/process_mm.c between
>> commit 8d8b74c955fd ("m68k: merge the MMU and non-MMU versions of
>> process.c") from the m68knommu tree and commit bd2f55361f18 ("sched/rt:
>> Use schedule_preempt_disabled()") from the tip tree.
>
> That tip tree commit is now in Linus' tree, so I am now applying the
> patch below after merging the m68knommu tree.
Looks good, thanks.
Regards
Greg
>> The former merged these two files into a single process.c, so I removed
>> them. I then applied the following merge fix patch.
>>
>> From: Stephen Rothwell<sfr@canb•auug.org.au>
>> Date: Fri, 2 Mar 2012 13:43:03 +1100
>> Subject: [PATCH] sched/rt: Use schedule_preempt_disabled() in m68k
>>
>> Signed-off-by: Stephen Rothwell<sfr@canb•auug.org.au>
>> ---
>> arch/m68k/kernel/process.c | 4 +---
>> 1 files changed, 1 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
>> index f053e24..c54ef927 100644
>> --- a/arch/m68k/kernel/process.c
>> +++ b/arch/m68k/kernel/process.c
>> @@ -78,9 +78,7 @@ void cpu_idle(void)
>> while (1) {
>> while (!need_resched())
>> idle();
>> - preempt_enable_no_resched();
>> - schedule();
>> - preempt_disable();
>> + schedule_preempt_disabled();
>> }
>> }
>>
>> --
>> 1.7.9.1
>
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear•com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
prev parent reply other threads:[~2012-03-21 1:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-02 2:49 linux-next: manual merge of the tip tree with the m68knommu tree Stephen Rothwell
2012-03-21 0:38 ` Stephen Rothwell
2012-03-21 1:35 ` Greg Ungerer [this message]
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=4F693074.3010002@snapgear.com \
--to=gerg@snapgear$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--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=sfr@canb$(echo .)auug.org.au \
--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