Merge branch 'linux-2.6'

1 files changed, 29 insertions, 1 deletions

diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index eb8d26f87362..321bda2de2cb 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -329,8 +329,18 @@ InstructionTLBMiss:
         mfspr   r11, SPRN_MD_TWC        /* ....and get the pte address */
         lwz     r10, 0(r11)     /* Get the pte */
 
+#ifdef CONFIG_SWAP
+        /* do not set the _PAGE_ACCESSED bit of a non-present page */
+        andi.   r11, r10, _PAGE_PRESENT
+        beq     4f
+        ori     r10, r10, _PAGE_ACCESSED
+        mfspr   r11, SPRN_MD_TWC        /* get the pte address again */
+        stw     r10, 0(r11)
+4:
+#else
         ori     r10, r10, _PAGE_ACCESSED
         stw     r10, 0(r11)
+#endif
 
         /* The Linux PTE won't go exactly into the MMU TLB.
          * Software indicator bits 21, 22 and 28 must be clear.
@@ -395,8 +405,17 @@ DataStoreTLBMiss:
         DO_8xx_CPU6(0x3b80, r3)
         mtspr   SPRN_MD_TWC, r11
 
-        mfspr   r11, SPRN_MD_TWC        /* get the pte address again */
+#ifdef CONFIG_SWAP
+        /* do not set the _PAGE_ACCESSED bit of a non-present page */
+        andi.   r11, r10, _PAGE_PRESENT
+        beq     4f
+        ori     r10, r10, _PAGE_ACCESSED
+4:
+        /* and update pte in table */
+#else
         ori     r10, r10, _PAGE_ACCESSED
+#endif
+        mfspr   r11, SPRN_MD_TWC        /* get the pte address again */
         stw     r10, 0(r11)
 
         /* The Linux PTE won't go exactly into the MMU TLB.
@@ -575,7 +594,16 @@ DataTLBError:
 
         /* Update 'changed', among others.
         */
+#ifdef CONFIG_SWAP
+        ori     r10, r10, _PAGE_DIRTY|_PAGE_HWWRITE
+        /* do not set the _PAGE_ACCESSED bit of a non-present page */
+        andi.   r11, r10, _PAGE_PRESENT
+        beq     4f
+        ori     r10, r10, _PAGE_ACCESSED
+4:
+#else
         ori     r10, r10, _PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_HWWRITE
+#endif
         mfspr   r11, SPRN_MD_TWC                /* Get pte address again */
         stw     r10, 0(r11)             /* and update pte in table */