diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/conf/LOCKDOC | 2 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 1 | ||||
| -rw-r--r-- | sys/arch/i386/conf/majors.i386 | 2 | ||||
| -rw-r--r-- | sys/arch/x86/x86/pmap.c | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/LOCKDOC b/sys/arch/i386/conf/LOCKDOC index 14d7556a892..f2606cdf287 100644 --- a/sys/arch/i386/conf/LOCKDOC +++ b/sys/arch/i386/conf/LOCKDOC @@ -1012,7 +1012,7 @@ uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown #vmx* at pci? dev ? function ? # VMware VMXNET3 #vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet #wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b) -#wm* at pci? dev ? function ? # Intel 8254x gigabit +wm* at pci? dev ? function ? # Intel 8254x gigabit #wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG #xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 8614c7696ab..17c115a8c7c 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -49,6 +49,7 @@ defparam opt_beep.h BEEP_ONHALT_PERIOD=250 file lockdoc/log.c lockdoc +file lockdoc/test.c lockdoc # Multiboot support defflag opt_multiboot.h MULTIBOOT diff --git a/sys/arch/i386/conf/majors.i386 b/sys/arch/i386/conf/majors.i386 index 126284ffa14..4974b1429a2 100644 --- a/sys/arch/i386/conf/majors.i386 +++ b/sys/arch/i386/conf/majors.i386 @@ -108,6 +108,8 @@ device-major ct char 106 block 23 ct device-major mt char 107 block 24 mt #device-major obsolete char 108 block 25 obsolete (vinum, pf) #device-major obsolete char 108 obsolete (opencrypto, bthub) +#device-major lockdoc_ctl char 138 lockdoc +#device-major lockdoc_iter char 139 lockdoc # # Device majors for Xen. These are assigned here so that: diff --git a/sys/arch/x86/x86/pmap.c b/sys/arch/x86/x86/pmap.c index d952a925fc9..e20b947940a 100644 --- a/sys/arch/x86/x86/pmap.c +++ b/sys/arch/x86/x86/pmap.c @@ -902,8 +902,11 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) KASSERTMSG(!(opte & PTE_PS), "PTE_PS va=%#"PRIxVADDR, va); if ((opte & (PTE_P | PTE_A)) == (PTE_P | PTE_A)) { +/* Disable the warning message during LOCKDOC tests since it makes the console unusable */ +#ifndef LOCKDOC /* This should not happen. */ printf_nolog("%s: mapping already present\n", __func__); +#endif kpreempt_disable(); pmap_tlb_shootdown(pmap_kernel(), va, opte, TLBSHOOT_KENTER); kpreempt_enable(); |
