Date: Fri, 13 Aug 2010 03:17:03 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r211268 - projects/ofed/head/sys/ofed/include/linux Message-ID: <201008130317.o7D3H3uh077801@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Fri Aug 13 03:17:03 2010 New Revision: 211268 URL: http://svn.freebsd.org/changeset/base/211268 Log: - Fix the try_get_module() return value to always be successful. - Add some temporary debugging for module startup order. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/include/linux/module.h Modified: projects/ofed/head/sys/ofed/include/linux/module.h ============================================================================== --- projects/ofed/head/sys/ofed/include/linux/module.h Fri Aug 13 03:16:11 2010 (r211267) +++ projects/ofed/head/sys/ofed/include/linux/module.h Fri Aug 13 03:17:03 2010 (r211268) @@ -44,21 +44,41 @@ #define EXPORT_SYMBOL(name) #define EXPORT_SYMBOL_GPL(name) +#include <sys/linker.h> + +static inline void +_module_run(void *arg) +{ + char name[1024]; + caddr_t pc; + void (*fn)(void); + long offset; + + pc = (caddr_t)arg; + if (linker_search_symbol_name(pc, name, sizeof(name), &offset) != 0) + printf("Running ??? (%p)\n", pc); + else + printf("Running %s (%p)\n", name, pc); + + fn = arg; + fn(); +} + #define module_init(fn) \ - SYSINIT(fn, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, (fn), NULL) + SYSINIT(fn, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, _module_run, (fn)) /* * XXX This is a freebsdism designed to work around not having a module * load order resolver built in. */ #define module_init_order(fn, order) \ - SYSINIT(fn, SI_SUB_RUN_SCHEDULER, (order), (fn), NULL) + SYSINIT(fn, SI_SUB_RUN_SCHEDULER, (order), _module_run, (fn)) #define module_exit(fn) \ - SYSUNINIT(fn, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, (fn), NULL) + SYSUNINIT(fn, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, _module_run, (fn)) #define module_get(module) #define module_put(module) -#define try_module_get(module) 0 +#define try_module_get(module) 1 #endif /* _LINUX_MODULE_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008130317.o7D3H3uh077801>