svn commit: r255106 - head/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Sat Aug 31 19:13:21 2013
New Revision: 255106
URL: http://svnweb.freebsd.org/changeset/base/255106

Log:
  Fix two build failures for non-tb configurations, UP [2] and when using gas [1].
  
  Reported by:	andreast [1], bf [2]
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/amd64/amd64/apic_vector.S
  head/sys/amd64/amd64/pmap.c

Modified: head/sys/amd64/amd64/apic_vector.S
==============================================================================
--- head/sys/amd64/amd64/apic_vector.S	Sat Aug 31 18:13:20 2013	(r255105)
+++ head/sys/amd64/amd64/apic_vector.S	Sat Aug 31 19:13:21 2013	(r255106)
@@ -160,11 +160,11 @@ IDTVEC(xen_intr_upcall)
 
 	SUPERALIGN_TEXT
 global_invltlb:
-	movl	%cr4,%eax
-	andl	$~0x80,%eax
-	movl	%eax,%cr4
-	orl	$0x80,%eax
-	movl	%eax,%cr4
+	movq	%cr4,%rax
+	andq	$~0x80,%rax	/* PGE */
+	movq	%rax,%cr4
+	orq	$0x80,%rax
+	movq	%rax,%cr4
 invltlb_ret_clear_pm_save:
 	movq	smp_tlb_pmap,%rdx
 	testq	%rdx,%rdx

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Sat Aug 31 18:13:20 2013	(r255105)
+++ head/sys/amd64/amd64/pmap.c	Sat Aug 31 19:13:21 2013	(r255106)
@@ -762,7 +762,6 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
 	/* Initialize the PAT MSR. */
 	pmap_init_pat();
 
-#ifdef SMP
 	/* Initialize TLB Context Id. */
 	TUNABLE_INT_FETCH("vm.pmap.pcid_enabled", &pmap_pcid_enabled);
 	if ((cpu_feature2 & CPUID2_PCID) != 0 && pmap_pcid_enabled) {
@@ -773,8 +772,10 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
 		invpcid_works = (cpu_stdext_feature & CPUID_STDEXT_INVPCID)
 		    != 0;
 		kernel_pmap->pm_pcid = 0;
-	} else
+#ifndef SMP
+		pmap_pcid_enabled = 0;
 #endif
+	} else
 		pmap_pcid_enabled = 0;
 }