svn: stable/10/sys: amd64/amd64 amd64/linux amd64/linux32 compat/linux dev/cxgbe/tom i386/linux vm
Maxim Sobolev
sobomax at FreeBSD.org
Tue Apr 26 18:42:06 UTC 2016
Given the widespread use of those two macros, maybe we need howmany.9 and
roundup.9 manual pages with detailed formal description? Particularly
interested in how "return" supposed to be typed. Another thing is that
would be nice is some kind of automatic
#error/#warning/printf/KASSERT/panic when (X < Y || Y <= 0) &
defined(INVARIANTS).
-Max
On Tue, Apr 26, 2016 at 10:39 AM, Pedro F. Giffuni <pfg at freebsd.org> wrote:
> Author: pfg
> Date: Tue Apr 26 17:39:54 2016
> New Revision: 298653
> URL: https://svnweb.freebsd.org/changeset/base/298653
>
> Log:
> MFC r298482:
> Cleanup redundant parenthesis from existing howmany()/roundup() macro
> uses.
>
> Requested by: dchagin
>
> Modified:
> stable/10/sys/amd64/amd64/pmap.c
> stable/10/sys/amd64/linux/linux_sysvec.c
> stable/10/sys/amd64/linux32/linux32_sysvec.c
> stable/10/sys/compat/linux/linux_file.c
> stable/10/sys/dev/cxgbe/tom/t4_tom.c
> stable/10/sys/i386/linux/linux_sysvec.c
> stable/10/sys/vm/vm_radix.c
> Directory Properties:
> stable/10/ (props changed)
>
> Modified: stable/10/sys/amd64/amd64/pmap.c
>
> ==============================================================================
> --- stable/10/sys/amd64/amd64/pmap.c Tue Apr 26 16:40:04 2016
> (r298652)
> +++ stable/10/sys/amd64/amd64/pmap.c Tue Apr 26 17:39:54 2016
> (r298653)
> @@ -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)
>
> Modified: stable/10/sys/amd64/linux/linux_sysvec.c
>
> ==============================================================================
> --- stable/10/sys/amd64/linux/linux_sysvec.c Tue Apr 26 16:40:04 2016
> (r298652)
> +++ stable/10/sys/amd64/linux/linux_sysvec.c Tue Apr 26 17:39:54 2016
> (r298653)
> @@ -346,7 +346,7 @@ linux_copyout_strings(struct image_param
> 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;
>
> Modified: stable/10/sys/amd64/linux32/linux32_sysvec.c
>
> ==============================================================================
> --- stable/10/sys/amd64/linux32/linux32_sysvec.c Tue Apr 26
> 16:40:04 2016 (r298652)
> +++ stable/10/sys/amd64/linux32/linux32_sysvec.c Tue Apr 26
> 17:39:54 2016 (r298653)
> @@ -862,7 +862,7 @@ linux_copyout_strings(struct image_param
> 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;
>
> Modified: stable/10/sys/compat/linux/linux_file.c
>
> ==============================================================================
> --- stable/10/sys/compat/linux/linux_file.c Tue Apr 26 16:40:04 2016
> (r298652)
> +++ stable/10/sys/compat/linux/linux_file.c Tue Apr 26 17:39:54 2016
> (r298653)
> @@ -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),
> \
>
> Modified: stable/10/sys/dev/cxgbe/tom/t4_tom.c
>
> ==============================================================================
> --- stable/10/sys/dev/cxgbe/tom/t4_tom.c Tue Apr 26 16:40:04 2016
> (r298652)
> +++ stable/10/sys/dev/cxgbe/tom/t4_tom.c Tue Apr 26 17:39:54 2016
> (r298653)
> @@ -124,7 +124,7 @@ alloc_toepcb(struct port_info *pi, int t
> * 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;
>
> Modified: stable/10/sys/i386/linux/linux_sysvec.c
>
> ==============================================================================
> --- stable/10/sys/i386/linux/linux_sysvec.c Tue Apr 26 16:40:04 2016
> (r298652)
> +++ stable/10/sys/i386/linux/linux_sysvec.c Tue Apr 26 17:39:54 2016
> (r298653)
> @@ -320,7 +320,7 @@ linux_copyout_strings(struct image_param
> 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
>
> Modified: stable/10/sys/vm/vm_radix.c
>
> ==============================================================================
> --- stable/10/sys/vm/vm_radix.c Tue Apr 26 16:40:04 2016 (r298652)
> +++ stable/10/sys/vm/vm_radix.c Tue Apr 26 17:39:54 2016 (r298653)
> @@ -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
>
>
More information about the svn-src-all
mailing list