Module: xenomai-head
Branch: master
Commit: 8eae866533494d6f9a299061f3e20259f3e7fb12
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=8eae866533494d6f9a299061f3e20259f3e7fb12
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat Sep 10 18:41:13 2011 +0200
hal/powerpc: handle feature mask updates for kernel 3.x
---
ksrc/arch/powerpc/switch_64.S | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ksrc/arch/powerpc/switch_64.S b/ksrc/arch/powerpc/switch_64.S
index 9409b24..a1daefe 100644
--- a/ksrc/arch/powerpc/switch_64.S
+++ b/ksrc/arch/powerpc/switch_64.S
@@ -266,6 +266,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
#else /* Linux >= 2.6.32 */
+#ifndef MMU_FTR_SLB
+#define MMU_FTR_SLB CPU_FTR_SLB
+#define MMU_FTR_1T_SEGMENT CPU_FTR_1T_SEGMENT
+#endif
+
_GLOBAL(rthal_thread_switch)
mflr r0
std r0,16(r1)
@@ -323,10 +328,10 @@ BEGIN_FTR_SECTION
FTR_SECTION_ELSE_NESTED(95)
clrrdi r6,r8,40 /* get its 1T ESID */
clrrdi r9,r1,40 /* get current sp 1T ESID */
- ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_1T_SEGMENT, 95)
+ ALT_FTR_SECTION_END_NESTED_IFCLR(MMU_FTR_1T_SEGMENT, 95)
FTR_SECTION_ELSE
b 2f
-ALT_FTR_SECTION_END_IFSET(CPU_FTR_SLB)
+ALT_FTR_SECTION_END_IFSET(MMU_FTR_SLB)
clrldi. r0,r6,2 /* is new ESID c00000000? */
cmpd cr1,r6,r9 /* or is new ESID the same as current ESID? */
cror eq,4*cr1+eq,eq
@@ -340,7 +345,7 @@ BEGIN_FTR_SECTION
li r9,MMU_SEGSIZE_1T /* insert B field */
oris r6,r6,(MMU_SEGSIZE_1T << SLBIE_SSIZE_SHIFT)@h
rldimi r7,r9,SLB_VSID_SSIZE_SHIFT,0
-END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+END_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
/* Update the last bolted SLB. No write barriers are needed
* here, provided we only update the current CPU's SLB shadow
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
