git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
kernel
/
sched.c
diff --git
a/kernel/sched.c
b/kernel/sched.c
index
3b0e0dc
..
af9a268
100644
(file)
--- a/
kernel/sched.c
+++ b/
kernel/sched.c
@@
-32,7
+32,7
@@
#include <linux/init.h>
#include <linux/uaccess.h>
#include <linux/highmem.h>
#include <linux/init.h>
#include <linux/uaccess.h>
#include <linux/highmem.h>
-#include <
asm
/mmu_context.h>
+#include <
linux
/mmu_context.h>
#include <linux/interrupt.h>
#include <linux/capability.h>
#include <linux/completion.h>
#include <linux/interrupt.h>
#include <linux/capability.h>
#include <linux/completion.h>
@@
-3331,7
+3331,7
@@
context_switch(struct rq *rq, struct task_struct *prev,
atomic_inc(&oldmm->mm_count);
enter_lazy_tlb(oldmm, next);
} else
atomic_inc(&oldmm->mm_count);
enter_lazy_tlb(oldmm, next);
} else
- switch_mm(oldmm, mm, next);
+ switch_mm
_irqs_off
(oldmm, mm, next);
if (!prev->mm) {
prev->active_mm = NULL;
if (!prev->mm) {
prev->active_mm = NULL;
@@
-7480,7
+7480,7
@@
build_overlap_sched_groups(struct sched_domain *sd, int cpu)
cpumask_clear(covered);
cpumask_clear(covered);
- for_each_cpu
(i, span
) {
+ for_each_cpu
_wrap(i, span, cpu
) {
struct cpumask *sg_span;
if (cpumask_test_cpu(i, covered))
struct cpumask *sg_span;
if (cpumask_test_cpu(i, covered))