diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 07:28:56 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 07:28:56 -0400 |
| commit | b6a4b7de4cb45ccf7157fc58de09c96f84d67108 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /scripts/mod/modpost.c | |
| parent | 2778d0d51dd5007c4909c1d9874f5e9097785a7a (diff) | |
| parent | 651dab4264e4ba0e563f5ff56f748127246e9065 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
Diffstat (limited to 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 418cd7dbbc93..8e0de6a5e18a 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -1986,11 +1986,13 @@ static void read_markers(const char *fname) | |||
| 1986 | 1986 | ||
| 1987 | mod = find_module(modname); | 1987 | mod = find_module(modname); |
| 1988 | if (!mod) { | 1988 | if (!mod) { |
| 1989 | if (is_vmlinux(modname)) | ||
| 1990 | have_vmlinux = 1; | ||
| 1991 | mod = new_module(NOFAIL(strdup(modname))); | 1989 | mod = new_module(NOFAIL(strdup(modname))); |
| 1992 | mod->skip = 1; | 1990 | mod->skip = 1; |
| 1993 | } | 1991 | } |
| 1992 | if (is_vmlinux(modname)) { | ||
| 1993 | have_vmlinux = 1; | ||
| 1994 | mod->skip = 0; | ||
| 1995 | } | ||
| 1994 | 1996 | ||
| 1995 | if (!mod->skip) | 1997 | if (!mod->skip) |
| 1996 | add_marker(mod, marker, fmt); | 1998 | add_marker(mod, marker, fmt); |
