Re: linux-next: manual merge of the tip tree with the m68knommu tree
From: Greg Ungerer
Date: Tue Mar 20 2012 - 21:41:19 EST
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@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxx
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/