Page MenuHomeFreeBSD
Files F159281590

D29692.id.diff
No OneTemporary
Actions

D29692.id.diff
View Options

diff --git a/sys/amd64/include/vm.h b/sys/amd64/include/vm.h
--- a/sys/amd64/include/vm.h
+++ b/sys/amd64/include/vm.h
@@ -43,5 +43,6 @@
#define VM_MEMATTR_WEAK_UNCACHEABLE ((vm_memattr_t)PAT_UNCACHED)
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
+#define VM_MEMATTR_DEVICE VM_MEMATTR_UNCACHEABLE
#endif /* !_MACHINE_VM_H_ */
diff --git a/sys/i386/include/vm.h b/sys/i386/include/vm.h
--- a/sys/i386/include/vm.h
+++ b/sys/i386/include/vm.h
@@ -43,5 +43,6 @@
#define VM_MEMATTR_WEAK_UNCACHEABLE ((vm_memattr_t)PAT_UNCACHED)
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
+#define VM_MEMATTR_DEVICE VM_MEMATTR_UNCACHEABLE
#endif /* !_MACHINE_VM_H_ */
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -3155,7 +3155,7 @@
{
bzero(args, sz);
args->size = sz;
- args->memattr = VM_MEMATTR_UNCACHEABLE;
+ args->memattr = VM_MEMATTR_DEVICE;
}
/**
diff --git a/sys/mips/include/vm.h b/sys/mips/include/vm.h
--- a/sys/mips/include/vm.h
+++ b/sys/mips/include/vm.h
@@ -38,6 +38,7 @@
#define VM_MEMATTR_UNCACHEABLE ((vm_memattr_t)MIPS_CCA_UNCACHED)
#define VM_MEMATTR_WRITE_BACK ((vm_memattr_t)MIPS_CCA_CACHED)
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
+#define VM_MEMATTR_DEVICE VM_MEMATTR_UNCACHEABLE
#ifdef MIPS_CCA_WC
#define VM_MEMATTR_WRITE_COMBINING ((vm_memattr_t)MIPS_CCA_WC)
#endif
diff --git a/sys/powerpc/include/vm.h b/sys/powerpc/include/vm.h
--- a/sys/powerpc/include/vm.h
+++ b/sys/powerpc/include/vm.h
@@ -42,4 +42,6 @@
#define VM_MEMATTR_WRITE_THROUGH 0x10
#define VM_MEMATTR_PREFETCHABLE 0x20
+#define VM_MEMATTR_DEVICE VM_MEMATTR_DEFAULT
+
#endif /* !_MACHINE_VM_H_ */
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -1126,11 +1126,7 @@
if (*reg == '\0' || *el != '\0')
errx(1, "Invalid bar specification %s", reg);
pbm.pbm_flags = 0;
-#ifdef VM_MEMATTR_DEVICE
pbm.pbm_memattr = VM_MEMATTR_DEVICE;
-#else
- pbm.pbm_memattr = VM_MEMATTR_UNCACHEABLE;
-#endif
fd = open(_PATH_DEVPCI, O_RDWR, 0);
if (fd < 0)

File Metadata

Mime Type
text/plain
Expires
Sat, Jun 13, 8:17 AM (21 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33922379
Default Alt Text
D29692.id.diff (2 KB)

Event Timeline