diff options
| author | pfg <pfg@FreeBSD.org> | 2016-04-19 23:41:46 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-04-19 23:41:46 +0000 |
| commit | be4082c832ab3e8ed4b2d4877eb549a54174bf85 (patch) | |
| tree | 5ed23465710a6035bce2fb4c78bd08f15ad4ff18 /sys/i386 | |
| parent | e2a6cba6516fcfe2c4f3ff73d0f9aa0ba261f548 (diff) | |
| download | FreeBSD-src-be4082c832ab3e8ed4b2d4877eb549a54174bf85.zip FreeBSD-src-be4082c832ab3e8ed4b2d4877eb549a54174bf85.tar.gz | |
X86: use our nitems() macro when it is avaliable through param.h.
No functional change, only trivial cases are done in this sweep,
Discussed in: freebsd-current
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/i686_mem.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 6 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_sysvec.c | 2 | ||||
| -rw-r--r-- | sys/i386/linux/linux_sysvec.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c index 2721cfb..d5d2251 100644 --- a/sys/i386/i386/i686_mem.c +++ b/sys/i386/i386/i686_mem.c @@ -113,7 +113,7 @@ static int i686_mtrrtomrt[] = { MDF_WRITEBACK }; -#define MTRRTOMRTLEN (sizeof(i686_mtrrtomrt) / sizeof(i686_mtrrtomrt[0])) +#define MTRRTOMRTLEN (nitems(i686_mtrrtomrt)) static int i686_mtrr2mrt(int val) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 529112d..89e67a5 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -221,8 +221,8 @@ vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; /* must be 2 less so 0 0 can signal end of chunks */ -#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(phys_avail[0])) - 2) -#define DUMP_AVAIL_ARRAY_END ((sizeof(dump_avail) / sizeof(dump_avail[0])) - 2) +#define PHYS_AVAIL_ARRAY_END (nitems(phys_avail) - 2) +#define DUMP_AVAIL_ARRAY_END (nitems(dump_avail) - 2) struct kva_md_info kmi; @@ -2517,7 +2517,7 @@ init386(first) /* make ldt memory segments */ ldt_segs[LUCODE_SEL].ssd_limit = atop(0 - 1); ldt_segs[LUDATA_SEL].ssd_limit = atop(0 - 1); - for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++) + for (x = 0; x < nitems(ldt_segs); x++) ssdtosd(&ldt_segs[x], &ldt[x].sd); _default_ldt = GSEL(GLDT_SEL, SEL_KPL); diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c index 372e5ea..83482f2 100644 --- a/sys/i386/ibcs2/ibcs2_sysvec.c +++ b/sys/i386/ibcs2/ibcs2_sysvec.c @@ -57,7 +57,7 @@ extern struct sysent ibcs2_sysent[IBCS2_SYS_MAXSYSCALL]; static int ibcs2_fixup(register_t **, struct image_params *); struct sysentvec ibcs2_svr3_sysvec = { - .sv_size = sizeof (ibcs2_sysent) / sizeof (ibcs2_sysent[0]), + .sv_size = nitems(ibcs2_sysent), .sv_table = ibcs2_sysent, .sv_mask = 0xff, .sv_sigsize = IBCS2_SIGTBLSZ, diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 2a4a49e..7d83511 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -184,7 +184,7 @@ static int _bsd_to_linux_trapcode[] = { 15 /* 30 T_RESERVED */ }; #define bsd_to_linux_trapcode(code) \ - ((code)<sizeof(_bsd_to_linux_trapcode)/sizeof(*_bsd_to_linux_trapcode)? \ + ((code)<nitems(_bsd_to_linux_trapcode)? \ _bsd_to_linux_trapcode[(code)]: \ LINUX_T_UNKNOWN) |
