patch-2.1.17 linux/arch/sparc/mm/fault.c

• Lines: 32
• Date: Thu Dec 19 11:03:32 1996
• Orig file: v2.1.16/linux/arch/sparc/mm/fault.c
• Orig date: Wed Dec 18 15:58:46 1996

diff -u --recursive --new-file v2.1.16/linux/arch/sparc/mm/fault.c linux/arch/sparc/mm/fault.c
@@ -1,4 +1,4 @@
-/* $Id: fault.c,v 1.84 1996/12/10 06:06:23 davem Exp $
+/* $Id: fault.c,v 1.85 1996/12/18 06:43:23 tridge Exp $
  * fault.c:  Page fault handlers for the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -285,10 +285,10 @@
 		if ((pte_val(*ptep) & (_SUN4C_PAGE_WRITE|_SUN4C_PAGE_PRESENT))
 				   == (_SUN4C_PAGE_WRITE|_SUN4C_PAGE_PRESENT)) {
 
-			pte_val(*ptep) |= (_SUN4C_PAGE_ACCESSED |
-					   _SUN4C_PAGE_MODIFIED |
-					   _SUN4C_PAGE_VALID |
-					   _SUN4C_PAGE_DIRTY);
+			*ptep = __pte(pte_val(*ptep) | _SUN4C_PAGE_ACCESSED |
+				      _SUN4C_PAGE_MODIFIED |
+				      _SUN4C_PAGE_VALID |
+				      _SUN4C_PAGE_DIRTY);
 
 			if (sun4c_get_segmap(address) != invalid_segment) {
 				sun4c_put_pte(address, pte_val(*ptep));
@@ -299,8 +299,8 @@
 		if ((pte_val(*ptep) & (_SUN4C_PAGE_READ|_SUN4C_PAGE_PRESENT))
 				   == (_SUN4C_PAGE_READ|_SUN4C_PAGE_PRESENT)) {
 
-			pte_val(*ptep) |= (_SUN4C_PAGE_ACCESSED |
-					   _SUN4C_PAGE_VALID);
+			*ptep = __pte(pte_val(*ptep) | _SUN4C_PAGE_ACCESSED |
+				      _SUN4C_PAGE_VALID);
 
 			if (sun4c_get_segmap(address) != invalid_segment) {
 				sun4c_put_pte(address, pte_val(*ptep));