patch-2.4.25 linux-2.4.25/arch/ppc/kernel/head_8xx.S
Next file: linux-2.4.25/arch/ppc/kernel/idle_6xx.S
Previous file: linux-2.4.25/arch/ppc/kernel/cputable.c
Back to the patch index
Back to the overall index
- Lines: 45
- Date:
2004-02-18 05:36:30.000000000 -0800
- Orig file:
linux-2.4.24/arch/ppc/kernel/head_8xx.S
- Orig date:
2003-11-28 10:26:19.000000000 -0800
diff -urN linux-2.4.24/arch/ppc/kernel/head_8xx.S linux-2.4.25/arch/ppc/kernel/head_8xx.S
@@ -341,7 +341,7 @@
beq 2f /* If zero, don't try to find a pte */
/* We have a pte table, so load the MI_TWC with the attributes
- * for this page, which has only bit 31 set.
+ * for this "segment."
*/
tophys(r21,r21)
ori r21,r21,1 /* Set valid bit */
@@ -350,7 +350,7 @@
stw r3, 12(r0)
lwz r3, 12(r0)
#endif
- mtspr MI_TWC, r21 /* Set page attributes */
+ mtspr MI_TWC, r21 /* Set segment attributes */
#ifdef CONFIG_8xx_CPU6
li r3, 0x3b80
stw r3, 12(r0)
@@ -369,8 +369,6 @@
* set. All other Linux PTE bits control the behavior
* of the MMU.
*/
- li r21, 0x0600
- andc r20, r20, r21 /* Clear 21, 22 */
li r21, 0x00f0
rlwimi r20, r21, 0, 24, 28 /* Set 24-27, clear 28 */
@@ -463,8 +461,6 @@
* set. All other Linux PTE bits control the behavior
* of the MMU.
*/
- li r21, 0x0600
- andc r20, r20, r21 /* Clear 21, 22 */
li r21, 0x00f0
rlwimi r20, r21, 0, 24, 28 /* Set 24-27, clear 28 */
@@ -608,8 +604,6 @@
* set. All other Linux PTE bits control the behavior
* of the MMU.
*/
- li r21, 0x0600
- andc r20, r20, r21 /* Clear 21, 22 */
li r21, 0x00f0
rlwimi r20, r21, 0, 24, 28 /* Set 24-27, clear 28 */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)