Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208391
b: refs/heads/master
c: 5003bab
h: refs/heads/master
i:
  208389: 9efc95d
  208387: 1b734b4
  208383: 1622465
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Aug 11, 2010
1 parent 13f99b7 commit e3f3a9c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d30701b58970425e1d45994d6cb82f828924fdd
refs/heads/master: 5003bab82d56754b27be01eef24495a02e00039d
5 changes: 3 additions & 2 deletions trunk/scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define _GNU_SOURCE
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include "modpost.h"
#include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h"
Expand Down Expand Up @@ -1217,7 +1218,7 @@ static char *sec2annotation(const char *s)
strcat(p, " ");
return r; /* we leak her but we do not care */
} else {
return "";
return strdup("");
}
}

Expand Down Expand Up @@ -1352,7 +1353,7 @@ static void report_sec_mismatch(const char *modname,
"%s%s so it may be used outside an exit section.\n",
from, prl_from, fromsym, from_p,
to, prl_to, tosym, to_p,
sec2annotation(tosec), tosym, to_p);
prl_to, tosym, to_p);
free(prl_from);
free(prl_to);
break;
Expand Down

0 comments on commit e3f3a9c

Please sign in to comment.