diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -81,8 +81,6 @@ #include "pic_if.h" #include "msi_if.h" -#define INTRNAME_LEN (2*MAXCOMLEN + 1) - #ifdef DEBUG #define debugf(fmt, args...) do { printf("%s(): ", __func__); \ printf(fmt,##args); } while (0) @@ -475,7 +473,7 @@ isrc->isrc_flags = flags; va_start(ap, fmt); - vsnprintf(isrc->isrc_name, INTR_ISRC_NAMELEN, fmt, ap); + vsnprintf(isrc->isrc_name, INTRNAME_LEN, fmt, ap); va_end(ap); mtx_lock(&isrc_table_lock); diff --git a/sys/sys/intr.h b/sys/sys/intr.h --- a/sys/sys/intr.h +++ b/sys/sys/intr.h @@ -71,7 +71,7 @@ #endif typedef int intr_child_irq_filter_t(void *arg, uintptr_t irq); -#define INTR_ISRC_NAMELEN (MAXCOMLEN + 1) +#define INTRNAME_LEN (MAXCOMLEN + 1) #define INTR_ISRCF_IPI 0x01 /* IPI interrupt */ #define INTR_ISRCF_PPI 0x02 /* PPI interrupt */ @@ -84,7 +84,7 @@ device_t isrc_dev; /* where isrc is mapped */ u_int isrc_irq; /* unique identificator */ u_int isrc_flags; - char isrc_name[INTR_ISRC_NAMELEN]; + char isrc_name[INTRNAME_LEN]; cpuset_t isrc_cpu; /* on which CPUs is enabled */ u_int isrc_index; u_long * isrc_count;