Page MenuHomeFreeBSD

D60672.diff
No OneTemporary

D60672.diff

diff --git a/sys/crypto/ccp/ccp_hardware.c b/sys/crypto/ccp/ccp_hardware.c
--- a/sys/crypto/ccp/ccp_hardware.c
+++ b/sys/crypto/ccp/ccp_hardware.c
@@ -246,11 +246,7 @@
*/
error = bus_dma_tag_create(bus_get_dma_tag(dev),
1 << (5 + sc->ring_size_order),
-#if defined(__i386__) && !defined(PAE)
- 0, BUS_SPACE_MAXADDR,
-#else
(bus_addr_t)1 << 32, BUS_SPACE_MAXADDR_48BIT,
-#endif
BUS_SPACE_MAXADDR, NULL, NULL, ringsz, 1,
ringsz, 0, NULL, NULL, &qp->ring_desc_tag);
if (error != 0)
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -4917,11 +4917,7 @@
if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat,
/*alignment*/ 1,
/*boundary*/ 0,
-#ifdef PAE
- /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT,
-#else
/*lowaddr*/ BUS_SPACE_MAXADDR,
-#endif
/*highaddr*/ BUS_SPACE_MAXADDR,
/*filter*/ NULL,
/*filterarg*/ NULL,
diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
--- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -954,13 +954,8 @@
bus_get_dma_tag(dev), /* parent */
1, /* alignment */
PAGE_SIZE, /* boundary */
-#if defined(__i386__) && defined(PAE)
- BUS_SPACE_MAXADDR_48BIT, /* lowaddr */
- BUS_SPACE_MAXADDR_48BIT, /* highaddr */
-#else
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
-#endif
NULL, NULL, /* filter, filterarg */
STORVSC_DATA_SIZE_MAX, /* maxsize */
STORVSC_DATA_SEGCNT_MAX, /* nsegments */

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 14, 6:20 AM (15 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40769110
Default Alt Text
D60672.diff (1 KB)

Event Timeline