2008-02-14 01:09:43

by Adrian Bunk

Subject: [2.6 patch] fix module_update_markers() compile error

This patch fixes the following compile error with CONFIG_MODULES=n
caused by commit fb40bd78b0f91b274879cf5db8facd1e04b6052e:

<-- snip -->

...
CC kernel/marker.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/marker.c: In function ‘marker_update_probes’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/marker.c:627: error: too few arguments to function ‘module_update_markers’
make[2]: *** [kernel/marker.o] Error 1

<-- snip -->

Signed-off-by: Adrian Bunk <[email protected]>

---
8d811a4160c6e2cb92391076e0e0b500e1b4a8a2 diff --git a/include/linux/module.h b/include/linux/module.h
index 330bec0..819c4e8 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -567,8 +567,7 @@ static inline void print_modules(void)
{
}

-static inline void module_update_markers(struct module *probe_module,
- int *refcount)
+static inline void module_update_markers(void)
{
}

2008-02-14 01:31:54

by Mathieu Desnoyers

Subject: Re: [2.6 patch] fix module_update_markers() compile error

* Adrian Bunk ([email protected]) wrote:
> This patch fixes the following compile error with CONFIG_MODULES=n
> caused by commit fb40bd78b0f91b274879cf5db8facd1e04b6052e:
>
> <-- snip -->
>
> ...
> CC kernel/marker.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/marker.c: In function ‘marker_update_probes’:
> /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/marker.c:627: error: too few arguments to function ‘module_update_markers’
> make[2]: *** [kernel/marker.o] Error 1
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>
>

Thanks for spotting this.

Acked-by: Mathieu Desnoyers <[email protected]>

> ---
> 8d811a4160c6e2cb92391076e0e0b500e1b4a8a2 diff --git a/include/linux/module.h b/include/linux/module.h
> index 330bec0..819c4e8 100644
> --- a/include/linux/module.h
> +++ b/include/linux/module.h
> @@ -567,8 +567,7 @@ static inline void print_modules(void)
> {
> }
>
> -static inline void module_update_markers(struct module *probe_module,
> - int *refcount)
> +static inline void module_update_markers(void)
> {
> }
>
>

--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68