* linux-next: manual merge of the tip tree with the m68knommu tree
@ 2012-03-02 2:49 Stephen Rothwell
2012-03-21 0:38 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-03-02 2:49 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Greg Ungerer, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
Hi all,
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.
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
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the tip tree with the m68knommu tree
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
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-03-21 0:38 UTC (permalink / raw)
To: Greg Ungerer, Geert Uytterhoeven
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 1528 bytes --]
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.
> 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
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the tip tree with the m68knommu tree
2012-03-21 0:38 ` Stephen Rothwell
@ 2012-03-21 1:35 ` Greg Ungerer
0 siblings, 0 replies; 3+ messages in thread
From: Greg Ungerer @ 2012-03-21 1:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Geert Uytterhoeven, linux-next, linux-kernel, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-21 1:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox