svn commit: r253882 - in projects/atomic64/sys: amd64/include i386/include

[Jung-uk Kim]

Author: jkim
Date: Fri Aug  2 05:52:53 2013
New Revision: 253882
URL: http://svnweb.freebsd.org/changeset/base/253882

Log:
  Fix incomplete pte_store() macros in the previous commit.

Modified:
  projects/atomic64/sys/amd64/include/pmap.h
  projects/atomic64/sys/i386/include/pmap.h

Modified: projects/atomic64/sys/amd64/include/pmap.h
==============================================================================
--- projects/atomic64/sys/amd64/include/pmap.h	Fri Aug  2 05:36:05 2013	(r253881)
+++ projects/atomic64/sys/amd64/include/pmap.h	Fri Aug  2 05:52:53 2013	(r253882)
@@ -189,14 +189,11 @@ pt_entry_t *vtopte(vm_offset_t);
 #define	pte_load_clear(ptep)		atomic_swap_long(ptep, 0)
 #define	pte_store(ptep, pte) \
     do { \
-	*(pt_entry_t *)(ptep) = (pt_entry_t)(pte); \
+	*(u_long *)(ptep) = (u_long)(pte); \
     } while (0)
 #define	pte_clear(ptep)			pte_store(ptep, 0)
 
-#define	pde_store(pdep, pde) \
-    do { \
-	*(pd_entry_t *)(pdep) = (pd_entry_t)(pde); \
-    } while (0)
+#define	pde_store(pdep, pde)		pte_store(pdep, pde)
 
 extern pt_entry_t pg_nx;
 

Modified: projects/atomic64/sys/i386/include/pmap.h
==============================================================================
--- projects/atomic64/sys/i386/include/pmap.h	Fri Aug  2 05:36:05 2013	(r253881)
+++ projects/atomic64/sys/i386/include/pmap.h	Fri Aug  2 05:52:53 2013	(r253882)
@@ -340,8 +340,8 @@ extern pt_entry_t pg_nx;
 #define	pte_load_clear(ptep)		atomic_swap_int(ptep, 0)
 #define	pte_store(ptep, pte) \
     do { \
-	*(pt_entry_t *)(ptep) = (pt_entry_t)(pte);
-    while (0)
+	*(u_int *)(ptep) = (u_int)(pte); \
+    } while (0)
 
 #endif /* PAE */