diff options
-rw-r--r-- | sys/amd64/amd64/amd64_mem.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 4 | ||||
-rw-r--r-- | sys/amd64/linux/linux_sysvec.c | 2 | ||||
-rw-r--r-- | sys/amd64/linux32/linux32_sysvec.c | 2 | ||||
-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 | ||||
-rw-r--r-- | sys/x86/isa/atpic.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/identcpu.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/local_apic.c | 4 |
11 files changed, 15 insertions, 15 deletions
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c index 29cf2c0..f07a886 100644 --- a/sys/amd64/amd64/amd64_mem.c +++ b/sys/amd64/amd64/amd64_mem.c @@ -117,7 +117,7 @@ static int amd64_mtrrtomrt[] = { MDF_WRITEBACK }; -#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) +#define MTRRTOMRTLEN nitems(amd64_mtrrtomrt) static int amd64_mtrr2mrt(int val) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index c07d09c..9007c12 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -217,8 +217,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; diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index d8f56c0..07efcb5 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -186,7 +186,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) diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 4c4b5a1..7bbc48e 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -185,7 +185,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) 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) diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index 8ad515d..43504e7 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -155,7 +155,7 @@ static struct atpic_intsrc atintrs[] = { INTSRC(15), }; -CTASSERT(sizeof(atintrs) / sizeof(atintrs[0]) == NUM_ISA_IRQS); +CTASSERT(nitems(atintrs) == NUM_ISA_IRQS); static __inline void _atpic_eoi_master(struct intsrc *isrc) diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index f5e3ca4..48e07ea 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1589,7 +1589,7 @@ find_cpu_vendor_id(void) { int i; - for (i = 0; i < sizeof(cpu_vendors) / sizeof(cpu_vendors[0]); i++) + for (i = 0; i < nitems(cpu_vendors); i++) if (strcmp(cpu_vendor, cpu_vendors[i].vendor) == 0) return (cpu_vendors[i].vendor_id); return (0); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 854bda4..1a02626 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1183,8 +1183,8 @@ lapic_timer_set_divisor(u_int divisor) { KASSERT(powerof2(divisor), ("lapic: invalid divisor %u", divisor)); - KASSERT(ffs(divisor) <= sizeof(lapic_timer_divisors) / - sizeof(u_int32_t), ("lapic: invalid divisor %u", divisor)); + KASSERT(ffs(divisor) <= nitems(lapic_timer_divisors), + ("lapic: invalid divisor %u", divisor)); lapic_write32(LAPIC_DCR_TIMER, lapic_timer_divisors[ffs(divisor) - 1]); } |