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
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
cpufreq_32.c
diff --git
a/arch/powerpc/platforms/powermac/cpufreq_32.c
b/arch/powerpc/platforms/powermac/cpufreq_32.c
index
792d3ce
..
65c585b
100644
(file)
--- a/
arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/
arch/powerpc/platforms/powermac/cpufreq_32.c
@@
-310,7
+310,7
@@
static int pmu_set_cpu_speed(int low_speed)
_set_L3CR(save_l3cr);
/* Restore userland MMU context */
_set_L3CR(save_l3cr);
/* Restore userland MMU context */
- s
et_context(current->active_mm->context.id, current->active_mm->pgd
);
+ s
witch_mmu_context(NULL, current->active_mm
);
#ifdef DEBUG_FREQ
printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));
#ifdef DEBUG_FREQ
printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));