diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2012-03-15 15:41:40 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2012-03-15 15:41:40 +0000 |
| commit | 3700d0f904d544440516a7f472293f7e6be6979b (patch) | |
| tree | 53c86ad9af9cb94e3a9b54868c2cf79e04c8218a | |
| parent | 7120b0935afaa6e1a6492c4f1d6fcae5556e5404 (diff) | |
xpp: '%d' -> '%lu' when displaying module_refcount on kernel versions >= 3.3
Upstream commit bd77c047 "module: struct module_ref should contains long
fields" changed the return of module_refcount from int to unsigned long. This
change eliminates a warning from the string format specifier.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10485 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/xpp/xproto.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/dahdi/xpp/xproto.c b/drivers/dahdi/xpp/xproto.c index 7d0c506..25618fa 100644 --- a/drivers/dahdi/xpp/xproto.c +++ b/drivers/dahdi/xpp/xproto.c @@ -80,6 +80,12 @@ static const xproto_table_t *xproto_table(xpd_type_t cardtype) return xprotocol_tables[cardtype]; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) +#define MODULE_REFCOUNT_FORMAT "%s refcount was %d\n" +#else +#define MODULE_REFCOUNT_FORMAT "%s refcount was %lu\n" +#endif + const xproto_table_t *xproto_get(xpd_type_t cardtype) { const xproto_table_t *xtable; @@ -100,7 +106,7 @@ const xproto_table_t *xproto_get(xpd_type_t cardtype) if (xtable) { BUG_ON(!xtable->owner); #ifdef CONFIG_MODULE_UNLOAD - DBG(GENERAL, "%s refcount was %d\n", xtable->name, + DBG(GENERAL, MODULE_REFCOUNT_FORMAT, xtable->name, module_refcount(xtable->owner)); #endif if (!try_module_get(xtable->owner)) { @@ -116,7 +122,7 @@ void xproto_put(const xproto_table_t *xtable) { BUG_ON(!xtable); #ifdef CONFIG_MODULE_UNLOAD - DBG(GENERAL, "%s refcount was %d\n", xtable->name, + DBG(GENERAL, MODULE_REFCOUNT_FORMAT, xtable->name, module_refcount(xtable->owner)); BUG_ON(module_refcount(xtable->owner) <= 0); #endif |