Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 06 Feb 2026 12:04:09 +0000
From:      Ahmad Khalifa <vexeduxr@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Cc:        Quent=?utf-8?Q?in Th=C3=A9?=bault <quentin.thebault@defenso.fr>
Subject:   git: 912418193ed1 - main - sys/subr_module: remove useless macro gates
Message-ID:  <6985d8b9.22c22.6b6da7ad@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vexeduxr:

URL: https://cgit.FreeBSD.org/src/commit/?id=912418193ed1f9a0f58b083037751b1fbc4c30ef

commit 912418193ed1f9a0f58b083037751b1fbc4c30ef
Author:     Quentin Thébault <quentin.thebault@defenso.fr>
AuthorDate: 2026-02-05 14:57:11 +0000
Commit:     Ahmad Khalifa <vexeduxr@FreeBSD.org>
CommitDate: 2026-02-06 11:56:55 +0000

    sys/subr_module: remove useless macro gates
    
    These constants are always defined by sys/sys/linker.h.
    
    Reviewed by: vexeduxr
    Signed-off-by: Quentin Thébault <quentin.thebault@defenso.fr>
    Sponsored by: Defenso
    MFC after: 2 weeks
    Closes: https://github.com/freebsd/freebsd-src/pull/2004
---
 sys/kern/subr_module.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index d07990cebdc3..f8b6770e3189 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -433,16 +433,12 @@ preload_modinfo_type(struct sbuf *sbp, int type)
 		sbuf_cat(sbp, "MODINFOMD_VBE_FB");
 		break;
 #endif
-#ifdef MODINFOMD_FONT
 	case MODINFOMD_FONT:
 		sbuf_cat(sbp, "MODINFOMD_FONT");
 		break;
-#endif
-#ifdef MODINFOMD_SPLASH
 	case MODINFOMD_SPLASH:
 		sbuf_cat(sbp, "MODINFOMD_SPLASH");
 		break;
-#endif
 #ifdef MODINFOMD_BOOT_HARTID
 	case MODINFOMD_BOOT_HARTID:
 		sbuf_cat(sbp, "MODINFOMD_BOOT_HARTID");
@@ -497,12 +493,8 @@ preload_modinfo_value(struct sbuf *sbp, uint32_t *bptr, int type, int len)
 #ifdef MODINFOMD_VBE_FB
 	case MODINFO_METADATA | MODINFOMD_VBE_FB:
 #endif
-#ifdef MODINFOMD_FONT
 	case MODINFO_METADATA | MODINFOMD_FONT:
-#endif
-#ifdef MODINFOMD_SPLASH
 	case MODINFO_METADATA | MODINFOMD_SPLASH:
-#endif
 		sbuf_print_vmoffset(sbp, *(vm_offset_t *)bptr);
 		break;
 	case MODINFO_METADATA | MODINFOMD_HOWTO:


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6985d8b9.22c22.6b6da7ad>