git: 8910f9e5a0cc - main - kobj: Make the containers of pointers to base classes constant
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 10 Nov 2026 13:29:14 UTC
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=8910f9e5a0cc378147d53c8440b97433671447ec
commit 8910f9e5a0cc378147d53c8440b97433671447ec
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2026-11-10 13:27:09 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2026-11-10 13:27:09 +0000
kobj: Make the containers of pointers to base classes constant
The containers (arrays) will not be modified during runtime.
Reviewed by: kib, imp
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D61297
---
sys/arm/include/platformvar.h | 2 +-
sys/dev/usb/usb_hub_acpi.c | 2 +-
sys/kern/subr_kobj.c | 6 +++---
sys/sys/kobj.h | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sys/arm/include/platformvar.h b/sys/arm/include/platformvar.h
index 9512f11470f1..a79a89024657 100644
--- a/sys/arm/include/platformvar.h
+++ b/sys/arm/include/platformvar.h
@@ -96,7 +96,7 @@ static fdt_platform_def_t VAR_NAME ## _fdt_platform = { \
.methods = fdt_platform_methods, \
.fdt_compatible = _compatible, \
}; \
-static kobj_class_t VAR_NAME ## _baseclasses[] = \
+static const kobj_class_t VAR_NAME ## _baseclasses[] = \
{ (kobj_class_t)&VAR_NAME ## _fdt_platform, NULL }; \
static platform_def_t VAR_NAME ## _platform = { \
.name = NAME_STR, \
diff --git a/sys/dev/usb/usb_hub_acpi.c b/sys/dev/usb/usb_hub_acpi.c
index a89f48fda630..8d826b15b25e 100644
--- a/sys/dev/usb/usb_hub_acpi.c
+++ b/sys/dev/usb/usb_hub_acpi.c
@@ -584,7 +584,7 @@ static device_method_t acpi_uhub_root_methods[] = {
};
extern driver_t uhub_driver;
-static kobj_class_t uhub_baseclasses[] = {&uhub_driver, NULL};
+static const kobj_class_t uhub_baseclasses[] = {&uhub_driver, NULL};
static driver_t acpi_uhub_driver = {
.name = "uhub",
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c
index 0f9f7a79aaf0..bd2925d5fd8b 100644
--- a/sys/kern/subr_kobj.c
+++ b/sys/kern/subr_kobj.c
@@ -104,7 +104,7 @@ kobj_data_size_roundup(size_t size)
static void
kobj_class_init_total_size(kobj_class_t cls)
{
- kobj_class_t *bases;
+ const kobj_class_t *bases;
size_t size;
int i;
@@ -228,7 +228,7 @@ kobj_lookup_method_mi(kobj_class_t cls,
kobjop_desc_t desc)
{
kobj_method_t *ce;
- kobj_class_t *basep;
+ const kobj_class_t *basep;
ce = kobj_lookup_method_class(cls, desc);
if (ce)
@@ -388,7 +388,7 @@ kobj_delete(kobj_t obj, struct malloc_type *mtype)
static inline bool
kobj_get_instance_offset(kobj_class_t cls, kobj_class_t subclass, size_t *offs)
{
- kobj_class_t *bases;
+ const kobj_class_t *bases;
size_t tmp;
int i;
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index 317ae3c7ad6e..890ad1d39a13 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -62,7 +62,7 @@ struct kobj_method {
const char *name; /* class name */ \
kobj_method_t *methods; /* method table */ \
size_t size; /* object size */ \
- kobj_class_t *baseclasses; /* base classes */ \
+ const kobj_class_t *baseclasses;/* base classes */ \
u_int refs; /* reference count */ \
kobj_ops_t ops; /* compiled method table */ \
size_t total_size; /* total object size */ \
@@ -145,7 +145,7 @@ struct kobj_class classvar = { \
#define DEFINE_CLASS_1(_name, classvar, _methods, _size, \
base1) \
\
-static kobj_class_t _name ## _baseclasses[] = \
+static const kobj_class_t _name ## _baseclasses[] = \
{ &base1, NULL }; \
struct kobj_class classvar = { \
.name = #_name, \
@@ -163,7 +163,7 @@ struct kobj_class classvar = { \
#define DEFINE_CLASS_2(_name, classvar, _methods, _size, \
base1, base2) \
\
-static kobj_class_t _name ## _baseclasses[] = \
+static const kobj_class_t _name ## _baseclasses[] = \
{ &base1, &base2, NULL }; \
struct kobj_class classvar = { \
.name = #_name, \
@@ -181,7 +181,7 @@ struct kobj_class classvar = { \
#define DEFINE_CLASS_3(_name, classvar, _methods, _size, \
base1, base2, base3) \
\
-static kobj_class_t _name ## _baseclasses[] = \
+static const kobj_class_t _name ## _baseclasses[] = \
{ &base1, &base2, &base3, NULL }; \
struct kobj_class classvar = { \
.name = #_name, \