diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /tools/perf/util/module.c | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'tools/perf/util/module.c')
| -rw-r--r-- | tools/perf/util/module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/module.c b/tools/perf/util/module.c index ddabe925d65..3d567fe59c7 100644 --- a/tools/perf/util/module.c +++ b/tools/perf/util/module.c | |||
| @@ -436,9 +436,9 @@ static int mod_dso__load_module_paths(struct mod_dso *self) | |||
| 436 | goto out_failure; | 436 | goto out_failure; |
| 437 | 437 | ||
| 438 | while (!feof(file)) { | 438 | while (!feof(file)) { |
| 439 | char *path, *name, *tmp; | 439 | char *name, *tmp; |
| 440 | struct module *module; | 440 | struct module *module; |
| 441 | int line_len, len; | 441 | int line_len; |
| 442 | 442 | ||
| 443 | line_len = getline(&line, &n, file); | 443 | line_len = getline(&line, &n, file); |
| 444 | if (line_len < 0) | 444 | if (line_len < 0) |