Rivoreo Source Code Repositories
src.rivoreo.one / freebsd-patches / baa98c0e933ddffa8acd93fea54602b9cf88ac87 / . / 10.4 / kernel-binary-prefix-name.diff
blob: 84b887efec71b8ef2225d00e135a4d62869e5548 [file] [log] [blame] [raw]
Fix kernel code uses SI prefix names where binary prefix names should be used
instead.
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/amd64/amd64/machdep.c freebsd-10.4/sys/amd64/amd64/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/amd64/amd64/machdep.c 2019-08-17 21:42:41.000000000 +0800
+++ freebsd-10.4/sys/amd64/amd64/machdep.c 2021-07-16 16:44:40.536401000 +0800
@@ -269,7 +269,7 @@
}
if (memsize < ptoa((uintmax_t)cnt.v_free_count))
memsize = ptoa((uintmax_t)Maxmem);
- printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20);
+ printf("real memory = %ju (%ju MiB)\n", memsize, memsize >> 20);
realmem = atop(memsize);
/*
@@ -293,7 +293,7 @@
vm_ksubmap_init(&kmi);
- printf("avail memory = %ju (%ju MB)\n",
+ printf("avail memory = %ju (%ju MiB)\n",
ptoa((uintmax_t)cnt.v_free_count),
ptoa((uintmax_t)cnt.v_free_count) / 1048576);
@@ -1699,7 +1699,7 @@
goto skip_memtest;
/*
- * Print a "." every GB to show we're making
+ * Print a "." every GiB to show we're making
* progress.
*/
page_counter++;
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/amd64/amd64/minidump_machdep.c freebsd-10.4/sys/amd64/amd64/minidump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/amd64/amd64/minidump_machdep.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/amd64/amd64/minidump_machdep.c 2021-07-16 18:43:57.915444000 +0800
@@ -88,8 +88,6 @@
return (0);
}
-#define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8)
-
static int
blk_flush(struct dumperinfo *di)
{
@@ -239,7 +237,7 @@
kernel_vm_end); ) {
/*
* We always write a page, even if it is zero. Each
- * page written corresponds to 1GB of space
+ * page written corresponds to 1GiB of space
*/
pmapsize += PAGE_SIZE;
ii = (va >> PML4SHIFT) & ((1ul << NPML4EPGSHIFT) - 1);
@@ -252,7 +250,7 @@
}
/*
- * 1GB page is represented as 512 2MB pages in a dump.
+ * 1GiB page is represented as 512 2MiB pages in a dump.
*/
if ((pdp[i] & PG_PS) != 0) {
va += NBPDP;
@@ -287,7 +285,7 @@
/* set bit for this PTE page */
if (is_dumpable(pa))
dump_add_page(pa);
- /* and for each valid page in this 2MB block */
+ /* and for each valid page in this 2MiB block */
pt = (uint64_t *)PHYS_TO_DMAP(pd[j] & PG_FRAME);
for (k = 0; k < NPTEPG; k++) {
if ((pt[k] & PG_V) == 0)
@@ -341,7 +339,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize);
- printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
+ printf("Dumping %llu out of %ju MiB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576);
/* Dump leader */
@@ -388,7 +386,7 @@
continue;
}
- /* 1GB page is represented as 512 2MB pages in a dump */
+ /* 1GiB page is represented as 512 2MiB pages in a dump */
if ((pdp[i] & PG_PS) != 0) {
/* PDPE and PDP have identical layout in this case */
fakepd[0] = pdp[i];
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/dump_machdep.c freebsd-10.4/sys/arm/arm/dump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/dump_machdep.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/arm/arm/dump_machdep.c 2021-07-16 16:46:28.912515000 +0800
@@ -173,7 +173,7 @@
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
- printf(" chunk %d: %dMB (%d pages)", seqnr, pgs * PAGE_SIZE / (
+ printf(" chunk %d: %dMiB (%d pages)", seqnr, pgs * PAGE_SIZE / (
1024*1024), pgs);
/*
@@ -350,7 +350,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize);
- printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20,
+ printf("Dumping %llu MiB (%d chunks)\n", (long long)dumpsize >> 20,
ehdr.e_phnum - 1);
/* Dump leader */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/identcpu.c freebsd-10.4/sys/arm/arm/identcpu.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/identcpu.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/arm/arm/identcpu.c 2021-07-16 17:49:00.802073000 +0800
@@ -468,9 +468,9 @@
size = (ways * sets * linesize) / 1024;
if (type == CACHE_UNI_CACHE)
- printf(" %dKB/%dB %d-way unified cache", size, linesize,ways);
+ printf(" %dKiB/%dB %d-way unified cache", size, linesize,ways);
else
- printf(" %dKB/%dB %d-way data cache", size, linesize, ways);
+ printf(" %dKiB/%dB %d-way data cache", size, linesize, ways);
if (reg & CPUV7_CT_CTYPE_WT)
printf(" WT");
if (reg & CPUV7_CT_CTYPE_WB)
@@ -490,7 +490,7 @@
linesize = 1 << (CPUV7_CT_xSIZE_LEN(reg) + 4);
size = (ways * sets * linesize) / 1024;
- printf(" %dKB/%dB %d-way instruction cache", size, linesize, ways);
+ printf(" %dKiB/%dB %d-way instruction cache", size, linesize, ways);
if (reg & CPUV7_CT_CTYPE_WT)
printf(" WT");
if (reg & CPUV7_CT_CTYPE_WB)
@@ -509,15 +509,15 @@
return;
if (arm_pcache_unified) {
- printf(" %dKB/%dB %d-way %s unified cache\n",
+ printf(" %dKiB/%dB %d-way %s unified cache\n",
arm_pdcache_size / 1024,
arm_pdcache_line_size, arm_pdcache_ways,
wtnames[arm_pcache_type]);
} else {
- printf(" %dKB/%dB %d-way instruction cache\n",
+ printf(" %dKiB/%dB %d-way instruction cache\n",
arm_picache_size / 1024,
arm_picache_line_size, arm_picache_ways);
- printf(" %dKB/%dB %d-way %s data cache\n",
+ printf(" %dKiB/%dB %d-way %s data cache\n",
arm_pdcache_size / 1024,
arm_pdcache_line_size, arm_pdcache_ways,
wtnames[arm_pcache_type]);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/machdep.c freebsd-10.4/sys/arm/arm/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/machdep.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/arm/arm/machdep.c 2021-07-16 16:45:43.418076000 +0800
@@ -138,7 +138,7 @@
#ifdef FDT
/*
* This is the number of L2 page tables required for covering max
- * (hypothetical) memsize of 4GB and all kernel mappings (vectors, msgbuf,
+ * (hypothetical) memsize of 4GiB and all kernel mappings (vectors, msgbuf,
* stacks etc.), uprounded to be divisible by 4.
*/
#define KERNEL_PT_MAX 78
@@ -360,10 +360,10 @@
/*
* Display the RAM layout.
*/
- printf("real memory = %ju (%ju MB)\n",
+ printf("real memory = %ju (%ju MiB)\n",
(uintmax_t)arm32_ptob(realmem),
(uintmax_t)arm32_ptob(realmem) / mbyte);
- printf("avail memory = %ju (%ju MB)\n",
+ printf("avail memory = %ju (%ju MiB)\n",
(uintmax_t)arm32_ptob(cnt.v_free_count),
(uintmax_t)arm32_ptob(cnt.v_free_count) / mbyte);
if (bootverbose) {
@@ -1174,10 +1174,10 @@
/*
* Try to map as much as possible of kernel text and data using
- * 1MB section mapping and for the rest of initial kernel address
+ * 1MiB section mapping and for the rest of initial kernel address
* space use L2 coarse tables.
*
- * Link L2 tables for mapping remainder of kernel (modulo 1MB)
+ * Link L2 tables for mapping remainder of kernel (modulo 1MiB)
* and kernel structures
*/
l2_start = lastaddr & ~(L1_S_OFFSET);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/minidump_machdep.c freebsd-10.4/sys/arm/arm/minidump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/minidump_machdep.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/arm/arm/minidump_machdep.c 2021-07-16 16:45:22.530872000 +0800
@@ -228,7 +228,7 @@
for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) {
/*
* We always write a page, even if it is zero. Each
- * page written corresponds to 2MB of space
+ * page written corresponds to 2MiB of space
*/
ptesize += L2_TABLE_SIZE_REAL;
pmap_get_pde_pte(pmap_kernel(), va, &pdp, &ptp);
@@ -243,7 +243,7 @@
continue;
}
if (pmap_pde_v(pdp) && pmap_pde_page(pdp)) {
- /* Set bit for each valid page in this 1MB block */
+ /* Set bit for each valid page in this 1MiB block */
addr = pmap_kenter_temporary(*pdp & L1_C_ADDR_MASK, 0);
pt = (pt_entry_t*)(addr +
(((uint32_t)*pdp & L1_C_ADDR_MASK) & PAGE_MASK));
@@ -313,8 +313,8 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize,
di->blocksize);
- printf("Physical memory: %u MB\n", ptoa((uintmax_t)physmem) / 1048576);
- printf("Dumping %llu MB:", (long long)dumpsize >> 20);
+ printf("Physical memory: %u MiB\n", ptoa((uintmax_t)physmem) / 1048576);
+ printf("Dumping %llu MiB:", (long long)dumpsize >> 20);
/* Dump leader */
error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/physmem.c freebsd-10.4/sys/arm/arm/physmem.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/physmem.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/arm/arm/physmem.c 2021-07-16 16:46:08.769321000 +0800
@@ -113,7 +113,7 @@
for (i = 0; i < hwcnt; ++i) {
addr = hwregions[i].addr;
size = hwregions[i].size;
- prfunc(" 0x%08jx - 0x%08jx, %5ju MB (%7ju pages)\n", addr,
+ prfunc(" 0x%08jx - 0x%08jx, %5ju MiB (%7ju pages)\n", addr,
addr + size - 1, size / mbyte, size / PAGE_SIZE);
}
@@ -122,7 +122,7 @@
addr = exregions[i].addr;
size = exregions[i].size;
flags = exregions[i].flags;
- prfunc(" 0x%08jx - 0x%08jx, %5ju MB (%7ju pages) %s %s\n",
+ prfunc(" 0x%08jx - 0x%08jx, %5ju MiB (%7ju pages) %s %s\n",
addr, addr + size - 1, size / mbyte, size / PAGE_SIZE,
(flags & EXFLAG_NOALLOC) ? "NoAlloc" : "",
(flags & EXFLAG_NODUMP) ? "NoDump" : "");
@@ -287,7 +287,7 @@
* deref early in startup; work around it by leaving the last page out.
*
* XXX This just in: subtract out a whole megabyte, not just 1 page.
- * Reducing the size by anything less than 1MB results in the NULL
+ * Reducing the size by anything less than 1MiB results in the NULL
* pointer deref in _vm_map_lock_read(). Better to give up a megabyte
* than leave some folks with an unusable system while we investigate.
*/
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/pl310.c freebsd-10.4/sys/arm/arm/pl310.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/arm/arm/pl310.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/arm/arm/pl310.c 2021-07-16 17:48:28.649172000 +0800
@@ -500,7 +500,7 @@
pl310_write4(pl310_softc, PL310_INV_WAY, 0xffff);
pl310_wait_background_op(PL310_INV_WAY, 0xffff);
platform_pl310_write_ctrl(sc, CTRL_ENABLED);
- device_printf(dev, "L2 Cache enabled: %uKB/%dB %d ways\n",
+ device_printf(dev, "L2 Cache enabled: %uKiB/%dB %d ways\n",
(g_l2cache_size / 1024), g_l2cache_line_size, g_ways_assoc);
if (bootverbose)
pl310_print_config(sc);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/cam/ata/ata_da.c freebsd-10.4/sys/cam/ata/ata_da.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/cam/ata/ata_da.c 2017-09-29 08:20:08.000000000 +0800
+++ freebsd-10.4/sys/cam/ata/ata_da.c 2021-07-16 18:05:41.020969000 +0800
@@ -1364,7 +1364,7 @@
dp = &softc->params;
snprintf(announce_buf, sizeof(announce_buf),
- "%juMB (%ju %u byte sectors)",
+ "%juMiB (%ju %u byte sectors)",
((uintmax_t)dp->secsize * dp->sectors) / (1024 * 1024),
(uintmax_t)dp->sectors, dp->secsize);
xpt_announce_periph(periph, announce_buf);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/cam/scsi/scsi_all.c freebsd-10.4/sys/cam/scsi/scsi_all.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/cam/scsi/scsi_all.c 2017-09-29 08:20:08.000000000 +0800
+++ freebsd-10.4/sys/cam/scsi/scsi_all.c 2021-07-16 17:34:17.610685000 +0800
@@ -6710,10 +6710,10 @@
struct scsi_attrib_table_entry scsi_mam_attr_table[] = {
{ SMA_ATTR_REM_CAP_PARTITION, SCSI_ATTR_FLAG_NONE,
"Remaining Capacity in Partition",
- /*suffix*/ "MB", /*to_str*/ scsi_attrib_int_sbuf,/*parse_str*/ NULL },
+ /*suffix*/ "MiB", /*to_str*/ scsi_attrib_int_sbuf,/*parse_str*/ NULL },
{ SMA_ATTR_MAX_CAP_PARTITION, SCSI_ATTR_FLAG_NONE,
"Maximum Capacity in Partition",
- /*suffix*/"MB", /*to_str*/ scsi_attrib_int_sbuf, /*parse_str*/ NULL },
+ /*suffix*/"MiB", /*to_str*/ scsi_attrib_int_sbuf, /*parse_str*/ NULL },
{ SMA_ATTR_TAPEALERT_FLAGS, SCSI_ATTR_FLAG_HEX,
"TapeAlert Flags",
/*suffix*/NULL, /*to_str*/ scsi_attrib_int_sbuf, /*parse_str*/ NULL },
@@ -6759,20 +6759,20 @@
/*suffix*/NULL, /*to_str*/ scsi_attrib_vendser_sbuf,
/*parse_str*/ NULL },
{ SMA_ATTR_TOTAL_MB_WRITTEN_LT, SCSI_ATTR_FLAG_NONE,
- "Total MB Written in Medium Life",
- /*suffix*/ "MB", /*to_str*/ scsi_attrib_int_sbuf,
+ "Total MiB Written in Medium Life",
+ /*suffix*/ "MiB", /*to_str*/ scsi_attrib_int_sbuf,
/*parse_str*/ NULL },
{ SMA_ATTR_TOTAL_MB_READ_LT, SCSI_ATTR_FLAG_NONE,
- "Total MB Read in Medium Life",
- /*suffix*/ "MB", /*to_str*/ scsi_attrib_int_sbuf,
+ "Total MiB Read in Medium Life",
+ /*suffix*/ "MiB", /*to_str*/ scsi_attrib_int_sbuf,
/*parse_str*/ NULL },
{ SMA_ATTR_TOTAL_MB_WRITTEN_CUR, SCSI_ATTR_FLAG_NONE,
- "Total MB Written in Current/Last Load",
- /*suffix*/ "MB", /*to_str*/ scsi_attrib_int_sbuf,
+ "Total MiB Written in Current/Last Load",
+ /*suffix*/ "MiB", /*to_str*/ scsi_attrib_int_sbuf,
/*parse_str*/ NULL },
{ SMA_ATTR_TOTAL_MB_READ_CUR, SCSI_ATTR_FLAG_NONE,
- "Total MB Read in Current/Last Load",
- /*suffix*/ "MB", /*to_str*/ scsi_attrib_int_sbuf,
+ "Total MiB Read in Current/Last Load",
+ /*suffix*/ "MiB", /*to_str*/ scsi_attrib_int_sbuf,
/*parse_str*/ NULL },
{ SMA_ATTR_FIRST_ENC_BLOCK, SCSI_ATTR_FLAG_NONE,
"Logical Position of First Encrypted Block",
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/cam/scsi/scsi_cd.c freebsd-10.4/sys/cam/scsi/scsi_cd.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/cam/scsi/scsi_cd.c 2017-09-29 08:20:08.000000000 +0800
+++ freebsd-10.4/sys/cam/scsi/scsi_cd.c 2021-04-27 00:06:12.362517000 +0800
@@ -1085,7 +1085,7 @@
(error = cderror(done_ccb, CAM_RETRY_SELTO,
SF_RETRY_UA | SF_NO_PRINT)) == 0) {
snprintf(announce_buf, sizeof(announce_buf),
- "%juMB (%ju %u byte sectors)",
+ "%juMiB (%ju %u byte sectors)",
((uintmax_t)cdp->disksize * cdp->blksize) /
(1024 * 1024),
(uintmax_t)cdp->disksize, cdp->blksize);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/cam/scsi/scsi_da.c freebsd-10.4/sys/cam/scsi/scsi_da.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/cam/scsi/scsi_da.c 2017-09-29 08:20:08.000000000 +0800
+++ freebsd-10.4/sys/cam/scsi/scsi_da.c 2021-07-16 17:49:49.288051000 +0800
@@ -3174,7 +3174,7 @@
lbp = (lalba & SRC16_LBPME_A);
dp = &softc->params;
snprintf(announce_buf, sizeof(announce_buf),
- "%juMB (%ju %u byte sectors)",
+ "%juMiB (%ju %u byte sectors)",
((uintmax_t)dp->secsize * dp->sectors) /
(1024 * 1024),
(uintmax_t)dp->sectors, dp->secsize);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/contrib/octeon-sdk/cvmx-nand.c freebsd-10.4/sys/contrib/octeon-sdk/cvmx-nand.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/contrib/octeon-sdk/cvmx-nand.c 2017-09-29 08:19:59.000000000 +0800
+++ freebsd-10.4/sys/contrib/octeon-sdk/cvmx-nand.c 2021-07-16 17:34:49.872032000 +0800
@@ -743,7 +743,7 @@
if (cvmx_unlikely(cvmx_nand_flags & CVMX_NAND_INITIALIZE_FLAGS_DEBUG))
{
cvmx_dprintf("%s: Samsung NAND chip detected, using parameters decoded from ID bytes.\n", __FUNCTION__);
- cvmx_dprintf("%s: Defaults: page size: %d, OOB size: %d, pages per block %d, part size: %d MBytes, timing mode: %d\n",
+ cvmx_dprintf("%s: Defaults: page size: %d, OOB size: %d, pages per block %d, part size: %d MiBytes, timing mode: %d\n",
__FUNCTION__, cvmx_nand_state[chip].page_size, cvmx_nand_state[chip].oob_size, cvmx_nand_state[chip].pages_per_block,
(int)(nand_size_bits/(8*1024*1024)), cvmx_nand_state[chip].onfi_timing);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/aac/aac.c freebsd-10.4/sys/dev/aac/aac.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/aac/aac.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/aac/aac.c 2021-07-16 18:11:14.419560000 +0800
@@ -1804,7 +1804,7 @@
/* Read preferred settings */
sc->aac_max_fib_size = sizeof(struct aac_fib);
- sc->aac_max_sectors = 128; /* 64KB */
+ sc->aac_max_sectors = 128; /* 64KiB */
if (sc->flags & AAC_FLAGS_SG_64BIT)
sc->aac_sg_tablesize = (AAC_FIB_DATASIZE
- sizeof(struct aac_blockwrite64))
@@ -1874,7 +1874,7 @@
/*
* The adapter assumes that pages are 4K in size, except on some
* broken firmware versions that do the page->byte conversion twice,
- * therefore 'assuming' that this value is in 16MB units (2^24).
+ * therefore 'assuming' that this value is in 16MiB units (2^24).
* Round up since the granularity is so high.
*/
ip->HostPhysMemPages = ctob(physmem) / AAC_PAGE_SIZE;
@@ -2712,8 +2712,8 @@
sc->aac_revision = info->KernelRevision;
if (bootverbose) {
- device_printf(sc->aac_dev, "%s %dMHz, %dMB memory "
- "(%dMB cache, %dMB execution), %s\n",
+ device_printf(sc->aac_dev, "%s %dMHz, %dMiB memory "
+ "(%dMiB cache, %dMiB execution), %s\n",
aac_describe_code(aac_cpu_variant, info->CpuVariant),
info->ClockSpeed, info->TotalMem / (1024 * 1024),
info->BufferMem / (1024 * 1024),
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/aac/aac_disk.c freebsd-10.4/sys/dev/aac/aac_disk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/aac/aac_disk.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/aac/aac_disk.c 2021-07-16 18:11:35.027924000 +0800
@@ -377,10 +377,10 @@
if (sc->ad_controller->flags & AAC_FLAGS_LBA_64BIT)
sc->ad_size += (u_int64_t)
sc->ad_container->co_mntobj.CapacityHigh << 32;
- if (sc->ad_size >= (2 * 1024 * 1024)) { /* 2GB */
+ if (sc->ad_size >= (2 * 1024 * 1024)) { /* 2GiB */
sc->ad_heads = 255;
sc->ad_sectors = 63;
- } else if (sc->ad_size >= (1 * 1024 * 1024)) { /* 1GB */
+ } else if (sc->ad_size >= (1 * 1024 * 1024)) { /* 1GiB */
sc->ad_heads = 128;
sc->ad_sectors = 32;
} else {
@@ -389,7 +389,7 @@
}
sc->ad_cylinders = (sc->ad_size / (sc->ad_heads * sc->ad_sectors));
- device_printf(dev, "%juMB (%ju sectors)\n",
+ device_printf(dev, "%juMiB (%ju sectors)\n",
(intmax_t)sc->ad_size / ((1024 * 1024) / AAC_BLOCK_SIZE),
(intmax_t)sc->ad_size);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/aacraid/aacraid.c freebsd-10.4/sys/dev/aacraid/aacraid.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/aacraid/aacraid.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/aacraid/aacraid.c 2021-07-16 18:36:45.457851000 +0800
@@ -461,7 +461,7 @@
}
mi = (struct aac_mntinfo *)&fib->data[0];
- /* 4KB support?, 64-bit LBA? */
+ /* 4KiB support?, 64-bit LBA? */
if (sc->aac_support_opt2 & AAC_SUPPORTED_VARIABLE_BLOCK_SIZE)
mi->Command = VM_NameServeAllBlk;
else if (sc->flags & AAC_FLAGS_LBA_64BIT)
@@ -1682,7 +1682,7 @@
/* Read preferred settings */
sc->aac_max_fib_size = sizeof(struct aac_fib);
- sc->aac_max_sectors = 128; /* 64KB */
+ sc->aac_max_sectors = 128; /* 64KiB */
sc->aac_max_aif = 1;
if (sc->flags & AAC_FLAGS_SG_64BIT)
sc->aac_sg_tablesize = (AAC_FIB_DATASIZE
@@ -1772,7 +1772,7 @@
/*
* The adapter assumes that pages are 4K in size, except on some
* broken firmware versions that do the page->byte conversion twice,
- * therefore 'assuming' that this value is in 16MB units (2^24).
+ * therefore 'assuming' that this value is in 16MiB units (2^24).
* Round up since the granularity is so high.
*/
ip->HostPhysMemPages = ctob(physmem) / AAC_PAGE_SIZE;
@@ -2490,8 +2490,8 @@
sc->aac_revision = info->KernelRevision;
if (bootverbose) {
- device_printf(sc->aac_dev, "%s %dMHz, %dMB memory "
- "(%dMB cache, %dMB execution), %s\n",
+ device_printf(sc->aac_dev, "%s %dMHz, %dMiB memory "
+ "(%dMiB cache, %dMiB execution), %s\n",
aac_describe_code(aac_cpu_variant, info->CpuVariant),
info->ClockSpeed, info->TotalMem / (1024 * 1024),
info->BufferMem / (1024 * 1024),
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/amr/amr.c freebsd-10.4/sys/dev/amr/amr.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/amr/amr.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/amr/amr.c 2021-07-16 18:09:59.729160000 +0800
@@ -526,17 +526,17 @@
* Bug-for-bug compatibility with Linux!
* Some apps will send commands with inlen and outlen set to 0,
* even though they expect data to be transfered to them from the
- * card. Linux accidentally allows this by allocating a 4KB
+ * card. Linux accidentally allows this by allocating a 4KiB
* buffer for the transfer anyways, but it then throws it away
* without copying it back to the app.
*
* The amr(4) firmware relies on this feature. In fact, it assumes
- * the buffer is always a power of 2 up to a max of 64k. There is
- * also at least one case where it assumes a buffer less than 16k is
- * greater than 16k. However, forcing all buffers to a size of 32k
+ * the buffer is always a power of 2 up to a max of 64Ki. There is
+ * also at least one case where it assumes a buffer less than 16Ki is
+ * greater than 16Ki. However, forcing all buffers to a size of 32Ki
* causes stalls in the firmware. Force each command smaller than
- * 64k up to the next power of two except that commands between 8k
- * and 16k are rounded up to 32k instead of 16k.
+ * 64Ki up to the next power of two except that commands between 8Ki
+ * and 16Ki are rounded up to 32Ki instead of 16Ki.
*/
static unsigned long
amr_ioctl_buffer_length(unsigned long len)
@@ -2313,7 +2313,7 @@
* Try to get 40LD product info, which tells us what the card is labelled as.
*/
if ((ap = amr_enquiry(sc, 2048, AMR_CMD_CONFIG, AMR_CONFIG_PRODUCT_INFO, 0, &status)) != NULL) {
- device_printf(sc->amr_dev, "<LSILogic %.80s> Firmware %.16s, BIOS %.16s, %dMB RAM\n",
+ device_printf(sc->amr_dev, "<LSILogic %.80s> Firmware %.16s, BIOS %.16s, %dMiB RAM\n",
ap->ap_product, ap->ap_firmware, ap->ap_bios,
ap->ap_memsize);
@@ -2371,7 +2371,7 @@
prod = "HP NetRaid 3si";
}
- device_printf(sc->amr_dev, "<%s> Firmware %c.%02d.%02d, BIOS %c.%02d.%02d, %dMB RAM\n",
+ device_printf(sc->amr_dev, "<%s> Firmware %c.%02d.%02d, BIOS %c.%02d.%02d, %dMiB RAM\n",
prod, ae->ae_adapter.aa_firmware[2],
ae->ae_adapter.aa_firmware[1],
ae->ae_adapter.aa_firmware[0],
@@ -2380,7 +2380,7 @@
ae->ae_adapter.aa_bios[0],
ae->ae_adapter.aa_memorysize);
} else {
- device_printf(sc->amr_dev, "<%s> Firmware %.4s, BIOS %.4s, %dMB RAM\n",
+ device_printf(sc->amr_dev, "<%s> Firmware %.4s, BIOS %.4s, %dMiB RAM\n",
prod, ae->ae_adapter.aa_firmware, ae->ae_adapter.aa_bios,
ae->ae_adapter.aa_memorysize);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/amr/amr_disk.c freebsd-10.4/sys/dev/amr/amr_disk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/amr/amr_disk.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/amr/amr_disk.c 2021-07-16 18:10:15.266216000 +0800
@@ -223,7 +223,7 @@
sc->amrd_drive = device_get_ivars(dev);
sc->amrd_dev = dev;
- device_printf(dev, "%uMB (%u sectors) RAID %d (%s)\n",
+ device_printf(dev, "%uMiB (%u sectors) RAID %d (%s)\n",
sc->amrd_drive->al_size / ((1024 * 1024) / AMR_BLKSIZE),
sc->amrd_drive->al_size, sc->amrd_drive->al_properties & AMR_DRV_RAID_MASK,
amr_describe_code(amr_table_drvstate, AMR_DRV_CURSTATE(sc->amrd_drive->al_state)));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ata/chipsets/ata-promise.c freebsd-10.4/sys/dev/ata/chipsets/ata-promise.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ata/chipsets/ata-promise.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/ata/chipsets/ata-promise.c 2021-07-16 18:23:01.474397000 +0800
@@ -274,7 +274,7 @@
}
/* print info about cache memory */
- device_printf(dev, "DIMM size %dMB @ 0x%08x%s\n",
+ device_printf(dev, "DIMM size %dMiB @ 0x%08x%s\n",
(((dimm >> 16) & 0xff)-((dimm >> 24) & 0xff)+1) << 4,
((dimm >> 24) & 0xff),
ATA_INL(ctlr->r_res2, 0x000c0088) & (1<<16) ?
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/bce/if_bce.c freebsd-10.4/sys/dev/bce/if_bce.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/bce/if_bce.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/bce/if_bce.c 2021-07-16 16:14:02.056521000 +0800
@@ -177,13 +177,13 @@
{0x04000001, 0x47808201, 0x00050081, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2,
- "Non-buffered flash (128kB)"},
+ "Non-buffered flash (128KiB)"},
/* Saifun SA25F020 (non-buffered flash) */
/* strap, cfg1, & write1 need updates */
{0x0c000003, 0x4f808201, 0x00050081, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4,
- "Non-buffered flash (256kB)"},
+ "Non-buffered flash (256KiB)"},
/* Expansion entry 0100 */
{0x11000000, 0x53808201, 0x00050081, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
@@ -193,18 +193,18 @@
{0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE,
ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2,
- "Entry 0101: ST M45PE10 (128kB non-bufferred)"},
+ "Entry 0101: ST M45PE10 (128KiB non-bufferred)"},
/* Entry 0110: ST M45PE20 (non-buffered flash)*/
{0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE,
ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4,
- "Entry 0110: ST M45PE20 (256kB non-bufferred)"},
+ "Entry 0110: ST M45PE20 (256KiB non-bufferred)"},
/* Saifun SA25F005 (non-buffered flash) */
/* strap, cfg1, & write1 need updates */
{0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE,
- "Non-buffered flash (64kB)"},
+ "Non-buffered flash (64KiB)"},
/* Fast EEPROM */
{0x22000000, 0x62808380, 0x009f0081, 0xa184a053, 0xaf000400,
BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE,
@@ -224,7 +224,7 @@
{0x2e000003, 0x6e808273, 0x00570081, 0x68848353, 0xaf000400,
BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE,
- "Buffered flash (128kB)"},
+ "Buffered flash (128KiB)"},
/* Expansion entry 1100 */
{0x33000000, 0x73808201, 0x00050081, 0x03840253, 0xaf020406,
NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
@@ -244,7 +244,7 @@
{0x3f000003, 0x7e808273, 0x00570081, 0x68848353, 0xaf000400,
BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE*2,
- "Buffered flash (256kB)"},
+ "Buffered flash (256KiB)"},
};
/*
@@ -260,7 +260,7 @@
.page_size = BCM5709_FLASH_PAGE_SIZE,
.addr_mask = BCM5709_FLASH_BYTE_ADDR_MASK,
.total_size = BUFFERED_FLASH_TOTAL_SIZE * 2,
- .name = "5709/5716 buffered flash (256kB)",
+ .name = "5709/5716 buffered flash (256KiB)",
};
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/cas/if_cas.c freebsd-10.4/sys/dev/cas/if_cas.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/cas/if_cas.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/cas/if_cas.c 2021-07-16 16:11:30.359709000 +0800
@@ -413,7 +413,7 @@
/* Announce FIFO sizes. */
v = CAS_READ_4(sc, CAS_TX_FIFO_SIZE);
- device_printf(sc->sc_dev, "%ukB RX FIFO, %ukB TX FIFO\n",
+ device_printf(sc->sc_dev, "%uKiB RX FIFO, %uKiB TX FIFO\n",
CAS_RX_FIFO_SIZE / 1024, v / 16);
/* Attach the interface. */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ciss/ciss.c freebsd-10.4/sys/dev/ciss/ciss.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ciss/ciss.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/ciss/ciss.c 2021-07-16 18:12:15.443540000 +0800
@@ -736,7 +736,7 @@
}
/*
- * Tell it we're using the low 4GB of RAM. Set the default interrupt
+ * Tell it we're using the low 4GiB of RAM. Set the default interrupt
* coalescing options.
*/
sc->ciss_cfg->requested_method = method;
@@ -1766,7 +1766,7 @@
* Print the drive's basic characteristics.
*/
if (bootverbose) {
- ciss_printf(sc, "logical drive (b%dt%d): %s, %dMB ",
+ ciss_printf(sc, "logical drive (b%dt%d): %s, %dMiB ",
CISS_LUN_TO_BUS(ld->cl_address.logical.lun),
CISS_LUN_TO_TARGET(ld->cl_address.logical.lun),
ciss_name_ldrive_org(ld->cl_ldrive->fault_tolerance),
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/cxgb/cxgb_main.c freebsd-10.4/sys/dev/cxgb/cxgb_main.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/cxgb/cxgb_main.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/cxgb/cxgb_main.c 2021-07-16 16:23:03.797378000 +0800
@@ -234,7 +234,7 @@
int cxgb_use_16k_clusters = -1;
TUNABLE_INT("hw.cxgb.use_16k_clusters", &cxgb_use_16k_clusters);
SYSCTL_INT(_hw_cxgb, OID_AUTO, use_16k_clusters, CTLFLAG_RDTUN,
- &cxgb_use_16k_clusters, 0, "use 16kB clusters for the jumbo queue ");
+ &cxgb_use_16k_clusters, 0, "use 16KiB clusters for the jumbo queue ");
static int nfilters = -1;
TUNABLE_INT("hw.cxgb.nfilters", &nfilters);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm/drm_agpsupport.c freebsd-10.4/sys/dev/drm/drm_agpsupport.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm/drm_agpsupport.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/drm/drm_agpsupport.c 2021-07-16 18:19:56.446332000 +0800
@@ -416,7 +416,7 @@
agp_get_info(agpdev, &head->info);
head->base = head->info.ai_aperture_base;
head->memory = NULL;
- DRM_INFO("AGP at 0x%08lx %dMB\n",
+ DRM_INFO("AGP at 0x%08lx %dMiB\n",
(long)head->info.ai_aperture_base,
(int)(head->info.ai_aperture_size >> 20));
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm/drm_sysctl.c freebsd-10.4/sys/dev/drm/drm_sysctl.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm/drm_sysctl.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/drm/drm_sysctl.c 2020-09-18 10:53:39.060266000 +0800
@@ -245,7 +245,7 @@
DRM_SPINUNLOCK(&dev->dma_lock);
DRM_UNLOCK();
- DRM_SYSCTL_PRINT("\n o size count free segs pages kB\n");
+ DRM_SYSCTL_PRINT("\n o size count free segs pages KiB\n");
for (i = 0; i <= DRM_MAX_ORDER; i++) {
if (dma->bufs[i].buf_count)
DRM_SYSCTL_PRINT("%2d %8d %5d %5d %5d %5d %5d\n",
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm/mga_dma.c freebsd-10.4/sys/dev/drm/mga_dma.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm/mga_dma.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/drm/mga_dma.c 2021-07-16 18:20:28.536677000 +0800
@@ -499,7 +499,7 @@
err = drm_agp_alloc(dev, &agp_req);
if (err) {
dev_priv->agp_size = 0;
- DRM_ERROR("Unable to allocate %uMB AGP memory\n",
+ DRM_ERROR("Unable to allocate %uMiB AGP memory\n",
dma_bs->agp_size);
return err;
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm2/drm_sysctl.c freebsd-10.4/sys/dev/drm2/drm_sysctl.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm2/drm_sysctl.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/drm2/drm_sysctl.c 2020-09-18 10:53:44.814701000 +0800
@@ -301,7 +301,7 @@
DRM_SPINUNLOCK(&dev->dma_lock);
DRM_UNLOCK(dev);
- DRM_SYSCTL_PRINT("\n o size count free segs pages kB\n");
+ DRM_SYSCTL_PRINT("\n o size count free segs pages KiB\n");
for (i = 0; i <= DRM_MAX_ORDER; i++) {
if (dma->bufs[i].buf_count)
DRM_SYSCTL_PRINT("%2d %8d %5d %5d %5d %5d %5d\n",
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm2/radeon/radeon_benchmark.c freebsd-10.4/sys/dev/drm2/radeon/radeon_benchmark.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm2/radeon/radeon_benchmark.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/drm2/radeon/radeon_benchmark.c 2020-09-18 11:05:43.778003000 +0800
@@ -84,8 +84,8 @@
unsigned sdomain, unsigned ddomain,
char *kind)
{
- unsigned int throughput = (n * (size >> 10)) / time;
- DRM_INFO("radeon: %s %u bo moves of %u kB from"
+ unsigned int throughput = (n * (size / 1000)) / time;
+ DRM_INFO("radeon: %s %u bo moves of %u KiB from"
" %d to %d in %u ms, throughput: %u Mb/s or %u MB/s\n",
kind, n, size >> 10, sdomain, ddomain, time,
throughput * 8, throughput);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm2/radeon/radeon_gart.c freebsd-10.4/sys/dev/drm2/radeon/radeon_gart.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/drm2/radeon/radeon_gart.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/drm2/radeon/radeon_gart.c 2021-07-16 18:22:00.441681000 +0800
@@ -476,7 +476,7 @@
RADEON_GPU_PAGE_ALIGN(size),
RADEON_GEM_DOMAIN_VRAM);
if (r) {
- dev_err(rdev->dev, "failed to allocate vm bo (%dKB)\n",
+ dev_err(rdev->dev, "failed to allocate vm bo (%dKiB)\n",
(rdev->vm_manager.max_pfn * 8) >> 10);
return r;
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/en/midway.c freebsd-10.4/sys/dev/en/midway.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/en/midway.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/en/midway.c 2021-07-16 18:32:46.017363000 +0800
@@ -169,7 +169,7 @@
* params
*/
#ifndef EN_TXHIWAT
-#define EN_TXHIWAT (64 * 1024) /* max 64 KB waiting to be DMAd out */
+#define EN_TXHIWAT (64 * 1024) /* max 64 KiB waiting to be DMAd out */
#endif
SYSCTL_DECL(_hw_atm);
@@ -322,7 +322,7 @@
}
/*
- * en_k2sz: convert KBytes to a size parameter (a log2)
+ * en_k2sz: convert KiBytes to a size parameter (a log2)
*/
static __inline int
en_k2sz(int k)
@@ -2802,9 +2802,9 @@
/*
* Probe card to determine memory size.
*
- * The stupid ENI card always reports to PCI that it needs 4MB of
- * space (2MB regs and 2MB RAM). If it has less than 2MB RAM the
- * addresses wrap in the RAM address space (i.e. on a 512KB card
+ * The stupid ENI card always reports to PCI that it needs 4MiB of
+ * space (2MiB regs and 2MiB RAM). If it has less than 2MiB RAM the
+ * addresses wrap in the RAM address space (i.e. on a 512KiB card
* addresses 0x3ffffc, 0x37fffc, and 0x2ffffc are aliases for
* 0x27fffc [note that RAM starts at offset 0x200000]).
*/
@@ -2848,7 +2848,7 @@
reg = en_read(sc, MID_RESID);
device_printf(sc->dev, "ATM midway v%d, board IDs %d.%d, %s%s%s, "
- "%ldKB on-board RAM\n", MID_VER(reg), MID_MID(reg), MID_DID(reg),
+ "%ldKiB on-board RAM\n", MID_VER(reg), MID_MID(reg), MID_DID(reg),
(MID_IS_SABRE(reg)) ? "sabre controller, " : "",
(MID_IS_SUNI(reg)) ? "SUNI" : "Utopia",
(!MID_IS_SUNI(reg) && MID_IS_UPIPE(reg)) ? " (pipelined)" : "",
@@ -3003,7 +3003,7 @@
sc->rxslot[lcv].mode));
}
- device_printf(sc->dev, "%d %dKB receive buffers, %d %dKB transmit "
+ device_printf(sc->dev, "%d %dKiB receive buffers, %d %dKiB transmit "
"buffers\n", sc->en_nrx, EN_RXSZ, EN_NTX, EN_TXSZ);
device_printf(sc->dev, "end station identifier (mac address) "
"%6D\n", IFP2IFATM(sc->ifp)->mib.esi, ":");
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/fb/machfb.c freebsd-10.4/sys/dev/fb/machfb.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/fb/machfb.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/fb/machfb.c 2021-07-16 15:51:13.006771000 +0800
@@ -1302,12 +1302,12 @@
adp->va_window_gran = adp->va_window_size;
device_printf(dev,
- "%d MB aperture at %p %sswapped\n",
+ "%d MiB aperture at %p %sswapped\n",
(u_int)(adp->va_window_size / (1024 * 1024)),
(void *)adp->va_window, (sc->sc_flags & MACHFB_SWAP) ?
"" : "not ");
device_printf(dev,
- "%ld KB %s %d.%d MHz, maximum RAMDAC clock %d MHz, %sDSP\n",
+ "%ld KiB %s %d.%d MHz, maximum RAMDAC clock %d MHz, %sDSP\n",
(u_long)sc->sc_memsize, machfb_memtype_names[sc->sc_memtype],
sc->sc_mem_freq / 1000, sc->sc_mem_freq % 1000,
sc->sc_ramdac_freq / 1000,
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/fdc/fdc.c freebsd-10.4/sys/dev/fdc/fdc.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/fdc/fdc.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/fdc/fdc.c 2021-07-16 18:41:25.343929000 +0800
@@ -1372,7 +1372,7 @@
} else {
if (debugflags & 0x40) {
device_printf(fd->dev,
- "autoselected %d KB medium\n", fd->ft->size / 2);
+ "autoselected %d KiB medium\n", fd->ft->size / 2);
fdprinttype(fd->ft);
}
return (0);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/fe/if_fe.c freebsd-10.4/sys/dev/fe/if_fe.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/fe/if_fe.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/fe/if_fe.c 2021-07-16 18:28:03.138124000 +0800
@@ -64,7 +64,7 @@
* o To support REX-9886/87(PC-98 only).
* o To reconsider mbuf usage.
* o To reconsider transmission buffer usage, including
- * transmission buffer size (currently 4KB x 2) and pros-and-
+ * transmission buffer size (currently 4KiB x 2) and pros-and-
* cons of multiple frame transmission.
* o To test IPX codes.
* o To test new-bus frontend.
@@ -170,7 +170,7 @@
#define FE_MAX_RECV_COUNT ( ( 65536 - 2048 * 2 ) / 64 )
/*
* Maximum size of SRAM is 65536,
- * minimum size of transmission buffer in fe is 2x2KB,
+ * minimum size of transmission buffer in fe is 2x2KiB,
* and minimum amount of received packet including headers
* added by the chip is 64 bytes.
* Hence FE_MAX_RECV_COUNT is the upper limit for number
@@ -280,7 +280,7 @@
fe_softc_defaults (struct fe_softc *sc)
{
/* Prepare for typical register prototypes. We assume a
- "typical" board has <32KB> of <fast> SRAM connected with a
+ "typical" board has <32KiB> of <fast> SRAM connected with a
<byte-wide> data lines. */
sc->proto_dlcr4 = FE_D4_LBC_DISABLE | FE_D4_CNTRL;
sc->proto_dlcr5 = 0;
@@ -858,7 +858,7 @@
case FE_D6_SRAM_100ns: ram = 100; break;
case FE_D6_SRAM_150ns: ram = 150; break;
}
- device_printf(dev, "SRAM %dKB %dbit %dns, TXB %dKBx2, %dbit I/O\n",
+ device_printf(dev, "SRAM %dKiB %dbit %dns, TXB %dKiBx2, %dbit I/O\n",
buf, bbw, ram, txb, sbw);
}
if (sc->stability & UNSTABLE_IRQ)
@@ -1250,9 +1250,9 @@
* When adding the packet-peek feature, don't forget adding a
* test on txb_count against QUEUEING_MAX.
* There is a little chance the packet count exceeds
- * the limit. Assume transmission buffer is 8KB (2x8KB
+ * the limit. Assume transmission buffer is 8KiB (2x8KiB
* configuration) and an application sends a bunch of small
- * (i.e., minimum packet sized) packets rapidly. An 8KB
+ * (i.e., minimum packet sized) packets rapidly. An 8KiB
* buffer can hold 130 blocks of 62 bytes long...
*/
if (sc->txb_free
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/firewire/sbp.c freebsd-10.4/sys/dev/firewire/sbp.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/firewire/sbp.c 2017-09-29 08:19:50.000000000 +0800
+++ freebsd-10.4/sys/dev/firewire/sbp.c 2021-07-16 18:37:27.436511000 +0800
@@ -91,7 +91,7 @@
* because of CAM_SCSI2_MAXLUN in cam_xpt.c
*/
#define SBP_NUM_LUNS 64
-#define SBP_MAXPHYS MIN(MAXPHYS, (512*1024) /* 512KB */)
+#define SBP_MAXPHYS MIN(MAXPHYS, (512*1024) /* 512KiB */)
#define SBP_DMA_SIZE PAGE_SIZE
#define SBP_LOGIN_SIZE sizeof(struct sbp_login_res)
#define SBP_QUEUE_LEN ((SBP_DMA_SIZE - SBP_LOGIN_SIZE) / sizeof(struct sbp_ocb))
@@ -1945,8 +1945,8 @@
int i, error;
if (DFLTPHYS > SBP_MAXPHYS)
- device_printf(dev, "Warning, DFLTPHYS(%dKB) is larger than "
- "SBP_MAXPHYS(%dKB).\n", DFLTPHYS / 1024,
+ device_printf(dev, "Warning, DFLTPHYS(%dKiB) is larger than "
+ "SBP_MAXPHYS(%dKiB).\n", DFLTPHYS / 1024,
SBP_MAXPHYS / 1024);
if (!firewire_phydma_enable)
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/gem/if_gem.c freebsd-10.4/sys/dev/gem/if_gem.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/gem/if_gem.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/gem/if_gem.c 2021-07-16 16:07:21.636358000 +0800
@@ -372,7 +372,7 @@
/* Get TX FIFO size. */
v = GEM_BANK1_READ_4(sc, GEM_TX_FIFO_SIZE);
- device_printf(sc->sc_dev, "%ukB RX FIFO, %ukB TX FIFO\n",
+ device_printf(sc->sc_dev, "%uKiB RX FIFO, %uKiB TX FIFO\n",
sc->sc_rxfifosize / 1024, v / 16);
/* Attach the interface. */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/hptmv/hptproc.c freebsd-10.4/sys/dev/hptmv/hptproc.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/hptmv/hptproc.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/hptmv/hptproc.c 2021-07-16 18:23:24.406664000 +0800
@@ -399,7 +399,7 @@
#endif
arrayname[0]=0;
- hpt_copy_info(pinfo, "Channel %d %s %5dMB %s %s\n",
+ hpt_copy_info(pinfo, "Channel %d %s %5dMiB %s %s\n",
iChan+1,
name, pVDev->VDeviceCapacity>>11, status, arrayname);
}
@@ -458,7 +458,7 @@
if (pTmpArray->u.array.rf_rebuilding) {
#ifdef DEBUG
- sprintf(buf, "Rebuilding %lldMB", (pTmpArray->u.array.RebuildSectors>>11));
+ sprintf(buf, "Rebuilding %lldMiB", (pTmpArray->u.array.RebuildSectors>>11));
#else
sprintf(buf, "Rebuilding %d%%", (UINT)((pTmpArray->u.array.RebuildSectors>>11)*100/((pTmpArray->VDeviceCapacity/(pTmpArray->u.array.bArnMember-1))>>11)));
#endif
@@ -480,7 +480,7 @@
}
out:
if (!sStatus) sStatus = "Normal";
- hpt_copy_info(pinfo, "%2d %11s %-20s %5lldMB %-16s", nld, sType, pArray->u.array.ArrayName, pArray->VDeviceCapacity>>11, sStatus);
+ hpt_copy_info(pinfo, "%2d %11s %-20s %5lldMiB %-16s", nld, sType, pArray->u.array.ArrayName, pArray->VDeviceCapacity>>11, sStatus);
}
#endif
@@ -542,7 +542,7 @@
#endif
get_disk_name(name, &pVDev->u.disk);
- hpt_copy_info(pinfo, "%2d %s %s %5dMB %-16s",
+ hpt_copy_info(pinfo, "%2d %s %s %5dMiB %-16s",
j, "Single disk", name, pVDev->VDeviceCapacity>>11,
/* gmm 2001-6-19: Check if pDev has been added to an array. */
((pVDev->pParent) ? "Unavailable" : "Normal"));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ida/ida_disk.c freebsd-10.4/sys/dev/ida/ida_disk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ida/ida_disk.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/ida/ida_disk.c 2021-07-16 18:11:54.271648000 +0800
@@ -196,7 +196,7 @@
/* XXX
* other initialization
*/
- device_printf(dev, "%uMB (%u sectors), blocksize=%d\n",
+ device_printf(dev, "%uMiB (%u sectors), blocksize=%d\n",
drv->secperunit / ((1024 * 1024) / drv->secsize),
drv->secperunit, drv->secsize);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ie/if_ie_isa.c freebsd-10.4/sys/dev/ie/if_ie_isa.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ie/if_ie_isa.c 2017-09-29 08:19:49.000000000 +0800
+++ freebsd-10.4/sys/dev/ie/if_ie_isa.c 2021-07-16 18:30:08.137429000 +0800
@@ -184,7 +184,7 @@
if (bootverbose) {
device_printf(parent,
- "(if_ie) <%s> at port %#x-%#x irq %d iomem %#lx-%#lx (%dKB)\n",
+ "(if_ie) <%s> at port %#x-%#x irq %d iomem %#lx-%#lx (%dKiB)\n",
desc,
port, (port + IE_3C507_IOSIZE) - 1,
irq,
@@ -386,7 +386,7 @@
if (bootverbose) {
device_printf(parent,
- "if_ie: <%s> at port %#x-%#x irq %d iomem %#lx-%#lx (%dKB)\n",
+ "if_ie: <%s> at port %#x-%#x irq %d iomem %#lx-%#lx (%dKiB)\n",
desc,
port, (port + IE_EE16_IOSIZE) - 1,
irq,
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ips/ips_disk.c freebsd-10.4/sys/dev/ips/ips_disk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/ips/ips_disk.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/ips/ips_disk.c 2021-07-16 18:19:42.457978000 +0800
@@ -159,7 +159,7 @@
dsc->ipsd_disk->d_flags = 0;
disk_create(dsc->ipsd_disk, DISK_VERSION);
- device_printf(dev, "Logical Drive (%dMB)\n",
+ device_printf(dev, "Logical Drive (%dMiB)\n",
dsc->sc->drives[dsc->disk_number].sector_count >> 11);
return 0;
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mfi/mfi_disk.c freebsd-10.4/sys/dev/mfi/mfi_disk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mfi/mfi_disk.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/mfi/mfi_disk.c 2021-07-16 18:28:23.271671000 +0800
@@ -141,11 +141,11 @@
if ( strlen(ld_info->ld_config.properties.name) == 0 ) {
device_printf(dev,
- "%juMB (%ju sectors) RAID volume (no label) is %s\n",
+ "%juMiB (%ju sectors) RAID volume (no label) is %s\n",
sectors / (1024 * 1024 / secsize), sectors, state);
} else {
device_printf(dev,
- "%juMB (%ju sectors) RAID volume '%s' is %s\n",
+ "%juMiB (%ju sectors) RAID volume '%s' is %s\n",
sectors / (1024 * 1024 / secsize), sectors,
ld_info->ld_config.properties.name, state);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mfi/mfi_syspd.c freebsd-10.4/sys/dev/mfi/mfi_syspd.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mfi/mfi_syspd.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/mfi/mfi_syspd.c 2021-07-16 18:28:49.179915000 +0800
@@ -122,7 +122,7 @@
break;
}
mtx_unlock(&sc->pd_controller->mfi_io_lock);
- device_printf(dev, "%juMB (%ju sectors) SYSPD volume (deviceid: %d)\n",
+ device_printf(dev, "%juMiB (%ju sectors) SYSPD volume (deviceid: %d)\n",
sectors / (1024 * 1024 / secsize), sectors, sc->pd_id);
sc->pd_disk = disk_alloc();
sc->pd_disk->d_drv1 = sc;
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mlx/mlx.c freebsd-10.4/sys/dev/mlx/mlx.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mlx/mlx.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/mlx/mlx.c 2021-07-16 18:35:27.764301000 +0800
@@ -2937,7 +2937,7 @@
sprintf(buf, " model 0x%x", sc->mlx_enq2->me_hardware_id & 0xff);
model = buf;
}
- device_printf(sc->mlx_dev, "DAC%s, %d channel%s, firmware %d.%02d-%c-%02d, %dMB RAM\n",
+ device_printf(sc->mlx_dev, "DAC%s, %d channel%s, firmware %d.%02d-%c-%02d, %dMiB RAM\n",
model,
sc->mlx_enq2->me_actual_channels,
sc->mlx_enq2->me_actual_channels > 1 ? "s" : "",
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mlx/mlx_disk.c freebsd-10.4/sys/dev/mlx/mlx_disk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mlx/mlx_disk.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/mlx/mlx_disk.c 2021-07-16 18:35:09.889664000 +0800
@@ -231,7 +231,7 @@
state = "unknown state";
}
- device_printf(dev, "%uMB (%u sectors) RAID %d (%s)\n",
+ device_printf(dev, "%uMiB (%u sectors) RAID %d (%s)\n",
sc->mlxd_drive->ms_size / ((1024 * 1024) / MLX_BLKSIZE),
sc->mlxd_drive->ms_size, sc->mlxd_drive->ms_raidlevel, state);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mly/mly.c freebsd-10.4/sys/dev/mly/mly.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/mly/mly.c 2017-09-29 08:19:51.000000000 +0800
+++ freebsd-10.4/sys/dev/mly/mly.c 2021-07-16 18:21:40.039136000 +0800
@@ -2483,7 +2483,7 @@
{
struct mly_ioctl_getcontrollerinfo *mi = sc->mly_controllerinfo;
- mly_printf(sc, "%16s, %d channel%s, firmware %d.%02d-%d-%02d (%02d%02d%02d%02d), %dMB RAM\n",
+ mly_printf(sc, "%16s, %d channel%s, firmware %d.%02d-%d-%02d (%02d%02d%02d%02d), %dMiB RAM\n",
mi->controller_name, mi->physical_channels_present, (mi->physical_channels_present) > 1 ? "s" : "",
mi->fw_major, mi->fw_minor, mi->fw_turn, mi->fw_build, /* XXX turn encoding? */
mi->fw_century, mi->fw_year, mi->fw_month, mi->fw_day,
@@ -2494,7 +2494,7 @@
mly_describe_code(mly_table_oemname, mi->oem_information),
mly_describe_code(mly_table_controllertype, mi->controller_type), mi->controller_type,
mi->interface_speed, mi->interface_width, mi->interface_name);
- mly_printf(sc, "%dMB %dMHz %d-bit %s%s%s, cache %dMB\n",
+ mly_printf(sc, "%dMiB %dMHz %d-bit %s%s%s, cache %dMiB\n",
mi->memory_size, mi->memory_speed, mi->memory_width,
mly_describe_code(mly_table_memorytype, mi->memory_type),
mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
@@ -2502,9 +2502,9 @@
mly_printf(sc, "CPU: %s @ %dMHz\n",
mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
if (mi->l2cache_size != 0)
- mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
+ mly_printf(sc, "%dKiB L2 cache\n", mi->l2cache_size);
if (mi->exmemory_size != 0)
- mly_printf(sc, "%dMB %dMHz %d-bit private %s%s%s\n",
+ mly_printf(sc, "%dMiB %dMHz %d-bit private %s%s%s\n",
mi->exmemory_size, mi->exmemory_speed, mi->exmemory_width,
mly_describe_code(mly_table_memorytype, mi->exmemory_type),
mi->exmemory_parity ? "+parity": "",mi->exmemory_ecc ? "+ECC": "");
@@ -2522,7 +2522,7 @@
mi->virtual_channels_present, mi->virtual_channels_present == 1 ? "" : "s",
mi->virtual_channels_possible);
mly_printf(sc, "%d parallel commands supported\n", mi->maximum_parallel_commands);
- mly_printf(sc, "%dMB flash ROM, %d of %d maximum cycles\n",
+ mly_printf(sc, "%dMiB flash ROM, %d of %d maximum cycles\n",
mi->flash_size, mi->flash_age, mi->flash_maximum_age);
}
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/msk/if_msk.c freebsd-10.4/sys/dev/msk/if_msk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/msk/if_msk.c 2017-09-29 08:19:53.000000000 +0800
+++ freebsd-10.4/sys/dev/msk/if_msk.c 2021-07-16 18:33:58.001505000 +0800
@@ -1210,7 +1210,7 @@
sc->msk_ramsize = CSR_READ_1(sc, B2_E_0) * 4;
if (bootverbose)
device_printf(sc->msk_dev,
- "RAM buffer size : %dKB\n", sc->msk_ramsize);
+ "RAM buffer size : %dKiB\n", sc->msk_ramsize);
if (sc->msk_ramsize == 0)
return (0);
@@ -1231,11 +1231,11 @@
next = sc->msk_txqend[i] + 1;
if (bootverbose) {
device_printf(sc->msk_dev,
- "Port %d : Rx Queue %dKB(0x%08x:0x%08x)\n", i,
+ "Port %d : Rx Queue %dKiB(0x%08x:0x%08x)\n", i,
sc->msk_rxqsize / 1024, sc->msk_rxqstart[i],
sc->msk_rxqend[i]);
device_printf(sc->msk_dev,
- "Port %d : Tx Queue %dKB(0x%08x:0x%08x)\n", i,
+ "Port %d : Tx Queue %dKiB(0x%08x:0x%08x)\n", i,
sc->msk_txqsize / 1024, sc->msk_txqstart[i],
sc->msk_txqend[i]);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/netmap/netmap_mem2.c freebsd-10.4/sys/dev/netmap/netmap_mem2.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/netmap/netmap_mem2.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/netmap/netmap_mem2.c 2021-07-16 18:37:08.617635000 +0800
@@ -811,7 +811,7 @@
p->r_objtotal = objtotal;
p->r_objsize = objsize;
-#define MAX_CLUSTSIZE (1<<22) // 4 MB
+#define MAX_CLUSTSIZE (1<<22) // 4 MiB
#define LINE_ROUND NM_CACHE_ALIGN // 64
if (objsize >= MAX_CLUSTSIZE) {
/* we could do it but there is no point */
@@ -965,7 +965,7 @@
if (p->objfree == 0)
goto clean;
if (netmap_verbose)
- D("Pre-allocated %d clusters (%d/%dKB) for '%s'",
+ D("Pre-allocated %d clusters (%d/%dKiB) for '%s'",
p->numclusters, p->_clustsize >> 10,
p->memtotal >> 10, p->name);
@@ -1064,7 +1064,7 @@
nmd->flags |= NETMAP_MEM_FINALIZED;
if (netmap_verbose)
- D("interfaces %d KB, rings %d KB, buffers %d MB",
+ D("interfaces %d KiB, rings %d KiB, buffers %d MiB",
nmd->pools[NETMAP_IF_POOL].memtotal >> 10,
nmd->pools[NETMAP_RING_POOL].memtotal >> 10,
nmd->pools[NETMAP_BUF_POOL].memtotal >> 20);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/nvd/nvd.c freebsd-10.4/sys/dev/nvd/nvd.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/nvd/nvd.c 2017-09-29 08:19:53.000000000 +0800
+++ freebsd-10.4/sys/dev/nvd/nvd.c 2021-07-16 18:30:42.701057000 +0800
@@ -98,7 +98,7 @@
* default here that is still suitably large to minimize the number of overall
* delete operations.
*/
-static uint64_t nvd_delete_max = (1024 * 1024 * 1024); /* 1GB */
+static uint64_t nvd_delete_max = (1024 * 1024 * 1024); /* 1GiB */
SYSCTL_UQUAD(_hw_nvd, OID_AUTO, delete_max, CTLFLAG_RDTUN, &nvd_delete_max, 0,
"nvd maximum BIO_DELETE size in bytes");
@@ -363,7 +363,7 @@
disk_create(disk, DISK_VERSION);
printf(NVD_STR"%u: <%s> NVMe namespace\n", disk->d_unit, descr);
- printf(NVD_STR"%u: %juMB (%ju %u byte sectors)\n", disk->d_unit,
+ printf(NVD_STR"%u: %juMiB (%ju %u byte sectors)\n", disk->d_unit,
(uintmax_t)disk->d_mediasize / (1024*1024),
(uintmax_t)disk->d_mediasize / disk->d_sectorsize,
disk->d_sectorsize);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/nxge/xgehal/xgehal-device.c freebsd-10.4/sys/dev/nxge/xgehal/xgehal-device.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/nxge/xgehal/xgehal-device.c 2017-09-29 08:19:53.000000000 +0800
+++ freebsd-10.4/sys/dev/nxge/xgehal/xgehal-device.c 2021-07-16 18:42:29.920992000 +0800
@@ -5295,7 +5295,7 @@
if (left_dram_size < 0 ||
(ring_auto_dram_cfg && left_dram_size / ring_auto_dram_cfg == 0)) {
xge_debug_device(XGE_ERR,
- "ring config: exceeded DRAM size %d MB",
+ "ring config: exceeded DRAM size %d MiB",
total_dram_size_max);
xge_hal_device_terminate(hldev);
return XGE_HAL_BADCFG_RING_QUEUE_SIZE;
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/pst/pst-raid.c freebsd-10.4/sys/dev/pst/pst-raid.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/pst/pst-raid.c 2017-09-29 08:19:55.000000000 +0800
+++ freebsd-10.4/sys/dev/pst/pst-raid.c 2021-07-19 11:40:01.846389000 +0800
@@ -163,7 +163,7 @@
disk_create(psc->disk, DISK_VERSION);
- printf("pst%d: %lluMB <%.40s> [%lld/%d/%d] on %.16s\n", lun,
+ printf("pst%d: %lluMiB <%.40s> [%lld/%d/%d] on %.16s\n", lun,
(unsigned long long)psc->info->capacity / (1024 * 1024),
name, psc->info->capacity/(512*255*63), 255, 63,
device_get_nameunit(psc->iop->dev));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/qlnx/qlnxe/ecore_dev.c freebsd-10.4/sys/dev/qlnx/qlnxe/ecore_dev.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/qlnx/qlnxe/ecore_dev.c 2017-09-29 08:19:47.000000000 +0800
+++ freebsd-10.4/sys/dev/qlnx/qlnxe/ecore_dev.c 2021-07-16 16:24:21.601092000 +0800
@@ -392,11 +392,11 @@
*/
if (p_hwfn->p_dev->num_hwfns > 1) {
DP_INFO(p_hwfn,
- "BAR size not configured. Assuming BAR size of 256kB for GRC and 512kB for DB\n");
+ "BAR size not configured. Assuming BAR size of 256KiB for GRC and 512KiB for DB\n");
return BAR_ID_0 ? 256 * 1024 : 512 * 1024;
} else {
DP_INFO(p_hwfn,
- "BAR size not configured. Assuming BAR size of 512kB for GRC and 512kB for DB\n");
+ "BAR size not configured. Assuming BAR size of 512KiB for GRC and 512KiB for DB\n");
return 512 * 1024;
}
}
@@ -1937,9 +1937,9 @@
* trusted applications, typically from user space. Each page, called a
* doorbell page is sectioned into windows that allow doorbells to be
* issued in parallel by the kernel/application. The size of such a
- * window (a.k.a. WID) is 1kB.
+ * window (a.k.a. WID) is 1KiB.
* Summary:
- * 1kB WID x N WIDS = DPI page size
+ * 1KiB WID x N WIDS = DPI page size
* DPI page size x N DPIs = PWM region size
* Notes:
* The size of the DPI page size must be in multiples of OSAL_PAGE_SIZE
@@ -1948,7 +1948,7 @@
* It also must be a power of 2, since it is stored as a bit shift.
*
* The DPI page size is stored in a register as 'dpi_bit_shift' so that
- * 0 is 4kB, 1 is 8kB and etc. Hence the minimum size is 4,096
+ * 0 is 4KiB, 1 is 8KiB and etc. Hence the minimum size is 4,096
* containing 4 WIDs.
*/
dpi_page_size_1 = ECORE_WID_SIZE * n_cpus;
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/sound/pcm/feeder_rate.c freebsd-10.4/sys/dev/sound/pcm/feeder_rate.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/sound/pcm/feeder_rate.c 2017-09-29 08:19:49.000000000 +0800
+++ freebsd-10.4/sys/dev/sound/pcm/feeder_rate.c 2021-07-16 17:44:43.075144000 +0800
@@ -1387,13 +1387,13 @@
fprintf(stderr, "\t%15s%10d Bytes\n",
"", info->z_alloc);
else if (info->z_alloc < (1024 << 10))
- fprintf(stderr, "\t%15s%10d KBytes\n",
+ fprintf(stderr, "\t%15s%10d KiBytes\n",
"", info->z_alloc >> 10);
else if (info->z_alloc < (1024 << 20))
- fprintf(stderr, "\t%15s%10d MBytes\n",
+ fprintf(stderr, "\t%15s%10d MiBytes\n",
"", info->z_alloc >> 20);
else
- fprintf(stderr, "\t%15s%10d GBytes\n",
+ fprintf(stderr, "\t%15s%10d GiBytes\n",
"", info->z_alloc >> 30);
fprintf(stderr, "\t%12s %10d (min output samples)\n",
"",
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/twe/twe.c freebsd-10.4/sys/dev/twe/twe.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/twe/twe.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/twe/twe.c 2021-07-16 18:34:39.938367000 +0800
@@ -1681,7 +1681,7 @@
twe_get_param_4(sc, TWE_PARAM_DRIVEINFO + i, TWE_PARAM_DRIVEINFO_Size, &size);
p[1] = twe_get_param(sc, TWE_PARAM_DRIVEINFO + i, TWE_PARAM_DRIVEINFO_Model, 40, NULL);
if (p[1] != NULL) {
- twe_printf(sc, "port %d: %.40s %dMB\n", i, p[1]->data, size / 2048);
+ twe_printf(sc, "port %d: %.40s %dMiB\n", i, p[1]->data, size / 2048);
free(p[1], M_DEVBUF);
} else {
twe_printf(sc, "port %d, drive status unavailable\n", i);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/twe/twe_freebsd.c freebsd-10.4/sys/dev/twe/twe_freebsd.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/twe/twe_freebsd.c 2017-09-29 08:19:54.000000000 +0800
+++ freebsd-10.4/sys/dev/twe/twe_freebsd.c 2021-07-16 18:34:51.641320000 +0800
@@ -819,7 +819,7 @@
sc->twed_dev = dev;
/* report the drive */
- twed_printf(sc, "%uMB (%u sectors)\n",
+ twed_printf(sc, "%uMiB (%u sectors)\n",
sc->twed_drive->td_size / ((1024 * 1024) / TWE_BLOCK_SIZE),
sc->twed_drive->td_size);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/virtio/block/virtio_blk.c freebsd-10.4/sys/dev/virtio/block/virtio_blk.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/virtio/block/virtio_blk.c 2017-09-29 08:19:52.000000000 +0800
+++ freebsd-10.4/sys/dev/virtio/block/virtio_blk.c 2021-07-16 18:20:55.429727000 +0800
@@ -638,7 +638,7 @@
dp->d_mediasize = new_capacity;
if (bootverbose) {
- device_printf(dev, "resized to %juMB (%ju %u byte sectors)\n",
+ device_printf(dev, "resized to %juMiB (%ju %u byte sectors)\n",
(uintmax_t) dp->d_mediasize >> 20,
(uintmax_t) dp->d_mediasize / dp->d_sectorsize,
dp->d_sectorsize);
@@ -732,7 +732,7 @@
vtblk_ident(sc);
- device_printf(sc->vtblk_dev, "%juMB (%ju %u byte sectors)\n",
+ device_printf(sc->vtblk_dev, "%juMiB (%ju %u byte sectors)\n",
(uintmax_t) dp->d_mediasize >> 20,
(uintmax_t) dp->d_mediasize / dp->d_sectorsize,
dp->d_sectorsize);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/dev/xen/blkfront/blkfront.c freebsd-10.4/sys/dev/xen/blkfront/blkfront.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/dev/xen/blkfront/blkfront.c 2017-09-29 08:19:49.000000000 +0800
+++ freebsd-10.4/sys/dev/xen/blkfront/blkfront.c 2021-07-16 18:19:14.299309000 +0800
@@ -608,7 +608,7 @@
*/
mtx_lock(&sc->xbd_io_lock);
- /* Split the 64KB block as needed */
+ /* Split the 64KiB block as needed */
for (sbp=0; length > 0; sbp++) {
cm = xbd_dequeue_cm(sc, XBD_Q_FREE);
if (cm == NULL) {
@@ -1347,7 +1347,7 @@
}
if (sc->xbd_disk == NULL) {
- device_printf(dev, "%juMB <%s> at %s",
+ device_printf(dev, "%juMiB <%s> at %s",
(uintmax_t) sectors / (1048576 / sector_size),
device_get_desc(dev),
xenbus_get_node(dev));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/geom/geom_flashmap.c freebsd-10.4/sys/geom/geom_flashmap.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/geom/geom_flashmap.c 2017-09-29 08:20:02.000000000 +0800
+++ freebsd-10.4/sys/geom/geom_flashmap.c 2021-07-16 18:37:44.961879000 +0800
@@ -81,7 +81,7 @@
g_flashmap_print(struct g_flashmap_slice *slice)
{
- printf("%08jx-%08jx: %s (%juKB)\n", (uintmax_t)slice->sl_start,
+ printf("%08jx-%08jx: %s (%juKiB)\n", (uintmax_t)slice->sl_start,
(uintmax_t)slice->sl_end, slice->sl_name,
(uintmax_t)(slice->sl_end - slice->sl_start) / 1024);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/geom/raid3/g_raid3.c freebsd-10.4/sys/geom/raid3/g_raid3.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/geom/raid3/g_raid3.c 2017-09-29 08:20:02.000000000 +0800
+++ freebsd-10.4/sys/geom/raid3/g_raid3.c 2021-07-16 16:35:27.583167000 +0800
@@ -82,15 +82,15 @@
static u_int g_raid3_n64k = 50;
TUNABLE_INT("kern.geom.raid3.n64k", &g_raid3_n64k);
SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n64k, CTLFLAG_RD, &g_raid3_n64k, 0,
- "Maximum number of 64kB allocations");
+ "Maximum number of 64KiB allocations");
static u_int g_raid3_n16k = 200;
TUNABLE_INT("kern.geom.raid3.n16k", &g_raid3_n16k);
SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n16k, CTLFLAG_RD, &g_raid3_n16k, 0,
- "Maximum number of 16kB allocations");
+ "Maximum number of 16KiB allocations");
static u_int g_raid3_n4k = 1200;
TUNABLE_INT("kern.geom.raid3.n4k", &g_raid3_n4k);
SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n4k, CTLFLAG_RD, &g_raid3_n4k, 0,
- "Maximum number of 4kB allocations");
+ "Maximum number of 4KiB allocations");
static SYSCTL_NODE(_kern_geom_raid3, OID_AUTO, stat, CTLFLAG_RW, 0,
"GEOM_RAID3 statistics");
@@ -3179,21 +3179,21 @@
sc->sc_sync.ds_geom = gp;
if (!g_raid3_use_malloc) {
- sc->sc_zones[G_RAID3_ZONE_64K].sz_zone = uma_zcreate("gr3:64k",
+ sc->sc_zones[G_RAID3_ZONE_64K].sz_zone = uma_zcreate("gr3:64kib",
65536, g_raid3_uma_ctor, g_raid3_uma_dtor, NULL, NULL,
UMA_ALIGN_PTR, 0);
sc->sc_zones[G_RAID3_ZONE_64K].sz_inuse = 0;
sc->sc_zones[G_RAID3_ZONE_64K].sz_max = g_raid3_n64k;
sc->sc_zones[G_RAID3_ZONE_64K].sz_requested =
sc->sc_zones[G_RAID3_ZONE_64K].sz_failed = 0;
- sc->sc_zones[G_RAID3_ZONE_16K].sz_zone = uma_zcreate("gr3:16k",
+ sc->sc_zones[G_RAID3_ZONE_16K].sz_zone = uma_zcreate("gr3:16kib",
16384, g_raid3_uma_ctor, g_raid3_uma_dtor, NULL, NULL,
UMA_ALIGN_PTR, 0);
sc->sc_zones[G_RAID3_ZONE_16K].sz_inuse = 0;
sc->sc_zones[G_RAID3_ZONE_16K].sz_max = g_raid3_n16k;
sc->sc_zones[G_RAID3_ZONE_16K].sz_requested =
sc->sc_zones[G_RAID3_ZONE_16K].sz_failed = 0;
- sc->sc_zones[G_RAID3_ZONE_4K].sz_zone = uma_zcreate("gr3:4k",
+ sc->sc_zones[G_RAID3_ZONE_4K].sz_zone = uma_zcreate("gr3:4kib",
4096, g_raid3_uma_ctor, g_raid3_uma_dtor, NULL, NULL,
UMA_ALIGN_PTR, 0);
sc->sc_zones[G_RAID3_ZONE_4K].sz_inuse = 0;
@@ -3490,22 +3490,22 @@
sx_xlock(&sc->sc_lock);
if (!g_raid3_use_malloc) {
sbuf_printf(sb,
- "%s<Zone4kRequested>%u</Zone4kRequested>\n", indent,
+ "%s<Zone4KiBRequested>%u</Zone4KiBRequested>\n", indent,
sc->sc_zones[G_RAID3_ZONE_4K].sz_requested);
sbuf_printf(sb,
- "%s<Zone4kFailed>%u</Zone4kFailed>\n", indent,
+ "%s<Zone4KiBFailed>%u</Zone4KiBFailed>\n", indent,
sc->sc_zones[G_RAID3_ZONE_4K].sz_failed);
sbuf_printf(sb,
- "%s<Zone16kRequested>%u</Zone16kRequested>\n", indent,
+ "%s<Zone16KiBRequested>%u</Zone16KiBRequested>\n", indent,
sc->sc_zones[G_RAID3_ZONE_16K].sz_requested);
sbuf_printf(sb,
- "%s<Zone16kFailed>%u</Zone16kFailed>\n", indent,
+ "%s<Zone16KiBFailed>%u</Zone16KiBFailed>\n", indent,
sc->sc_zones[G_RAID3_ZONE_16K].sz_failed);
sbuf_printf(sb,
- "%s<Zone64kRequested>%u</Zone64kRequested>\n", indent,
+ "%s<Zone64KiBRequested>%u</Zone64KiBRequested>\n", indent,
sc->sc_zones[G_RAID3_ZONE_64K].sz_requested);
sbuf_printf(sb,
- "%s<Zone64kFailed>%u</Zone64kFailed>\n", indent,
+ "%s<Zone64KiBFailed>%u</Zone64KiBFailed>\n", indent,
sc->sc_zones[G_RAID3_ZONE_64K].sz_failed);
}
sbuf_printf(sb, "%s<ID>%u</ID>\n", indent, (u_int)sc->sc_id);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/geom/vinum/geom_vinum_share.h freebsd-10.4/sys/geom/vinum/geom_vinum_share.h
--- /var/archive3/public/freebsd-releng-10.4-src/sys/geom/vinum/geom_vinum_share.h 2017-09-29 08:20:02.000000000 +0800
+++ freebsd-10.4/sys/geom/vinum/geom_vinum_share.h 2020-09-18 10:55:58.908124000 +0800
@@ -33,9 +33,12 @@
#define GV_MAXARGS 64
enum {
- KILOBYTE = 1024,
- MEGABYTE = 1048576,
- GIGABYTE = 1073741824
+ KILOBYTE = 1000,
+ MEGABYTE = 1000000,
+ GIGABYTE = 1000000000,
+ KIBIBYTE = 1024,
+ MEBIBYTE = 1048576,
+ GIBIBYTE = 1073741824
};
off_t gv_sizespec(char *);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/geom/virstor/g_virstor.c freebsd-10.4/sys/geom/virstor/g_virstor.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/geom/virstor/g_virstor.c 2017-09-29 08:20:02.000000000 +0800
+++ freebsd-10.4/sys/geom/virstor/g_virstor.c 2020-09-18 11:10:52.561272000 +0800
@@ -1237,7 +1237,7 @@
for (n = 0; n < sc->n_components; n++)
count += sc->components[n].chunk_count;
LOG_MSG(LVL_INFO, "Device %s has %zu physical chunks and %zu virtual "
- "(%zu KB chunks)",
+ "(%zu KiB chunks)",
sc->geom->name, count, sc->chunk_count, sc->chunk_size / 1024);
error = g_access(sc->components[0].gcons, 1, 0, 0);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/i386/i386/machdep.c freebsd-10.4/sys/i386/i386/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/i386/i386/machdep.c 2017-09-29 08:20:02.000000000 +0800
+++ freebsd-10.4/sys/i386/i386/machdep.c 2021-07-16 18:45:38.516304000 +0800
@@ -320,7 +320,7 @@
}
if (memsize < ptoa((uintmax_t)cnt.v_free_count))
memsize = ptoa((uintmax_t)Maxmem);
- printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20);
+ printf("real memory = %ju (%ju MiB)\n", memsize, memsize >> 20);
realmem = atop(memsize);
/*
@@ -344,7 +344,7 @@
vm_ksubmap_init(&kmi);
- printf("avail memory = %ju (%ju MB)\n",
+ printf("avail memory = %ju (%ju MiB)\n",
ptoa((uintmax_t)cnt.v_free_count),
ptoa((uintmax_t)cnt.v_free_count) / 1048576);
@@ -2303,10 +2303,10 @@
physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem);
/*
- * We need to divide chunk if Maxmem is larger than 16MB and
- * under 16MB area is not full of memory.
- * (1) system area (15-16MB region) is cut off
- * (2) extended memory is only over 16MB area (ex. Melco "HYPERMEMORY")
+ * We need to divide chunk if Maxmem is larger than 16MiB and
+ * under 16MiB area is not full of memory.
+ * (1) system area (15-16MiB region) is cut off
+ * (2) extended memory is only over 16MiB area (ex. Melco "HYPERMEMORY")
*/
if ((under16 != 16 * 1024) && (extmem > 15 * 1024)) {
/* 15M - 16M region is cut off, so need to divide chunk */
@@ -2515,7 +2515,7 @@
#ifdef XBOX
if (arch_i386_is_xbox) {
/*
- * We queried the memory size before, so chop off 4MB for
+ * We queried the memory size before, so chop off 4MiB for
* the framebuffer and inform the OS of this.
*/
physmap[0] = 0;
@@ -2621,8 +2621,8 @@
* memory size. We will then build a simple memory map with
* two segments, one for "base memory" and the second for
* "extended memory". Note that "extended memory" starts at a
- * physical address of 1MB and that both basemem and extmem
- * are in units of 1KB.
+ * physical address of 1MiB and that both basemem and extmem
+ * are in units of 1KiB.
*
* First, try to fetch the extended memory size via INT 15:E801.
*/
@@ -2646,13 +2646,13 @@
/*
* Special hack for chipsets that still remap the 384k hole when
- * there's 16MB of memory - this really confuses people that
+ * there's 16MiB of memory - this really confuses people that
* are trying to use bus mastering ISA controllers with the
- * "16MB limit"; they only have 16MB, but the remapping puts
+ * "16MiB limit"; they only have 16MiB, but the remapping puts
* them beyond the limit.
*
- * If extended memory is between 15-16MB (16-17MB phys address range),
- * chop it to 15MB.
+ * If extended memory is between 15-16MiB (16-17MiB phys address range),
+ * chop it to 15MiB.
*/
if ((extmem > 15 * 1024) && (extmem < 16 * 1024))
extmem = 15 * 1024;
@@ -2946,7 +2946,7 @@
* XEN occupies a portion of the upper virtual address space
* At its base it manages an array mapping machine page frames
* to physical page frames - hence we need to be able to
- * access 4GB - (64MB - 4MB + 64k)
+ * access 4GiB - (64MiB - 4MiB + 64Ki)
*/
gdt_segs[GPRIV_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE);
gdt_segs[GUFS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE);
@@ -3203,7 +3203,7 @@
init_param1();
/*
- * Make gdt memory segments. All segments cover the full 4GB
+ * Make gdt memory segments. All segments cover the full 4GiB
* of address space and permissions are enforced at page level.
*/
gdt_segs[GCODE_SEL].ssd_limit = atop(0 - 1);
@@ -3324,7 +3324,7 @@
pic16l_setled(XBOX_LED_GREEN);
/*
- * We are an XBOX, but we may have either 64MB or 128MB of
+ * We are an XBOX, but we may have either 64MiB or 128MiB of
* memory. The PCI host bridge should be programmed for this,
* so we just query it.
*/
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/i386/i386/minidump_machdep.c freebsd-10.4/sys/i386/i386/minidump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/i386/i386/minidump_machdep.c 2017-09-29 08:20:02.000000000 +0800
+++ freebsd-10.4/sys/i386/i386/minidump_machdep.c 2021-07-16 18:45:48.810136000 +0800
@@ -198,7 +198,7 @@
for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) {
/*
* We always write a page, even if it is zero. Each
- * page written corresponds to 2MB of space
+ * page written corresponds to 2MiB of space
*/
ptesize += PAGE_SIZE;
pd = (pd_entry_t *)((uintptr_t)IdlePTD + KERNBASE); /* always mapped! */
@@ -214,7 +214,7 @@
continue;
}
if ((pd[j] & PG_V) == PG_V) {
- /* set bit for each valid page in this 2MB block */
+ /* set bit for each valid page in this 2MiB block */
pt = pmap_kenter_temporary(xpmap_mtop(pd[j] & PG_FRAME), 0);
for (k = 0; k < NPTEPG; k++) {
if ((pt[k] & PG_V) == PG_V) {
@@ -271,8 +271,8 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_I386_VERSION, dumpsize, di->blocksize);
- printf("Physical memory: %ju MB\n", ptoa((uintmax_t)physmem) / 1048576);
- printf("Dumping %llu MB:", (long long)dumpsize >> 20);
+ printf("Physical memory: %ju MiB\n", ptoa((uintmax_t)physmem) / 1048576);
+ printf("Dumping %llu MiB:", (long long)dumpsize >> 20);
/* Dump leader */
error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ia64/ia64/dump_machdep.c freebsd-10.4/sys/ia64/ia64/dump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ia64/ia64/dump_machdep.c 2017-09-29 08:20:09.000000000 +0800
+++ freebsd-10.4/sys/ia64/ia64/dump_machdep.c 2021-07-16 18:45:56.918940000 +0800
@@ -125,7 +125,7 @@
int c, error, twiddle;
error = 0; /* catch case in which mdp->md_pages is 0 */
- counter = 0; /* Update twiddle every 16MB */
+ counter = 0; /* Update twiddle every 16MiB */
twiddle = 0;
pgs = mdp->md_pages;
pa = IA64_PHYS_TO_RR7(mdp->md_phys);
@@ -260,7 +260,7 @@
int c, error, twiddle;
error = 0; /* catch case in which pgs is 0 */
- counter = 0; /* Update twiddle every 16MB */
+ counter = 0; /* Update twiddle every 16MiB */
twiddle = 0;
printf(" chunk %d: %ld pages ", seqnr, atop(sz));
@@ -382,7 +382,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_IA64_VERSION, dumpsize, di->blocksize);
- printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20,
+ printf("Dumping %llu MiB (%d chunks)\n", (long long)dumpsize >> 20,
ehdr.e_phnum);
/* Dump leader */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ia64/ia64/machdep.c freebsd-10.4/sys/ia64/ia64/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ia64/ia64/machdep.c 2017-09-29 08:20:09.000000000 +0800
+++ freebsd-10.4/sys/ia64/ia64/machdep.c 2021-07-16 18:46:11.347939000 +0800
@@ -276,12 +276,12 @@
#ifdef PERFMON
perfmon_init();
#endif
- printf("real memory = %ld (%ld MB)\n", ptoa(realmem),
+ printf("real memory = %ld (%ld MiB)\n", ptoa(realmem),
ptoa(realmem) / 1048576);
vm_ksubmap_init(&kmi);
- printf("avail memory = %ld (%ld MB)\n", ptoa(cnt.v_free_count),
+ printf("avail memory = %ld (%ld MiB)\n", ptoa(cnt.v_free_count),
ptoa(cnt.v_free_count) / 1048576);
if (fpswa_iface == NULL)
@@ -1271,7 +1271,7 @@
tf = td->td_frame;
KASSERT((tf->tf_special.ndirty & ~PAGE_MASK) == 0,
- ("Whoa there! We have more than 8KB of dirty registers!"));
+ ("Whoa there! We have more than 8KiB of dirty registers!"));
s = mc->mc_special;
/*
@@ -1331,16 +1331,16 @@
(tf->tf_special.bspstore & 0x1ffUL));
/*
- * We can ignore up to 8KB of dirty registers by masking off the
+ * We can ignore up to 8KiB of dirty registers by masking off the
* lower 13 bits in exception_restore() or epc_syscall(). This
* should be enough for a couple of years, but if there are more
- * than 8KB of dirty registers, we lose track of the bottom of
+ * than 8KiB of dirty registers, we lose track of the bottom of
* the kernel stack. The solution is to copy the active part of
* the kernel stack down 1 page (or 2, but not more than that)
- * so that we always have less than 8KB of dirty registers.
+ * so that we always have less than 8KiB of dirty registers.
*/
KASSERT((tf->tf_special.ndirty & ~PAGE_MASK) == 0,
- ("Whoa there! We have more than 8KB of dirty registers!"));
+ ("Whoa there! We have more than 8KiB of dirty registers!"));
bzero(&tf->tf_special, sizeof(tf->tf_special));
if ((tf->tf_flags & FRAME_SYSCALL) == 0) { /* break syscalls. */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/kern/kern_mbuf.c freebsd-10.4/sys/kern/kern_mbuf.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/kern/kern_mbuf.c 2017-09-29 08:19:46.000000000 +0800
+++ freebsd-10.4/sys/kern/kern_mbuf.c 2021-07-16 16:22:30.910765000 +0800
@@ -237,7 +237,7 @@
}
SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbjumbo16, CTLTYPE_INT|CTLFLAG_RW,
&nmbjumbo16, 0, sysctl_nmbjumbo16, "IU",
- "Maximum number of mbuf 16k jumbo clusters allowed");
+ "Maximum number of mbuf 16KiB jumbo clusters allowed");
static int
sysctl_nmbufs(SYSCTL_HANDLER_ARGS)
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/kern/subr_blist.c freebsd-10.4/sys/kern/subr_blist.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/kern/subr_blist.c 2017-09-29 08:19:46.000000000 +0800
+++ freebsd-10.4/sys/kern/subr_blist.c 2021-07-16 18:46:33.096906000 +0800
@@ -189,8 +189,8 @@
#if defined(BLIST_DEBUG)
printf(
- "BLIST representing %lld blocks (%lld MB of swap)"
- ", requiring %lldK of ram\n",
+ "BLIST representing %lld blocks (%lld MiB of swap)"
+ ", requiring %lldKiB of RAM\n",
(long long)bl->bl_blocks,
(long long)bl->bl_blocks * 4 / 1024,
(long long)(nodes * sizeof(blmeta_t) + 1023) / 1024
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/mips/mips/dump_machdep.c freebsd-10.4/sys/mips/mips/dump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/mips/mips/dump_machdep.c 2017-09-29 08:20:03.000000000 +0800
+++ freebsd-10.4/sys/mips/mips/dump_machdep.c 2021-07-16 18:38:12.559908000 +0800
@@ -171,7 +171,7 @@
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
- printf(" chunk %d: %dMB (%d pages)", seqnr, pgs * PAGE_SIZE / (
+ printf(" chunk %d: %dMiB (%d pages)", seqnr, pgs * PAGE_SIZE / (
1024*1024), pgs);
/* Make sure we write coherent datas. */
@@ -313,7 +313,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_MIPS_VERSION, dumpsize, di->blocksize);
- printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20,
+ printf("Dumping %llu MiB (%d chunks)\n", (long long)dumpsize >> 20,
ehdr.e_phnum);
/* Dump leader */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/mips/mips/machdep.c freebsd-10.4/sys/mips/mips/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/mips/mips/machdep.c 2017-09-29 08:20:03.000000000 +0800
+++ freebsd-10.4/sys/mips/mips/machdep.c 2021-07-18 12:05:32.354944000 +0800
@@ -187,7 +187,7 @@
if (boothowto & RB_VERBOSE)
bootverbose++;
- printf("real memory = %ju (%juK bytes)\n", ptoa((uintmax_t)realmem),
+ printf("real memory = %ju (%ju KiB)\n", ptoa((uintmax_t)realmem),
ptoa((uintmax_t)realmem) / 1024);
/*
@@ -210,7 +210,7 @@
vm_ksubmap_init(&kmi);
- printf("avail memory = %ju (%juMB)\n",
+ printf("avail memory = %ju (%juMiB)\n",
ptoa((uintmax_t)cnt.v_free_count),
ptoa((uintmax_t)cnt.v_free_count) / 1048576);
cpu_init_interrupts();
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/mips/mips/minidump_machdep.c freebsd-10.4/sys/mips/mips/minidump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/mips/mips/minidump_machdep.c 2017-09-29 08:20:03.000000000 +0800
+++ freebsd-10.4/sys/mips/mips/minidump_machdep.c 2021-07-16 18:46:43.781313000 +0800
@@ -241,9 +241,9 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_MIPS_VERSION, dumpsize,
di->blocksize);
- printf("Physical memory: %ju MB\n",
+ printf("Physical memory: %ju MiB\n",
(uintmax_t)ptoa((uintmax_t)physmem) / 1048576);
- printf("Dumping %llu MB:", (long long)dumpsize >> 20);
+ printf("Dumping %llu MiB:", (long long)dumpsize >> 20);
/* Dump leader */
error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/mips/sibyte/sb_machdep.c freebsd-10.4/sys/mips/sibyte/sb_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/mips/sibyte/sb_machdep.c 2017-09-29 08:20:04.000000000 +0800
+++ freebsd-10.4/sys/mips/sibyte/sb_machdep.c 2021-07-16 18:38:16.571524000 +0800
@@ -191,7 +191,7 @@
if (maxmem != 0) {
if (addr >= maxmem) {
printf("Ignoring %ju bytes of memory at 0x%jx "
- "that is above maxmem %dMB\n",
+ "that is above maxmem %dMiB\n",
len, addr,
(int)(maxmem / (1024 * 1024)));
continue;
@@ -199,7 +199,7 @@
if (addr + len > maxmem) {
printf("Ignoring %ju bytes of memory "
- "that is above maxmem %dMB\n",
+ "that is above maxmem %dMiB\n",
(addr + len) - maxmem,
(int)(maxmem / (1024 * 1024)));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mlx4/qp.c freebsd-10.4/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mlx4/qp.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/infiniband/hw/mlx4/qp.c 2021-07-16 15:53:24.800018000 +0800
@@ -492,7 +492,7 @@
qp->sq_max_wqes_per_wr = DIV_ROUND_UP(s, 1U << qp->sq.wqe_shift);
/*
- * We need to leave 2 KB + 1 WR of headroom in the SQ to
+ * We need to leave 2 KiB + 1 WR of headroom in the SQ to
* allow HW to prefetch.
*/
qp->sq_spare_wqes = (2048 >> qp->sq.wqe_shift) + qp->sq_max_wqes_per_wr;
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c 2021-07-16 15:51:50.824082000 +0800
@@ -671,13 +671,13 @@
switch (op) {
case CMD_MAP_FA:
- mthca_dbg(dev, "Mapped %d chunks/%d KB for FW.\n", tc, ts);
+ mthca_dbg(dev, "Mapped %d chunks/%d KiB for FW.\n", tc, ts);
break;
case CMD_MAP_ICM_AUX:
- mthca_dbg(dev, "Mapped %d chunks/%d KB for ICM aux.\n", tc, ts);
+ mthca_dbg(dev, "Mapped %d chunks/%d KiB for ICM aux.\n", tc, ts);
break;
case CMD_MAP_ICM:
- mthca_dbg(dev, "Mapped %d chunks/%d KB at %llx for ICM.\n",
+ mthca_dbg(dev, "Mapped %d chunks/%d KiB at %llx for ICM.\n",
tc, ts, (unsigned long long) virt - (ts << 10));
break;
}
@@ -805,7 +805,7 @@
MTHCA_GET(dev->fw.arbel.clr_int_base, outbox, QUERY_FW_CLR_INT_BASE_OFFSET);
MTHCA_GET(dev->fw.arbel.eq_arm_base, outbox, QUERY_FW_EQ_ARM_BASE_OFFSET);
MTHCA_GET(dev->fw.arbel.eq_set_ci_base, outbox, QUERY_FW_EQ_SET_CI_BASE_OFFSET);
- mthca_dbg(dev, "FW size %d KB\n", dev->fw.arbel.fw_pages << 2);
+ mthca_dbg(dev, "FW size %d KiB\n", dev->fw.arbel.fw_pages << 2);
/*
* Round up number of system pages needed in case
@@ -823,7 +823,7 @@
MTHCA_GET(dev->fw.tavor.fw_start, outbox, QUERY_FW_START_OFFSET);
MTHCA_GET(dev->fw.tavor.fw_end, outbox, QUERY_FW_END_OFFSET);
- mthca_dbg(dev, "FW size %d KB (start %llx, end %llx)\n",
+ mthca_dbg(dev, "FW size %d KiB (start %llx, end %llx)\n",
(int) ((dev->fw.tavor.fw_end - dev->fw.tavor.fw_start) >> 10),
(unsigned long long) dev->fw.tavor.fw_start,
(unsigned long long) dev->fw.tavor.fw_end);
@@ -877,7 +877,7 @@
if (info & ENABLE_LAM_INFO_HIDDEN_FLAG)
mthca_dbg(dev, "HCA-attached memory is hidden.\n");
- mthca_dbg(dev, "HCA memory size %d KB (start %llx, end %llx)\n",
+ mthca_dbg(dev, "HCA memory size %d KiB (start %llx, end %llx)\n",
(int) ((dev->ddr_end - dev->ddr_start) >> 10),
(unsigned long long) dev->ddr_start,
(unsigned long long) dev->ddr_end);
@@ -932,7 +932,7 @@
if (info & QUERY_DDR_INFO_HIDDEN_FLAG)
mthca_dbg(dev, "HCA-attached memory is hidden.\n");
- mthca_dbg(dev, "HCA memory size %d KB (start %llx, end %llx)\n",
+ mthca_dbg(dev, "HCA memory size %d KiB (start %llx, end %llx)\n",
(int) ((dev->ddr_end - dev->ddr_start) >> 10),
(unsigned long long) dev->ddr_start,
(unsigned long long) dev->ddr_end);
@@ -1158,7 +1158,7 @@
else
mthca_dbg(dev, "Base MM extensions: no\n");
- mthca_dbg(dev, "Max ICM size %lld MB\n",
+ mthca_dbg(dev, "Max ICM size %lld MiB\n",
(unsigned long long) dev_lim->hca.arbel.max_icm_sz >> 20);
} else {
MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SRQ_SZ_OFFSET);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_eq.c freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_eq.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_eq.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_eq.c 2021-07-16 15:52:34.271926000 +0800
@@ -743,7 +743,7 @@
* We assume that mapping one page is enough for the whole EQ
* context table. This is fine with all current HCAs, because
* we only use 32 EQs and each EQ uses 32 bytes of context
- * memory, or 1 KB total.
+ * memory, or 1 KiB total.
*/
dev->eq_table.icm_virt = icm_virt;
dev->eq_table.icm_page = alloc_page(GFP_HIGHUSER);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c 2020-09-18 11:12:17.590673000 +0800
@@ -435,7 +435,7 @@
return -EINVAL;
}
- mthca_dbg(mdev, "%lld KB of HCA context requires %lld KB aux memory.\n",
+ mthca_dbg(mdev, "%lld KiB of HCA context requires %lld KiB aux memory.\n",
(unsigned long long) icm_size >> 10,
(unsigned long long) aux_pages << 2);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c 2021-07-16 15:52:45.581318000 +0800
@@ -43,7 +43,7 @@
#include "mthca_cmd.h"
/*
- * We allocate in as big chunks as we can, up to a maximum of 256 KB
+ * We allocate in as big chunks as we can, up to a maximum of 256 KiB
* per chunk.
*/
enum {
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_profile.c freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_profile.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/infiniband/hw/mthca/mthca_profile.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/infiniband/hw/mthca/mthca_profile.c 2020-09-18 11:11:36.312423000 +0800
@@ -166,10 +166,10 @@
}
if (mthca_is_memfree(dev))
- mthca_dbg(dev, "HCA context memory: reserving %d KB\n",
+ mthca_dbg(dev, "HCA context memory: reserving %d KiB\n",
(int) (total_size >> 10));
else
- mthca_dbg(dev, "HCA memory: allocated %d KB/%d KB (%d KB free)\n",
+ mthca_dbg(dev, "HCA memory: allocated %d KiB/%d KiB (%d KiB free)\n",
(int) (total_size >> 10), (int) (mem_avail >> 10),
(int) ((mem_avail - total_size) >> 10));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/fw.c freebsd-10.4/sys/ofed/drivers/net/mlx4/fw.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/fw.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/net/mlx4/fw.c 2020-09-18 11:13:43.438895000 +0800
@@ -924,7 +924,7 @@
else
dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_SYS_EQS;
- mlx4_dbg(dev, "Max ICM size %lld MB\n",
+ mlx4_dbg(dev, "Max ICM size %lld MiB\n",
(unsigned long long) dev_cap->max_icm_sz >> 20);
mlx4_dbg(dev, "Max QPs: %d, reserved QPs: %d, entry size: %d\n",
dev_cap->max_qps, dev_cap->reserved_qps, dev_cap->qpc_entry_sz);
@@ -1157,13 +1157,13 @@
switch (op) {
case MLX4_CMD_MAP_FA:
- mlx4_dbg(dev, "Mapped %d chunks/%d KB for FW.\n", tc, ts);
+ mlx4_dbg(dev, "Mapped %d chunks/%d KiB for FW.\n", tc, ts);
break;
case MLX4_CMD_MAP_ICM_AUX:
- mlx4_dbg(dev, "Mapped %d chunks/%d KB for ICM aux.\n", tc, ts);
+ mlx4_dbg(dev, "Mapped %d chunks/%d KiB for ICM aux.\n", tc, ts);
break;
case MLX4_CMD_MAP_ICM:
- mlx4_dbg(dev, "Mapped %d chunks/%d KB at %llx for ICM.\n",
+ mlx4_dbg(dev, "Mapped %d chunks/%d KiB at %llx for ICM.\n",
tc, ts, (unsigned long long) virt - (ts << 10));
break;
}
@@ -1293,7 +1293,7 @@
fw->comm_bar = (fw->comm_bar >> 6) * 2;
mlx4_dbg(dev, "Communication vector bar:%d offset:0x%llx\n",
fw->comm_bar, (unsigned long long)fw->comm_base);
- mlx4_dbg(dev, "FW size %d KB\n", fw->fw_pages >> 2);
+ mlx4_dbg(dev, "FW size %d KiB\n", fw->fw_pages >> 2);
MLX4_GET(fw->clock_offset, outbox, QUERY_FW_CLOCK_OFFSET);
MLX4_GET(fw->clock_bar, outbox, QUERY_FW_CLOCK_BAR);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/icm.c freebsd-10.4/sys/ofed/drivers/net/mlx4/icm.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/icm.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/net/mlx4/icm.c 2021-07-16 15:53:38.141022000 +0800
@@ -44,7 +44,7 @@
#include "fw.h"
/*
- * We allocate in as big chunks as we can, up to a maximum of 256 KB
+ * We allocate in as big chunks as we can, up to a maximum of 256 KiB
* per chunk.
*/
enum {
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/main.c freebsd-10.4/sys/ofed/drivers/net/mlx4/main.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/main.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/net/mlx4/main.c 2020-09-18 11:14:12.479348000 +0800
@@ -1540,7 +1540,7 @@
return err;
}
- mlx4_dbg(dev, "%lld KB of HCA context requires %lld KB aux memory.\n",
+ mlx4_dbg(dev, "%lld KiB of HCA context requires %lld KiB aux memory.\n",
(unsigned long long) icm_size >> 10,
(unsigned long long) aux_pages << 2);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/profile.c freebsd-10.4/sys/ofed/drivers/net/mlx4/profile.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/ofed/drivers/net/mlx4/profile.c 2017-09-29 08:20:05.000000000 +0800
+++ freebsd-10.4/sys/ofed/drivers/net/mlx4/profile.c 2020-09-18 11:12:45.435257000 +0800
@@ -162,7 +162,7 @@
(unsigned long long) profile[i].size);
}
- mlx4_dbg(dev, "HCA context memory: reserving %d KB\n",
+ mlx4_dbg(dev, "HCA context memory: reserving %d KiB\n",
(int) (total_size >> 10));
for (i = 0; i < MLX4_RES_NUM; ++i) {
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/pc98/cbus/fdc.c freebsd-10.4/sys/pc98/cbus/fdc.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/pc98/cbus/fdc.c 2017-09-29 08:20:11.000000000 +0800
+++ freebsd-10.4/sys/pc98/cbus/fdc.c 2021-07-16 15:54:23.719584000 +0800
@@ -1712,7 +1712,7 @@
return (EIO);
} else {
if (bootverbose)
- device_printf(fd->dev, "autoselected %d KB medium\n",
+ device_printf(fd->dev, "autoselected %d KiB medium\n",
#ifdef PC98
(128 << (fd->ft->secsize)) *
fd->ft->size / 1024);
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/aim/machdep.c freebsd-10.4/sys/powerpc/aim/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/aim/machdep.c 2017-09-29 08:20:07.000000000 +0800
+++ freebsd-10.4/sys/powerpc/aim/machdep.c 2021-07-16 18:49:14.088866000 +0800
@@ -185,12 +185,12 @@
#ifdef PERFMON
perfmon_init();
#endif
- printf("real memory = %ld (%ld MB)\n", ptoa(physmem),
+ printf("real memory = %ld (%ld MiB)\n", ptoa(physmem),
ptoa(physmem) / 1048576);
realmem = physmem;
if (bootverbose)
- printf("available KVA = %zd (%zd MB)\n",
+ printf("available KVA = %zd (%zd MiB)\n",
virtual_end - virtual_avail,
(virtual_end - virtual_avail) / 1048576);
@@ -217,7 +217,7 @@
vm_ksubmap_init(&kmi);
- printf("avail memory = %ld (%ld MB)\n", ptoa(cnt.v_free_count),
+ printf("avail memory = %ld (%ld MiB)\n", ptoa(cnt.v_free_count),
ptoa(cnt.v_free_count) / 1048576);
/*
@@ -949,4 +949,4 @@
if (vectd == curthread)
enable_vec(curthread);
powerpc_sync();
-}
\ No newline at end of file
+}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/booke/machdep.c freebsd-10.4/sys/powerpc/booke/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/booke/machdep.c 2017-09-29 08:20:07.000000000 +0800
+++ freebsd-10.4/sys/powerpc/booke/machdep.c 2021-07-16 18:49:30.241954000 +0800
@@ -202,7 +202,7 @@
/* Good {morning,afternoon,evening,night}. */
cpu_setup(PCPU_GET(cpuid));
- printf("real memory = %lu (%ld MB)\n", ptoa(physmem),
+ printf("real memory = %lu (%ld MiB)\n", ptoa(physmem),
ptoa(physmem) / 1048576);
realmem = physmem;
@@ -220,7 +220,7 @@
vm_ksubmap_init(&kmi);
- printf("avail memory = %lu (%ld MB)\n", ptoa(cnt.v_free_count),
+ printf("avail memory = %lu (%ld MiB)\n", ptoa(cnt.v_free_count),
ptoa(cnt.v_free_count) / 1048576);
/* Set up buffers, so they can be used to read disk labels. */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/powerpc/cpu.c freebsd-10.4/sys/powerpc/powerpc/cpu.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/powerpc/cpu.c 2017-09-29 08:20:07.000000000 +0800
+++ freebsd-10.4/sys/powerpc/powerpc/cpu.c 2021-07-16 18:38:33.007956000 +0800
@@ -465,27 +465,27 @@
case MPC7450:
case MPC7455:
case MPC7457:
- printf("256KB L2 cache, ");
+ printf("256KiB L2 cache, ");
if (mfspr(SPR_L3CR) & L3CR_L3E)
- printf("%cMB L3 backside cache",
+ printf("%cMiB L3 backside cache",
mfspr(SPR_L3CR) & L3CR_L3SIZ ? '2' : '1');
else
printf("L3 cache disabled");
printf("\n");
break;
case IBM750FX:
- printf("512KB L2 cache\n");
+ printf("512KiB L2 cache\n");
break;
default:
switch (mfspr(SPR_L2CR) & L2CR_L2SIZ) {
case L2SIZ_256K:
- printf("256KB ");
+ printf("256KiB ");
break;
case L2SIZ_512K:
- printf("512KB ");
+ printf("512KiB ");
break;
case L2SIZ_1M:
- printf("1MB ");
+ printf("1MiB ");
break;
}
printf("write-%s", (mfspr(SPR_L2CR) & L2CR_L2WT)
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/powerpc/dump_machdep.c freebsd-10.4/sys/powerpc/powerpc/dump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/powerpc/dump_machdep.c 2017-09-29 08:20:07.000000000 +0800
+++ freebsd-10.4/sys/powerpc/powerpc/dump_machdep.c 2021-07-16 18:42:36.786599000 +0800
@@ -118,7 +118,7 @@
int c, error, twiddle;
error = 0;
- counter = 0; /* Update twiddle every 16MB */
+ counter = 0; /* Update twiddle every 16MiB */
twiddle = 0;
ofs = 0; /* Logical offset within the chunk */
@@ -256,7 +256,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_POWERPC_VERSION, dumpsize,
di->blocksize);
- printf("Dumping %u MB (%d chunks)\n", dumpsize >> 20,
+ printf("Dumping %u MiB (%d chunks)\n", dumpsize >> 20,
ehdr.e_phnum);
/* Dump leader */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/pseries/platform_chrp.c freebsd-10.4/sys/powerpc/pseries/platform_chrp.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/powerpc/pseries/platform_chrp.c 2017-09-29 08:20:06.000000000 +0800
+++ freebsd-10.4/sys/powerpc/pseries/platform_chrp.c 2021-07-16 18:49:18.999563000 +0800
@@ -178,7 +178,7 @@
res = OF_getprop(phandle, "ibm,lmb-size", lmb_size, sizeof(lmb_size));
if (res == -1)
return (0);
- printf("Logical Memory Block size: %d MB\n", lmb_size[1] >> 20);
+ printf("Logical Memory Block size: %d MiB\n", lmb_size[1] >> 20);
/* Parse the /ibm,dynamic-memory.
The first position gives the # of entries. The next two words
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/sparc64/sparc64/dump_machdep.c freebsd-10.4/sys/sparc64/sparc64/dump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/sparc64/sparc64/dump_machdep.c 2017-09-29 08:20:08.000000000 +0800
+++ freebsd-10.4/sys/sparc64/sparc64/dump_machdep.c 2021-07-16 18:42:40.106642000 +0800
@@ -174,7 +174,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION, size,
di->blocksize);
- printf("Dumping %lu MB (%d chunks)\n", (u_long)(size >> 20), nreg);
+ printf("Dumping %lu MiB (%d chunks)\n", (u_long)(size >> 20), nreg);
/* Dump leader */
error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/sparc64/sparc64/machdep.c freebsd-10.4/sys/sparc64/sparc64/machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/sparc64/sparc64/machdep.c 2017-09-29 08:20:08.000000000 +0800
+++ freebsd-10.4/sys/sparc64/sparc64/machdep.c 2021-07-16 18:49:38.788911000 +0800
@@ -178,7 +178,7 @@
physsz = 0;
for (i = 0; i < sparc64_nmemreg; i++)
physsz += sparc64_memreg[i].mr_size;
- printf("real memory = %lu (%lu MB)\n", physsz,
+ printf("real memory = %lu (%lu MiB)\n", physsz,
physsz / (1024 * 1024));
realmem = (long)physsz / PAGE_SIZE;
@@ -190,7 +190,7 @@
EVENTHANDLER_REGISTER(shutdown_final, sparc64_shutdown_final, NULL,
SHUTDOWN_PRI_LAST);
- printf("avail memory = %lu (%lu MB)\n", cnt.v_free_count * PAGE_SIZE,
+ printf("avail memory = %lu (%lu MiB)\n", cnt.v_free_count * PAGE_SIZE,
cnt.v_free_count / ((1024 * 1024) / PAGE_SIZE));
if (bootverbose)
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/vm/memguard.c freebsd-10.4/sys/vm/memguard.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/vm/memguard.c 2017-09-29 08:20:07.000000000 +0800
+++ freebsd-10.4/sys/vm/memguard.c 2021-07-16 16:05:16.708855000 +0800
@@ -212,7 +212,7 @@
printf("MEMGUARD DEBUGGING ALLOCATOR INITIALIZED:\n");
printf("\tMEMGUARD map base: 0x%lx\n", (u_long)base);
- printf("\tMEMGUARD map size: %jd KBytes\n",
+ printf("\tMEMGUARD map size: %jd KiBytes\n",
(uintmax_t)memguard_mapsize >> 10);
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/vm/swap_pager.c freebsd-10.4/sys/vm/swap_pager.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/vm/swap_pager.c 2017-09-29 08:20:07.000000000 +0800
+++ freebsd-10.4/sys/vm/swap_pager.c 2019-12-11 10:29:46.350189000 +0800
@@ -541,7 +541,7 @@
* Initialize our zone. Right now I'm just guessing on the number
* we need based on the number of pages in the system. Each swblock
* can hold 32 pages, so this is probably overkill. This reservation
- * is typically limited to around 32MB by default.
+ * is typically limited to around 32MiB by default.
*/
n = cnt.v_page_count / 2;
if (maxswzone && n > maxswzone / sizeof(struct swblock))
@@ -2116,7 +2116,7 @@
/*
* Swap metadata may not fit in the KVM if we have physical
- * memory of >1GB.
+ * memory of >1GiB.
*/
if (swap_zone == NULL) {
error = ENOMEM;
@@ -2202,7 +2202,7 @@
mblocks = 0x40000000 / BLIST_META_RADIX;
if (nblks > mblocks) {
printf(
- "WARNING: reducing swap size to maximum of %luMB per unit\n",
+ "WARNING: reducing swap size to maximum of %luMiB per unit\n",
mblocks / 1024 / 1024 * PAGE_SIZE);
nblks = mblocks;
}
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/x86/x86/dump_machdep.c freebsd-10.4/sys/x86/x86/dump_machdep.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/x86/x86/dump_machdep.c 2017-09-29 08:20:06.000000000 +0800
+++ freebsd-10.4/sys/x86/x86/dump_machdep.c 2021-07-16 18:38:50.275115000 +0800
@@ -170,7 +170,7 @@
u_int maxdumppgs;
error = 0; /* catch case in which chunk size is 0 */
- counter = 0; /* Update twiddle every 16MB */
+ counter = 0; /* Update twiddle every 16MiB */
twiddle = 0;
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
@@ -179,7 +179,7 @@
if (maxdumppgs == 0) /* seatbelt */
maxdumppgs = 1;
- printf(" chunk %d: %juMB (%ju pages)", seqnr, (uintmax_t)PG2MB(pgs),
+ printf(" chunk %d: %juMiB (%ju pages)", seqnr, (uintmax_t)PG2MB(pgs),
(uintmax_t)pgs);
while (pgs) {
@@ -322,7 +322,7 @@
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_VERSION, dumpsize,
di->blocksize);
- printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20,
+ printf("Dumping %llu MiB (%d chunks)\n", (long long)dumpsize >> 20,
ehdr.e_phnum);
/* Dump leader */
diff -ru --exclude-from freebsd-src-diff-exclude-names --new-file /var/archive3/public/freebsd-releng-10.4-src/sys/x86/x86/identcpu.c freebsd-10.4/sys/x86/x86/identcpu.c
--- /var/archive3/public/freebsd-releng-10.4-src/sys/x86/x86/identcpu.c 2017-09-29 08:20:06.000000000 +0800
+++ freebsd-10.4/sys/x86/x86/identcpu.c 2021-07-16 16:03:09.286338000 +0800
@@ -736,7 +736,7 @@
"\001FPU" /* Integral FPU */
"\002VME" /* Extended VM86 mode support */
"\003DE" /* Debugging Extensions (CR4.DE) */
- "\004PSE" /* 4MByte page tables */
+ "\004PSE" /* 4MiByte page tables */
"\005TSC" /* Timestamp counter */
"\006MSR" /* Machine specific registers */
"\007PAE" /* Physical address extension */
@@ -834,7 +834,7 @@
"\030<s23>" /* Same */
"\031<s24>" /* Same */
"\032FFXSR" /* Fast FXSAVE/FXRSTOR */
- "\033Page1GB" /* 1-GB large page support */
+ "\033Page1GB" /* 1-GiB large page support */
"\034RDTSCP" /* RDTSCP */
"\035<b28>" /* Undefined */
"\036LM" /* 64 bit long mode */
@@ -1587,16 +1587,16 @@
if (cpu_exthigh >= 0x80000005) {
do_cpuid(0x80000005, regs);
- printf("L1 2MB data TLB: %d entries", (regs[0] >> 16) & 0xff);
+ printf("L1 2MiB data TLB: %d entries", (regs[0] >> 16) & 0xff);
print_AMD_assoc(regs[0] >> 24);
- printf("L1 2MB instruction TLB: %d entries", regs[0] & 0xff);
+ printf("L1 2MiB instruction TLB: %d entries", regs[0] & 0xff);
print_AMD_assoc((regs[0] >> 8) & 0xff);
- printf("L1 4KB data TLB: %d entries", (regs[1] >> 16) & 0xff);
+ printf("L1 4KiB data TLB: %d entries", (regs[1] >> 16) & 0xff);
print_AMD_assoc(regs[1] >> 24);
- printf("L1 4KB instruction TLB: %d entries", regs[1] & 0xff);
+ printf("L1 4KiB instruction TLB: %d entries", regs[1] & 0xff);
print_AMD_assoc((regs[1] >> 8) & 0xff);
printf("L1 data cache: %d kbytes", regs[2] >> 24);
@@ -1613,27 +1613,27 @@
if (cpu_exthigh >= 0x80000006) {
do_cpuid(0x80000006, regs);
if ((regs[0] >> 16) != 0) {
- printf("L2 2MB data TLB: %d entries",
+ printf("L2 2MiB data TLB: %d entries",
(regs[0] >> 16) & 0xfff);
print_AMD_l2_assoc(regs[0] >> 28);
- printf("L2 2MB instruction TLB: %d entries",
+ printf("L2 2MiB instruction TLB: %d entries",
regs[0] & 0xfff);
print_AMD_l2_assoc((regs[0] >> 28) & 0xf);
} else {
- printf("L2 2MB unified TLB: %d entries",
+ printf("L2 2MiB unified TLB: %d entries",
regs[0] & 0xfff);
print_AMD_l2_assoc((regs[0] >> 28) & 0xf);
}
if ((regs[1] >> 16) != 0) {
- printf("L2 4KB data TLB: %d entries",
+ printf("L2 4KiB data TLB: %d entries",
(regs[1] >> 16) & 0xfff);
print_AMD_l2_assoc(regs[1] >> 28);
- printf("L2 4KB instruction TLB: %d entries",
+ printf("L2 4KiB instruction TLB: %d entries",
(regs[1] >> 16) & 0xfff);
print_AMD_l2_assoc((regs[1] >> 28) & 0xf);
} else {
- printf("L2 4KB unified TLB: %d entries",
+ printf("L2 4KiB unified TLB: %d entries",
(regs[1] >> 16) & 0xfff);
print_AMD_l2_assoc((regs[1] >> 28) & 0xf);
}
@@ -1737,191 +1737,191 @@
default:
break;
case 0x1:
- printf("Instruction TLB: 4 KB pages, 4-way set associative, 32 entries\n");
+ printf("Instruction TLB: 4 KiB pages, 4-way set associative, 32 entries\n");
break;
case 0x2:
- printf("Instruction TLB: 4 MB pages, fully associative, 2 entries\n");
+ printf("Instruction TLB: 4 MiB pages, fully associative, 2 entries\n");
break;
case 0x3:
- printf("Data TLB: 4 KB pages, 4-way set associative, 64 entries\n");
+ printf("Data TLB: 4 KiB pages, 4-way set associative, 64 entries\n");
break;
case 0x4:
- printf("Data TLB: 4 MB Pages, 4-way set associative, 8 entries\n");
+ printf("Data TLB: 4 MiB Pages, 4-way set associative, 8 entries\n");
break;
case 0x6:
- printf("1st-level instruction cache: 8 KB, 4-way set associative, 32 byte line size\n");
+ printf("1st-level instruction cache: 8 KiB, 4-way set associative, 32 byte line size\n");
break;
case 0x8:
- printf("1st-level instruction cache: 16 KB, 4-way set associative, 32 byte line size\n");
+ printf("1st-level instruction cache: 16 KiB, 4-way set associative, 32 byte line size\n");
break;
case 0x9:
- printf("1st-level instruction cache: 32 KB, 4-way set associative, 64 byte line size\n");
+ printf("1st-level instruction cache: 32 KiB, 4-way set associative, 64 byte line size\n");
break;
case 0xa:
- printf("1st-level data cache: 8 KB, 2-way set associative, 32 byte line size\n");
+ printf("1st-level data cache: 8 KiB, 2-way set associative, 32 byte line size\n");
break;
case 0xb:
- printf("Instruction TLB: 4 MByte pages, 4-way set associative, 4 entries\n");
+ printf("Instruction TLB: 4 MiByte pages, 4-way set associative, 4 entries\n");
break;
case 0xc:
- printf("1st-level data cache: 16 KB, 4-way set associative, 32 byte line size\n");
+ printf("1st-level data cache: 16 KiB, 4-way set associative, 32 byte line size\n");
break;
case 0xd:
- printf("1st-level data cache: 16 KBytes, 4-way set associative, 64 byte line size");
+ printf("1st-level data cache: 16 KiBytes, 4-way set associative, 64 byte line size");
break;
case 0xe:
- printf("1st-level data cache: 24 KBytes, 6-way set associative, 64 byte line size\n");
+ printf("1st-level data cache: 24 KiBytes, 6-way set associative, 64 byte line size\n");
break;
case 0x1d:
- printf("2nd-level cache: 128 KBytes, 2-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 128 KiBytes, 2-way set associative, 64 byte line size\n");
break;
case 0x21:
- printf("2nd-level cache: 256 KBytes, 8-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 256 KiBytes, 8-way set associative, 64 byte line size\n");
break;
case 0x22:
- printf("3rd-level cache: 512 KB, 4-way set associative, sectored cache, 64 byte line size\n");
+ printf("3rd-level cache: 512 KiB, 4-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x23:
- printf("3rd-level cache: 1 MB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("3rd-level cache: 1 MiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x24:
- printf("2nd-level cache: 1 MBytes, 16-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 1 MiBytes, 16-way set associative, 64 byte line size\n");
break;
case 0x25:
- printf("3rd-level cache: 2 MB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("3rd-level cache: 2 MiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x29:
- printf("3rd-level cache: 4 MB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("3rd-level cache: 4 MiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x2c:
- printf("1st-level data cache: 32 KB, 8-way set associative, 64 byte line size\n");
+ printf("1st-level data cache: 32 KiB, 8-way set associative, 64 byte line size\n");
break;
case 0x30:
- printf("1st-level instruction cache: 32 KB, 8-way set associative, 64 byte line size\n");
+ printf("1st-level instruction cache: 32 KiB, 8-way set associative, 64 byte line size\n");
break;
case 0x39: /* De-listed in SDM rev. 54 */
- printf("2nd-level cache: 128 KB, 4-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 128 KiB, 4-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x3b: /* De-listed in SDM rev. 54 */
- printf("2nd-level cache: 128 KB, 2-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 128 KiB, 2-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x3c: /* De-listed in SDM rev. 54 */
- printf("2nd-level cache: 256 KB, 4-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 256 KiB, 4-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x41:
- printf("2nd-level cache: 128 KB, 4-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 128 KiB, 4-way set associative, 32 byte line size\n");
break;
case 0x42:
- printf("2nd-level cache: 256 KB, 4-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 256 KiB, 4-way set associative, 32 byte line size\n");
break;
case 0x43:
- printf("2nd-level cache: 512 KB, 4-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 512 KiB, 4-way set associative, 32 byte line size\n");
break;
case 0x44:
- printf("2nd-level cache: 1 MB, 4-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 1 MiB, 4-way set associative, 32 byte line size\n");
break;
case 0x45:
- printf("2nd-level cache: 2 MB, 4-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 2 MiB, 4-way set associative, 32 byte line size\n");
break;
case 0x46:
- printf("3rd-level cache: 4 MB, 4-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 4 MiB, 4-way set associative, 64 byte line size\n");
break;
case 0x47:
- printf("3rd-level cache: 8 MB, 8-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 8 MiB, 8-way set associative, 64 byte line size\n");
break;
case 0x48:
- printf("2nd-level cache: 3MByte, 12-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 3MiByte, 12-way set associative, 64 byte line size\n");
break;
case 0x49:
if (CPUID_TO_FAMILY(cpu_id) == 0xf &&
CPUID_TO_MODEL(cpu_id) == 0x6)
- printf("3rd-level cache: 4MB, 16-way set associative, 64-byte line size\n");
+ printf("3rd-level cache: 4MiB, 16-way set associative, 64-byte line size\n");
else
- printf("2nd-level cache: 4 MByte, 16-way set associative, 64 byte line size");
+ printf("2nd-level cache: 4 MiByte, 16-way set associative, 64 byte line size");
break;
case 0x4a:
- printf("3rd-level cache: 6MByte, 12-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 6MiByte, 12-way set associative, 64 byte line size\n");
break;
case 0x4b:
- printf("3rd-level cache: 8MByte, 16-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 8MiByte, 16-way set associative, 64 byte line size\n");
break;
case 0x4c:
- printf("3rd-level cache: 12MByte, 12-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 12MiByte, 12-way set associative, 64 byte line size\n");
break;
case 0x4d:
- printf("3rd-level cache: 16MByte, 16-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 16MiByte, 16-way set associative, 64 byte line size\n");
break;
case 0x4e:
- printf("2nd-level cache: 6MByte, 24-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 6MiByte, 24-way set associative, 64 byte line size\n");
break;
case 0x4f:
- printf("Instruction TLB: 4 KByte pages, 32 entries\n");
+ printf("Instruction TLB: 4 KiByte pages, 32 entries\n");
break;
case 0x50:
- printf("Instruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 64 entries\n");
+ printf("Instruction TLB: 4 KiB, 2 MiB or 4 MiB pages, fully associative, 64 entries\n");
break;
case 0x51:
- printf("Instruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 128 entries\n");
+ printf("Instruction TLB: 4 KiB, 2 MiB or 4 MiB pages, fully associative, 128 entries\n");
break;
case 0x52:
- printf("Instruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 256 entries\n");
+ printf("Instruction TLB: 4 KiB, 2 MiB or 4 MiB pages, fully associative, 256 entries\n");
break;
case 0x55:
- printf("Instruction TLB: 2-MByte or 4-MByte pages, fully associative, 7 entries\n");
+ printf("Instruction TLB: 2-MiByte or 4-MiByte pages, fully associative, 7 entries\n");
break;
case 0x56:
- printf("Data TLB0: 4 MByte pages, 4-way set associative, 16 entries\n");
+ printf("Data TLB0: 4 MiByte pages, 4-way set associative, 16 entries\n");
break;
case 0x57:
- printf("Data TLB0: 4 KByte pages, 4-way associative, 16 entries\n");
+ printf("Data TLB0: 4 KiByte pages, 4-way associative, 16 entries\n");
break;
case 0x59:
- printf("Data TLB0: 4 KByte pages, fully associative, 16 entries\n");
+ printf("Data TLB0: 4 KiByte pages, fully associative, 16 entries\n");
break;
case 0x5a:
- printf("Data TLB0: 2-MByte or 4 MByte pages, 4-way set associative, 32 entries\n");
+ printf("Data TLB0: 2-MiByte or 4 MiByte pages, 4-way set associative, 32 entries\n");
break;
case 0x5b:
- printf("Data TLB: 4 KB or 4 MB pages, fully associative, 64 entries\n");
+ printf("Data TLB: 4 KiB or 4 MiB pages, fully associative, 64 entries\n");
break;
case 0x5c:
- printf("Data TLB: 4 KB or 4 MB pages, fully associative, 128 entries\n");
+ printf("Data TLB: 4 KiB or 4 MiB pages, fully associative, 128 entries\n");
break;
case 0x5d:
- printf("Data TLB: 4 KB or 4 MB pages, fully associative, 256 entries\n");
+ printf("Data TLB: 4 KiB or 4 MiB pages, fully associative, 256 entries\n");
break;
case 0x60:
- printf("1st-level data cache: 16 KB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("1st-level data cache: 16 KiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x61:
- printf("Instruction TLB: 4 KByte pages, fully associative, 48 entries\n");
+ printf("Instruction TLB: 4 KiByte pages, fully associative, 48 entries\n");
break;
case 0x63:
- printf("Data TLB: 2 MByte or 4 MByte pages, 4-way set associative, 32 entries and a separate array with 1 GByte pages, 4-way set associative, 4 entries\n");
+ printf("Data TLB: 2 MiByte or 4 MiByte pages, 4-way set associative, 32 entries and a separate array with 1 GiByte pages, 4-way set associative, 4 entries\n");
break;
case 0x64:
- printf("Data TLB: 4 KBytes pages, 4-way set associative, 512 entries\n");
+ printf("Data TLB: 4 KiBytes pages, 4-way set associative, 512 entries\n");
break;
case 0x66:
- printf("1st-level data cache: 8 KB, 4-way set associative, sectored cache, 64 byte line size\n");
+ printf("1st-level data cache: 8 KiB, 4-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x67:
- printf("1st-level data cache: 16 KB, 4-way set associative, sectored cache, 64 byte line size\n");
+ printf("1st-level data cache: 16 KiB, 4-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x68:
- printf("1st-level data cache: 32 KB, 4 way set associative, sectored cache, 64 byte line size\n");
+ printf("1st-level data cache: 32 KiB, 4 way set associative, sectored cache, 64 byte line size\n");
break;
case 0x6a:
- printf("uTLB: 4KByte pages, 8-way set associative, 64 entries\n");
+ printf("uTLB: 4KiByte pages, 8-way set associative, 64 entries\n");
break;
case 0x6b:
- printf("DTLB: 4KByte pages, 8-way set associative, 256 entries\n");
+ printf("DTLB: 4KiByte pages, 8-way set associative, 256 entries\n");
break;
case 0x6c:
printf("DTLB: 2M/4M pages, 8-way set associative, 128 entries\n");
break;
case 0x6d:
- printf("DTLB: 1 GByte pages, fully associative, 16 entries\n");
+ printf("DTLB: 1 GiByte pages, fully associative, 16 entries\n");
break;
case 0x70:
printf("Trace cache: 12K-uops, 8-way set associative\n");
@@ -1936,136 +1936,136 @@
printf("Instruction TLB: 2M/4M pages, fully associative, 8 entries\n");
break;
case 0x78:
- printf("2nd-level cache: 1 MB, 4-way set associative, 64-byte line size\n");
+ printf("2nd-level cache: 1 MiB, 4-way set associative, 64-byte line size\n");
break;
case 0x79:
- printf("2nd-level cache: 128 KB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 128 KiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x7a:
- printf("2nd-level cache: 256 KB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 256 KiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x7b:
- printf("2nd-level cache: 512 KB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 512 KiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x7c:
- printf("2nd-level cache: 1 MB, 8-way set associative, sectored cache, 64 byte line size\n");
+ printf("2nd-level cache: 1 MiB, 8-way set associative, sectored cache, 64 byte line size\n");
break;
case 0x7d:
- printf("2nd-level cache: 2-MB, 8-way set associative, 64-byte line size\n");
+ printf("2nd-level cache: 2-MiB, 8-way set associative, 64-byte line size\n");
break;
case 0x7f:
- printf("2nd-level cache: 512-KB, 2-way set associative, 64-byte line size\n");
+ printf("2nd-level cache: 512-KiB, 2-way set associative, 64-byte line size\n");
break;
case 0x80:
- printf("2nd-level cache: 512 KByte, 8-way set associative, 64-byte line size\n");
+ printf("2nd-level cache: 512 KiByte, 8-way set associative, 64-byte line size\n");
break;
case 0x82:
- printf("2nd-level cache: 256 KB, 8-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 256 KiB, 8-way set associative, 32 byte line size\n");
break;
case 0x83:
- printf("2nd-level cache: 512 KB, 8-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 512 KiB, 8-way set associative, 32 byte line size\n");
break;
case 0x84:
- printf("2nd-level cache: 1 MB, 8-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 1 MiB, 8-way set associative, 32 byte line size\n");
break;
case 0x85:
- printf("2nd-level cache: 2 MB, 8-way set associative, 32 byte line size\n");
+ printf("2nd-level cache: 2 MiB, 8-way set associative, 32 byte line size\n");
break;
case 0x86:
- printf("2nd-level cache: 512 KB, 4-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 512 KiB, 4-way set associative, 64 byte line size\n");
break;
case 0x87:
- printf("2nd-level cache: 1 MB, 8-way set associative, 64 byte line size\n");
+ printf("2nd-level cache: 1 MiB, 8-way set associative, 64 byte line size\n");
break;
case 0xa0:
printf("DTLB: 4k pages, fully associative, 32 entries\n");
break;
case 0xb0:
- printf("Instruction TLB: 4 KB Pages, 4-way set associative, 128 entries\n");
+ printf("Instruction TLB: 4 KiB Pages, 4-way set associative, 128 entries\n");
break;
case 0xb1:
printf("Instruction TLB: 2M pages, 4-way, 8 entries or 4M pages, 4-way, 4 entries\n");
break;
case 0xb2:
- printf("Instruction TLB: 4KByte pages, 4-way set associative, 64 entries\n");
+ printf("Instruction TLB: 4KiByte pages, 4-way set associative, 64 entries\n");
break;
case 0xb3:
- printf("Data TLB: 4 KB Pages, 4-way set associative, 128 entries\n");
+ printf("Data TLB: 4 KiB Pages, 4-way set associative, 128 entries\n");
break;
case 0xb4:
- printf("Data TLB1: 4 KByte pages, 4-way associative, 256 entries\n");
+ printf("Data TLB1: 4 KiByte pages, 4-way associative, 256 entries\n");
break;
case 0xb5:
- printf("Instruction TLB: 4KByte pages, 8-way set associative, 64 entries\n");
+ printf("Instruction TLB: 4KiByte pages, 8-way set associative, 64 entries\n");
break;
case 0xb6:
- printf("Instruction TLB: 4KByte pages, 8-way set associative, 128 entries\n");
+ printf("Instruction TLB: 4KiByte pages, 8-way set associative, 128 entries\n");
break;
case 0xba:
- printf("Data TLB1: 4 KByte pages, 4-way associative, 64 entries\n");
+ printf("Data TLB1: 4 KiByte pages, 4-way associative, 64 entries\n");
break;
case 0xc0:
- printf("Data TLB: 4 KByte and 4 MByte pages, 4-way associative, 8 entries\n");
+ printf("Data TLB: 4 KiByte and 4 MiByte pages, 4-way associative, 8 entries\n");
break;
case 0xc1:
- printf("Shared 2nd-Level TLB: 4 KByte/2MByte pages, 8-way associative, 1024 entries\n");
+ printf("Shared 2nd-Level TLB: 4 KiByte/2MiByte pages, 8-way associative, 1024 entries\n");
break;
case 0xc2:
- printf("DTLB: 4 KByte/2 MByte pages, 4-way associative, 16 entries\n");
+ printf("DTLB: 4 KiByte/2 MiByte pages, 4-way associative, 16 entries\n");
break;
case 0xc3:
- printf("Shared 2nd-Level TLB: 4 KByte /2 MByte pages, 6-way associative, 1536 entries. Also 1GBbyte pages, 4-way, 16 entries\n");
+ printf("Shared 2nd-Level TLB: 4 KiByte /2 MiByte pages, 6-way associative, 1536 entries. Also 1GiBbyte pages, 4-way, 16 entries\n");
break;
case 0xc4:
printf("DTLB: 2M/4M Byte pages, 4-way associative, 32 entries\n");
break;
case 0xca:
- printf("Shared 2nd-Level TLB: 4 KByte pages, 4-way associative, 512 entries\n");
+ printf("Shared 2nd-Level TLB: 4 KiByte pages, 4-way associative, 512 entries\n");
break;
case 0xd0:
- printf("3rd-level cache: 512 KByte, 4-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 512 KiByte, 4-way set associative, 64 byte line size\n");
break;
case 0xd1:
- printf("3rd-level cache: 1 MByte, 4-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 1 MiByte, 4-way set associative, 64 byte line size\n");
break;
case 0xd2:
- printf("3rd-level cache: 2 MByte, 4-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 2 MiByte, 4-way set associative, 64 byte line size\n");
break;
case 0xd6:
- printf("3rd-level cache: 1 MByte, 8-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 1 MiByte, 8-way set associative, 64 byte line size\n");
break;
case 0xd7:
- printf("3rd-level cache: 2 MByte, 8-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 2 MiByte, 8-way set associative, 64 byte line size\n");
break;
case 0xd8:
- printf("3rd-level cache: 4 MByte, 8-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 4 MiByte, 8-way set associative, 64 byte line size\n");
break;
case 0xdc:
- printf("3rd-level cache: 1.5 MByte, 12-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 1.5 MiByte, 12-way set associative, 64 byte line size\n");
break;
case 0xdd:
- printf("3rd-level cache: 3 MByte, 12-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 3 MiByte, 12-way set associative, 64 byte line size\n");
break;
case 0xde:
- printf("3rd-level cache: 6 MByte, 12-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 6 MiByte, 12-way set associative, 64 byte line size\n");
break;
case 0xe2:
- printf("3rd-level cache: 2 MByte, 16-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 2 MiByte, 16-way set associative, 64 byte line size\n");
break;
case 0xe3:
- printf("3rd-level cache: 4 MByte, 16-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 4 MiByte, 16-way set associative, 64 byte line size\n");
break;
case 0xe4:
- printf("3rd-level cache: 8 MByte, 16-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 8 MiByte, 16-way set associative, 64 byte line size\n");
break;
case 0xea:
- printf("3rd-level cache: 12MByte, 24-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 12MiByte, 24-way set associative, 64 byte line size\n");
break;
case 0xeb:
- printf("3rd-level cache: 18MByte, 24-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 18MiByte, 24-way set associative, 64 byte line size\n");
break;
case 0xec:
- printf("3rd-level cache: 24MByte, 24-way set associative, 64 byte line size\n");
+ printf("3rd-level cache: 24MiByte, 24-way set associative, 64 byte line size\n");
break;
case 0xf0:
printf("64-Byte prefetching\n");