diff options
author | pfg <pfg@FreeBSD.org> | 2016-04-26 17:39:54 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2016-04-26 17:39:54 +0000 |
commit | 1df61c536d8a0f5edc0372de71d890814b9b277a (patch) | |
tree | dcd5008131650092bfafe6868c13700fc59c2788 /sys | |
parent | 437e80c6fb7d22ef50bfa5f9b9b5c811a1dd4e85 (diff) | |
download | FreeBSD-src-1df61c536d8a0f5edc0372de71d890814b9b277a.zip FreeBSD-src-1df61c536d8a0f5edc0372de71d890814b9b277a.tar.gz |
MFC r298482:
Cleanup redundant parenthesis from existing howmany()/roundup() macro uses.
Requested by: dchagin
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/pmap.c | 2 | ||||
-rw-r--r-- | sys/amd64/linux/linux_sysvec.c | 2 | ||||
-rw-r--r-- | sys/amd64/linux32/linux32_sysvec.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_file.c | 5 | ||||
-rw-r--r-- | sys/dev/cxgbe/tom/t4_tom.c | 2 | ||||
-rw-r--r-- | sys/i386/linux/linux_sysvec.c | 2 | ||||
-rw-r--r-- | sys/vm/vm_radix.c | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index b47e97c..855f7bc 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -678,7 +678,7 @@ allocpages(vm_paddr_t *firstaddr, int n) CTASSERT(powerof2(NDMPML4E)); /* number of kernel PDP slots */ -#define NKPDPE(ptpgs) howmany((ptpgs), NPDEPG) +#define NKPDPE(ptpgs) howmany(ptpgs, NPDEPG) static void nkpt_init(vm_paddr_t addr) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index fc8ee3e..13f9199 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -346,7 +346,7 @@ linux_copyout_strings(struct image_params *imgp) destp = (caddr_t)arginfo - SPARE_USRSPACE - roundup(sizeof(canary), sizeof(char *)) - roundup(execpath_len, sizeof(char *)) - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + roundup(ARG_MAX - imgp->args->stringspace, sizeof(char *)); if (execpath_len != 0) { imgp->execpathp = (uintptr_t)arginfo - execpath_len; diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index a7baa15..398ee28 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -862,7 +862,7 @@ linux_copyout_strings(struct image_params *imgp) destp = (caddr_t)arginfo - SPARE_USRSPACE - roundup(sizeof(canary), sizeof(char *)) - roundup(execpath_len, sizeof(char *)) - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + roundup(ARG_MAX - imgp->args->stringspace, sizeof(char *)); if (execpath_len != 0) { imgp->execpathp = (uintptr_t)arginfo - execpath_len; diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index ee1d1ba..1a47196 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -305,11 +305,10 @@ struct l_dirent64 { * at least glibc-2.7 requires it. That is why l_dirent is padded with 2 bytes. */ #define LINUX_RECLEN(namlen) \ - roundup((offsetof(struct l_dirent, d_name) + (namlen) + 2), \ - sizeof(l_ulong)) + roundup(offsetof(struct l_dirent, d_name) + (namlen) + 2, sizeof(l_ulong)) #define LINUX_RECLEN64(namlen) \ - roundup((offsetof(struct l_dirent64, d_name) + (namlen) + 1), \ + roundup(offsetof(struct l_dirent64, d_name) + (namlen) + 1, \ sizeof(uint64_t)) #define LINUX_MAXRECLEN max(LINUX_RECLEN(LINUX_NAME_MAX), \ diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index e21cdd5..2d88d3a 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -124,7 +124,7 @@ alloc_toepcb(struct port_info *pi, int txqid, int rxqid, int flags) * units of 16 byte. Calculate the maximum work requests possible. */ txsd_total = tx_credits / - howmany((sizeof(struct fw_ofld_tx_data_wr) + 1), 16); + howmany(sizeof(struct fw_ofld_tx_data_wr) + 1, 16); if (txqid < 0) txqid = (arc4random() % pi->nofldtxq) + pi->first_ofld_txq; diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 5419af8..4ce4f07 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -320,7 +320,7 @@ linux_copyout_strings(struct image_params *imgp) destp = (caddr_t)arginfo - SPARE_USRSPACE - linux_szplatform - roundup(sizeof(canary), sizeof(char *)) - roundup(execpath_len, sizeof(char *)) - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + roundup(ARG_MAX - imgp->args->stringspace, sizeof(char *)); /* * install LINUX_PLATFORM diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 7c6f7fa..7810d66 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) #define VM_RADIX_MASK (VM_RADIX_COUNT - 1) #define VM_RADIX_LIMIT \ - (howmany((sizeof(vm_pindex_t) * NBBY), VM_RADIX_WIDTH) - 1) + (howmany(sizeof(vm_pindex_t) * NBBY, VM_RADIX_WIDTH) - 1) /* Flag bits stored in node pointers. */ #define VM_RADIX_ISLEAF 0x1 |