diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2011-11-09 11:00:29 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2011-11-09 11:00:29 +0000 |
| commit | d09ebcec1792d8ebbfbcc9dfd53363192fa37047 (patch) | |
| tree | 1d8f18549621366a6628cc8a898c1fa3da6acf9d | |
| parent | 5086c26a6cf26b9b70e913503062e8eea13ee439 (diff) | |
Notes
| -rw-r--r-- | sys/kern/subr_kobj.c | 2 | ||||
| -rw-r--r-- | sys/sys/kobj.h | 2 | ||||
| -rw-r--r-- | sys/tools/makeobjops.awk | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 23ad29f7c177..821a7123f620 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -251,7 +251,7 @@ kobj_lookup_method(kobj_class_t cls, ce = kobj_lookup_method_mi(cls, desc); if (!ce) - ce = desc->deflt; + ce = &desc->deflt; *cep = ce; return ce; } diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h index 31d308a4bf54..dec90d0e1582 100644 --- a/sys/sys/kobj.h +++ b/sys/sys/kobj.h @@ -86,7 +86,7 @@ struct kobj_ops { struct kobjop_desc { unsigned int id; /* unique ID */ - kobj_method_t *deflt; /* default implementation */ + kobj_method_t deflt; /* default implementation */ }; /* diff --git a/sys/tools/makeobjops.awk b/sys/tools/makeobjops.awk index 4e3bd0485d25..34f2b09ae0f0 100644 --- a/sys/tools/makeobjops.awk +++ b/sys/tools/makeobjops.awk @@ -306,13 +306,8 @@ function handle_method (static, doc) printh(format_line(prototype argument_list ");", line_width, length(prototype))); - # Print out the method desc - printc("static const struct kobj_method " mname "_method_default = {"); - printc("\t&" mname "_desc, (kobjop_t) " default_function); - printc("};\n"); - printc("struct kobjop_desc " mname "_desc = {"); - printc("\t0, &" mname "_method_default"); + printc("\t0, { &" mname "_desc, (kobjop_t)" default_function " }"); printc("};\n"); # Print out the method itself |