Author: adrian
Date: Mon Aug 31 23:30:39 2009
New Revision: 196723
URL: http://svn.freebsd.org/changeset/base/196723
Log:
Shuffle pagezero() into the same location as in sys/i386/i386/pmap.c.
Modified:
head/sys/i386/xen/locore.s
head/sys/i386/xen/pmap.c
Modified: head/sys/i386/xen/locore.s
==============================================================================
--- head/sys/i386/xen/locore.s Mon Aug 31 22:58:29 2009 (r196722)
+++ head/sys/i386/xen/locore.s Mon Aug 31 23:30:39 2009 (r196723)
@@ -148,9 +148,7 @@ IdlePDPT: .long 0 /* phys addr of kerne
.globl KPTphys
#endif
KPTphys: .long 0 /* phys addr of kernel page tables */
-#ifdef SMP
.globl gdtset
-#endif
gdtset: .long 0 /* GDT is valid */
.globl proc0kstack
Modified: head/sys/i386/xen/pmap.c
==============================================================================
--- head/sys/i386/xen/pmap.c Mon Aug 31 22:58:29 2009 (r196722)
+++ head/sys/i386/xen/pmap.c Mon Aug 31 23:30:39 2009 (r196723)
@@ -328,22 +328,6 @@ CTASSERT(KERNBASE % (1 << 24) == 0);
-static __inline void
-pagezero(void *page)
-{
-#if defined(I686_CPU)
- if (cpu_class == CPUCLASS_686) {
-#if defined(CPU_ENABLE_SSE)
- if (cpu_feature & CPUID_SSE2)
- sse2_pagezero(page);
- else
-#endif
- i686_pagezero(page);
- } else
-#endif
- bzero(page, PAGE_SIZE);
-}
-
void
pd_set(struct pmap *pmap, int ptepindex, vm_paddr_t val, int type)
{
@@ -3343,6 +3327,22 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
PMAP_UNLOCK(dst_pmap);
}
+static __inline void
+pagezero(void *page)
+{
+#if defined(I686_CPU)
+ if (cpu_class == CPUCLASS_686) {
+#if defined(CPU_ENABLE_SSE)
+ if (cpu_feature & CPUID_SSE2)
+ sse2_pagezero(page);
+ else
+#endif
+ i686_pagezero(page);
+ } else
+#endif
+ bzero(page, PAGE_SIZE);
+}
+
/*
* pmap_zero_page zeros the specified hardware page by mapping
* the page into KVM and using bzero to clear its contents.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
