d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two build failures for non-tb configurations, UP [2] and when using gas [1].

Browse Source 
Reported by:	andreast [1], bf [2]
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
kib 2013-08-31 19:13:21 +00:00
parent 8190b13763
commit 2dccc06e8e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amd64/amd64/apic_vector.S
View File

@ -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

5
sys/amd64/amd64/pmap.c
View File

@ -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;
}