* [PATCH] Kbuild: clean up marker
@ 2009-11-16 5:49 Wenji Huang
2009-11-16 5:49 ` [PATCH] Kbuild: clear marker out of modpost Wenji Huang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Wenji Huang @ 2009-11-16 5:49 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-kbuild, Wenji Huang
Drop Module.markers from cleaning list.
Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
---
Makefile | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 8278361..1c8c3e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1198,7 +1198,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/linux/autoconf.h include/linux/version.h \
include/linux/utsrelease.h \
include/linux/bounds.h include/asm*/asm-offsets.h \
- Module.symvers Module.markers tags TAGS cscope*
+ Module.symvers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules
#
@@ -1217,7 +1217,7 @@ clean: archclean $(clean-dirs)
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-o -name '*.symtypes' -o -name 'modules.order' \
- -o -name 'Module.markers' -o -name '.tmp_*.o.*' \
+ -o -name '.tmp_*.o.*' \
-o -name '*.gcno' \) -type f -print | xargs rm -f
# mrproper - Delete all generated files, including .config
@@ -1415,7 +1415,6 @@ $(clean-dirs):
clean: rm-dirs := $(MODVERDIR)
clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \
- $(KBUILD_EXTMOD)/Module.markers \
$(KBUILD_EXTMOD)/modules.order
clean: $(clean-dirs)
$(call cmd,rmdirs)
--
1.5.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] Kbuild: clear marker out of modpost
2009-11-16 5:49 [PATCH] Kbuild: clean up marker Wenji Huang
@ 2009-11-16 5:49 ` Wenji Huang
2009-11-16 6:31 ` Américo Wang
2009-11-16 6:26 ` [PATCH] Kbuild: clean up marker Américo Wang
2009-11-18 21:20 ` Andrew Morton
2 siblings, 1 reply; 6+ messages in thread
From: Wenji Huang @ 2009-11-16 5:49 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-kbuild, Wenji Huang
Remove the unnecessary functions and variables.
Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
---
scripts/mod/modpost.c | 164 -------------------------------------------------
scripts/mod/modpost.h | 3 -
2 files changed, 0 insertions(+), 167 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 801a16a..204e3f0 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -451,8 +451,6 @@ static int parse_elf(struct elf_info *info, const char *filename)
info->export_unused_gpl_sec = i;
else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
info->export_gpl_future_sec = i;
- else if (strcmp(secname, "__markers_strings") == 0)
- info->markers_strings_sec = i;
if (sechdrs[i].sh_type != SHT_SYMTAB)
continue;
@@ -1509,62 +1507,6 @@ static void check_sec_ref(struct module *mod, const char *modname,
}
}
-static void get_markers(struct elf_info *info, struct module *mod)
-{
- const Elf_Shdr *sh = &info->sechdrs[info->markers_strings_sec];
- const char *strings = (const char *) info->hdr + sh->sh_offset;
- const Elf_Sym *sym, *first_sym, *last_sym;
- size_t n;
-
- if (!info->markers_strings_sec)
- return;
-
- /*
- * First count the strings. We look for all the symbols defined
- * in the __markers_strings section named __mstrtab_*. For
- * these local names, the compiler puts a random .NNN suffix on,
- * so the names don't correspond exactly.
- */
- first_sym = last_sym = NULL;
- n = 0;
- for (sym = info->symtab_start; sym < info->symtab_stop; sym++)
- if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&
- sym->st_shndx == info->markers_strings_sec &&
- !strncmp(info->strtab + sym->st_name,
- "__mstrtab_", sizeof "__mstrtab_" - 1)) {
- if (first_sym == NULL)
- first_sym = sym;
- last_sym = sym;
- ++n;
- }
-
- if (n == 0)
- return;
-
- /*
- * Now collect each name and format into a line for the output.
- * Lines look like:
- * marker_name vmlinux marker %s format %d
- * The format string after the second \t can use whitespace.
- */
- mod->markers = NOFAIL(malloc(sizeof mod->markers[0] * n));
- mod->nmarkers = n;
-
- n = 0;
- for (sym = first_sym; sym <= last_sym; sym++)
- if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&
- sym->st_shndx == info->markers_strings_sec &&
- !strncmp(info->strtab + sym->st_name,
- "__mstrtab_", sizeof "__mstrtab_" - 1)) {
- const char *name = strings + sym->st_value;
- const char *fmt = strchr(name, '\0') + 1;
- char *line = NULL;
- asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
- NOFAIL(line);
- mod->markers[n++] = line;
- }
-}
-
static void read_symbols(char *modname)
{
const char *symname;
@@ -1620,8 +1562,6 @@ static void read_symbols(char *modname)
get_src_version(modname, mod->srcversion,
sizeof(mod->srcversion)-1);
- get_markers(&info, mod);
-
parse_elf_finish(&info);
/* Our trick to get versioning for module struct etc. - it's
@@ -1976,96 +1916,6 @@ static void write_dump(const char *fname)
write_if_changed(&buf, fname);
}
-static void add_marker(struct module *mod, const char *name, const char *fmt)
-{
- char *line = NULL;
- asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
- NOFAIL(line);
-
- mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *
- sizeof mod->markers[0])));
- mod->markers[mod->nmarkers++] = line;
-}
-
-static void read_markers(const char *fname)
-{
- unsigned long size, pos = 0;
- void *file = grab_file(fname, &size);
- char *line;
-
- if (!file) /* No old markers, silently ignore */
- return;
-
- while ((line = get_next_line(&pos, file, size))) {
- char *marker, *modname, *fmt;
- struct module *mod;
-
- marker = line;
- modname = strchr(marker, '\t');
- if (!modname)
- goto fail;
- *modname++ = '\0';
- fmt = strchr(modname, '\t');
- if (!fmt)
- goto fail;
- *fmt++ = '\0';
- if (*marker == '\0' || *modname == '\0')
- goto fail;
-
- mod = find_module(modname);
- if (!mod) {
- mod = new_module(modname);
- mod->skip = 1;
- }
- if (is_vmlinux(modname)) {
- have_vmlinux = 1;
- mod->skip = 0;
- }
-
- if (!mod->skip)
- add_marker(mod, marker, fmt);
- }
- release_file(file, size);
- return;
-fail:
- fatal("parse error in markers list file\n");
-}
-
-static int compare_strings(const void *a, const void *b)
-{
- return strcmp(*(const char **) a, *(const char **) b);
-}
-
-static void write_markers(const char *fname)
-{
- struct buffer buf = { };
- struct module *mod;
- size_t i;
-
- for (mod = modules; mod; mod = mod->next)
- if ((!external_module || !mod->skip) && mod->markers != NULL) {
- /*
- * Sort the strings so we can skip duplicates when
- * we write them out.
- */
- qsort(mod->markers, mod->nmarkers,
- sizeof mod->markers[0], &compare_strings);
- for (i = 0; i < mod->nmarkers; ++i) {
- char *line = mod->markers[i];
- buf_write(&buf, line, strlen(line));
- while (i + 1 < mod->nmarkers &&
- !strcmp(mod->markers[i],
- mod->markers[i + 1]))
- free(mod->markers[i++]);
- free(mod->markers[i]);
- }
- free(mod->markers);
- mod->markers = NULL;
- }
-
- write_if_changed(&buf, fname);
-}
-
struct ext_sym_list {
struct ext_sym_list *next;
const char *file;
@@ -2077,8 +1927,6 @@ int main(int argc, char **argv)
struct buffer buf = { };
char *kernel_read = NULL, *module_read = NULL;
char *dump_write = NULL;
- char *markers_read = NULL;
- char *markers_write = NULL;
int opt;
int err;
struct ext_sym_list *extsym_iter;
@@ -2122,12 +1970,6 @@ int main(int argc, char **argv)
case 'w':
warn_unresolved = 1;
break;
- case 'M':
- markers_write = optarg;
- break;
- case 'K':
- markers_read = optarg;
- break;
default:
exit(1);
}
@@ -2182,11 +2024,5 @@ int main(int argc, char **argv)
"'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
sec_mismatch_count);
- if (markers_read)
- read_markers(markers_read);
-
- if (markers_write)
- write_markers(markers_write);
-
return err;
}
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 09f58e3..be987a4 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -112,8 +112,6 @@ struct module {
int has_init;
int has_cleanup;
struct buffer dev_table_buf;
- char **markers;
- size_t nmarkers;
char srcversion[25];
};
@@ -128,7 +126,6 @@ struct elf_info {
Elf_Section export_gpl_sec;
Elf_Section export_unused_gpl_sec;
Elf_Section export_gpl_future_sec;
- Elf_Section markers_strings_sec;
const char *strtab;
char *modinfo;
unsigned int modinfo_len;
--
1.5.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Kbuild: clean up marker
2009-11-16 5:49 [PATCH] Kbuild: clean up marker Wenji Huang
2009-11-16 5:49 ` [PATCH] Kbuild: clear marker out of modpost Wenji Huang
@ 2009-11-16 6:26 ` Américo Wang
2009-11-18 21:20 ` Andrew Morton
2 siblings, 0 replies; 6+ messages in thread
From: Américo Wang @ 2009-11-16 6:26 UTC (permalink / raw)
To: Wenji Huang; +Cc: linux-kernel, linux-kbuild, Sam Ravnborg
On Mon, Nov 16, 2009 at 1:49 PM, Wenji Huang <wenji.huang@oracle.com> wrote:
> Drop Module.markers from cleaning list.
>
> Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
> ---
> Makefile | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 8278361..1c8c3e1 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1198,7 +1198,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
> include/linux/autoconf.h include/linux/version.h \
> include/linux/utsrelease.h \
> include/linux/bounds.h include/asm*/asm-offsets.h \
> - Module.symvers Module.markers tags TAGS cscope*
> + Module.symvers tags TAGS cscope*
>
> # clean - Delete most, but leave enough to build external modules
> #
> @@ -1217,7 +1217,7 @@ clean: archclean $(clean-dirs)
> \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
> -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
> -o -name '*.symtypes' -o -name 'modules.order' \
> - -o -name 'Module.markers' -o -name '.tmp_*.o.*' \
> + -o -name '.tmp_*.o.*' \
> -o -name '*.gcno' \) -type f -print | xargs rm -f
>
> # mrproper - Delete all generated files, including .config
> @@ -1415,7 +1415,6 @@ $(clean-dirs):
>
> clean: rm-dirs := $(MODVERDIR)
> clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \
> - $(KBUILD_EXTMOD)/Module.markers \
> $(KBUILD_EXTMOD)/modules.order
> clean: $(clean-dirs)
> $(call cmd,rmdirs)
> --
> 1.5.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kbuild: clear marker out of modpost
2009-11-16 5:49 ` [PATCH] Kbuild: clear marker out of modpost Wenji Huang
@ 2009-11-16 6:31 ` Américo Wang
0 siblings, 0 replies; 6+ messages in thread
From: Américo Wang @ 2009-11-16 6:31 UTC (permalink / raw)
To: Wenji Huang; +Cc: linux-kernel, linux-kbuild, Ingo Molnar
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 11156 bytes --]
On Mon, Nov 16, 2009 at 1:49 PM, Wenji Huang <wenji.huang@oracle.com> wrote:
> Remove the unnecessary functions and variables.
>
> Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
I am not sure about this removal, Ingo seems to have other
opinions, please check:
http://lkml.org/lkml/2009/9/18/92
Adding Ingo into Cc:.
Thanks.
> ---
> Â scripts/mod/modpost.c | Â 164 -------------------------------------------------
> Â scripts/mod/modpost.h | Â Â 3 -
> Â 2 files changed, 0 insertions(+), 167 deletions(-)
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 801a16a..204e3f0 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -451,8 +451,6 @@ static int parse_elf(struct elf_info *info, const char *filename)
> Â Â Â Â Â Â Â Â Â Â Â Â info->export_unused_gpl_sec = i;
> Â Â Â Â Â Â Â Â else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
> Â Â Â Â Â Â Â Â Â Â Â Â info->export_gpl_future_sec = i;
> - Â Â Â Â Â Â Â else if (strcmp(secname, "__markers_strings") == 0)
> - Â Â Â Â Â Â Â Â Â Â Â info->markers_strings_sec = i;
>
> Â Â Â Â Â Â Â Â if (sechdrs[i].sh_type != SHT_SYMTAB)
> Â Â Â Â Â Â Â Â Â Â Â Â continue;
> @@ -1509,62 +1507,6 @@ static void check_sec_ref(struct module *mod, const char *modname,
> Â Â Â Â }
> Â }
>
> -static void get_markers(struct elf_info *info, struct module *mod)
> -{
> - Â Â Â const Elf_Shdr *sh = &info->sechdrs[info->markers_strings_sec];
> - Â Â Â const char *strings = (const char *) info->hdr + sh->sh_offset;
> - Â Â Â const Elf_Sym *sym, *first_sym, *last_sym;
> - Â Â Â size_t n;
> -
> - Â Â Â if (!info->markers_strings_sec)
> - Â Â Â Â Â Â Â return;
> -
> - Â Â Â /*
> - Â Â Â Â * First count the strings. Â We look for all the symbols defined
> - Â Â Â Â * in the __markers_strings section named __mstrtab_*. Â For
> - Â Â Â Â * these local names, the compiler puts a random .NNN suffix on,
> - Â Â Â Â * so the names don't correspond exactly.
> - Â Â Â Â */
> - Â Â Â first_sym = last_sym = NULL;
> - Â Â Â n = 0;
> - Â Â Â for (sym = info->symtab_start; sym < info->symtab_stop; sym++)
> - Â Â Â Â Â Â Â if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&
> - Â Â Â Â Â Â Â Â Â sym->st_shndx == info->markers_strings_sec &&
> - Â Â Â Â Â Â Â Â Â !strncmp(info->strtab + sym->st_name,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â "__mstrtab_", sizeof "__mstrtab_" - 1)) {
> - Â Â Â Â Â Â Â Â Â Â Â if (first_sym == NULL)
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â first_sym = sym;
> - Â Â Â Â Â Â Â Â Â Â Â last_sym = sym;
> - Â Â Â Â Â Â Â Â Â Â Â ++n;
> - Â Â Â Â Â Â Â }
> -
> - Â Â Â if (n == 0)
> - Â Â Â Â Â Â Â return;
> -
> - Â Â Â /*
> - Â Â Â Â * Now collect each name and format into a line for the output.
> - Â Â Â Â * Lines look like:
> -     *    marker_name   vmlinux marker %s format %d
> - Â Â Â Â * The format string after the second \t can use whitespace.
> - Â Â Â Â */
> - Â Â Â mod->markers = NOFAIL(malloc(sizeof mod->markers[0] * n));
> - Â Â Â mod->nmarkers = n;
> -
> - Â Â Â n = 0;
> - Â Â Â for (sym = first_sym; sym <= last_sym; sym++)
> - Â Â Â Â Â Â Â if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&
> - Â Â Â Â Â Â Â Â Â sym->st_shndx == info->markers_strings_sec &&
> - Â Â Â Â Â Â Â Â Â !strncmp(info->strtab + sym->st_name,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â "__mstrtab_", sizeof "__mstrtab_" - 1)) {
> - Â Â Â Â Â Â Â Â Â Â Â const char *name = strings + sym->st_value;
> - Â Â Â Â Â Â Â Â Â Â Â const char *fmt = strchr(name, '\0') + 1;
> - Â Â Â Â Â Â Â Â Â Â Â char *line = NULL;
> - Â Â Â Â Â Â Â Â Â Â Â asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
> - Â Â Â Â Â Â Â Â Â Â Â NOFAIL(line);
> - Â Â Â Â Â Â Â Â Â Â Â mod->markers[n++] = line;
> - Â Â Â Â Â Â Â }
> -}
> -
> Â static void read_symbols(char *modname)
> Â {
> Â Â Â Â const char *symname;
> @@ -1620,8 +1562,6 @@ static void read_symbols(char *modname)
> Â Â Â Â Â Â Â Â get_src_version(modname, mod->srcversion,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sizeof(mod->srcversion)-1);
>
> - Â Â Â get_markers(&info, mod);
> -
> Â Â Â Â parse_elf_finish(&info);
>
> Â Â Â Â /* Our trick to get versioning for module struct etc. - it's
> @@ -1976,96 +1916,6 @@ static void write_dump(const char *fname)
> Â Â Â Â write_if_changed(&buf, fname);
> Â }
>
> -static void add_marker(struct module *mod, const char *name, const char *fmt)
> -{
> - Â Â Â char *line = NULL;
> - Â Â Â asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
> - Â Â Â NOFAIL(line);
> -
> - Â Â Â mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sizeof mod->markers[0])));
> - Â Â Â mod->markers[mod->nmarkers++] = line;
> -}
> -
> -static void read_markers(const char *fname)
> -{
> - Â Â Â unsigned long size, pos = 0;
> - Â Â Â void *file = grab_file(fname, &size);
> - Â Â Â char *line;
> -
> - Â Â Â if (!file) Â Â Â Â Â Â Â /* No old markers, silently ignore */
> - Â Â Â Â Â Â Â return;
> -
> - Â Â Â while ((line = get_next_line(&pos, file, size))) {
> - Â Â Â Â Â Â Â char *marker, *modname, *fmt;
> - Â Â Â Â Â Â Â struct module *mod;
> -
> - Â Â Â Â Â Â Â marker = line;
> - Â Â Â Â Â Â Â modname = strchr(marker, '\t');
> - Â Â Â Â Â Â Â if (!modname)
> - Â Â Â Â Â Â Â Â Â Â Â goto fail;
> - Â Â Â Â Â Â Â *modname++ = '\0';
> - Â Â Â Â Â Â Â fmt = strchr(modname, '\t');
> - Â Â Â Â Â Â Â if (!fmt)
> - Â Â Â Â Â Â Â Â Â Â Â goto fail;
> - Â Â Â Â Â Â Â *fmt++ = '\0';
> - Â Â Â Â Â Â Â if (*marker == '\0' || *modname == '\0')
> - Â Â Â Â Â Â Â Â Â Â Â goto fail;
> -
> - Â Â Â Â Â Â Â mod = find_module(modname);
> - Â Â Â Â Â Â Â if (!mod) {
> - Â Â Â Â Â Â Â Â Â Â Â mod = new_module(modname);
> - Â Â Â Â Â Â Â Â Â Â Â mod->skip = 1;
> - Â Â Â Â Â Â Â }
> - Â Â Â Â Â Â Â if (is_vmlinux(modname)) {
> - Â Â Â Â Â Â Â Â Â Â Â have_vmlinux = 1;
> - Â Â Â Â Â Â Â Â Â Â Â mod->skip = 0;
> - Â Â Â Â Â Â Â }
> -
> - Â Â Â Â Â Â Â if (!mod->skip)
> - Â Â Â Â Â Â Â Â Â Â Â add_marker(mod, marker, fmt);
> - Â Â Â }
> - Â Â Â release_file(file, size);
> - Â Â Â return;
> -fail:
> - Â Â Â fatal("parse error in markers list file\n");
> -}
> -
> -static int compare_strings(const void *a, const void *b)
> -{
> - Â Â Â return strcmp(*(const char **) a, *(const char **) b);
> -}
> -
> -static void write_markers(const char *fname)
> -{
> - Â Â Â struct buffer buf = { };
> - Â Â Â struct module *mod;
> - Â Â Â size_t i;
> -
> - Â Â Â for (mod = modules; mod; mod = mod->next)
> - Â Â Â Â Â Â Â if ((!external_module || !mod->skip) && mod->markers != NULL) {
> - Â Â Â Â Â Â Â Â Â Â Â /*
> - Â Â Â Â Â Â Â Â Â Â Â Â * Sort the strings so we can skip duplicates when
> - Â Â Â Â Â Â Â Â Â Â Â Â * we write them out.
> - Â Â Â Â Â Â Â Â Â Â Â Â */
> - Â Â Â Â Â Â Â Â Â Â Â qsort(mod->markers, mod->nmarkers,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â sizeof mod->markers[0], &compare_strings);
> - Â Â Â Â Â Â Â Â Â Â Â for (i = 0; i < mod->nmarkers; ++i) {
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â char *line = mod->markers[i];
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf_write(&buf, line, strlen(line));
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â while (i + 1 < mod->nmarkers &&
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â !strcmp(mod->markers[i],
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â mod->markers[i + 1]))
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â free(mod->markers[i++]);
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â free(mod->markers[i]);
> - Â Â Â Â Â Â Â Â Â Â Â }
> - Â Â Â Â Â Â Â Â Â Â Â free(mod->markers);
> - Â Â Â Â Â Â Â Â Â Â Â mod->markers = NULL;
> - Â Â Â Â Â Â Â }
> -
> - Â Â Â write_if_changed(&buf, fname);
> -}
> -
> Â struct ext_sym_list {
> Â Â Â Â struct ext_sym_list *next;
> Â Â Â Â const char *file;
> @@ -2077,8 +1927,6 @@ int main(int argc, char **argv)
> Â Â Â Â struct buffer buf = { };
> Â Â Â Â char *kernel_read = NULL, *module_read = NULL;
> Â Â Â Â char *dump_write = NULL;
> - Â Â Â char *markers_read = NULL;
> - Â Â Â char *markers_write = NULL;
> Â Â Â Â int opt;
> Â Â Â Â int err;
> Â Â Â Â struct ext_sym_list *extsym_iter;
> @@ -2122,12 +1970,6 @@ int main(int argc, char **argv)
> Â Â Â Â Â Â Â Â case 'w':
> Â Â Â Â Â Â Â Â Â Â Â Â warn_unresolved = 1;
> Â Â Â Â Â Â Â Â Â Â Â Â break;
> - Â Â Â Â Â Â Â Â Â Â Â case 'M':
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â markers_write = optarg;
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
> - Â Â Â Â Â Â Â Â Â Â Â case 'K':
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â markers_read = optarg;
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
> Â Â Â Â Â Â Â Â default:
> Â Â Â Â Â Â Â Â Â Â Â Â exit(1);
> Â Â Â Â Â Â Â Â }
> @@ -2182,11 +2024,5 @@ int main(int argc, char **argv)
> Â Â Â Â Â Â Â Â Â Â "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
> Â Â Â Â Â Â Â Â Â Â sec_mismatch_count);
>
> - Â Â Â if (markers_read)
> - Â Â Â Â Â Â Â read_markers(markers_read);
> -
> - Â Â Â if (markers_write)
> - Â Â Â Â Â Â Â write_markers(markers_write);
> -
> Â Â Â Â return err;
> Â }
> diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
> index 09f58e3..be987a4 100644
> --- a/scripts/mod/modpost.h
> +++ b/scripts/mod/modpost.h
> @@ -112,8 +112,6 @@ struct module {
> Â Â Â Â int has_init;
> Â Â Â Â int has_cleanup;
> Â Â Â Â struct buffer dev_table_buf;
> - Â Â Â char **markers;
> - Â Â Â size_t nmarkers;
>     char     srcversion[25];
> Â };
>
> @@ -128,7 +126,6 @@ struct elf_info {
>     Elf_Section  export_gpl_sec;
>     Elf_Section  export_unused_gpl_sec;
>     Elf_Section  export_gpl_future_sec;
> -    Elf_Section  markers_strings_sec;
>     const char  *strtab;
>     char     *modinfo;
> Â Â Â Â unsigned int modinfo_len;
> --
> 1.5.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þFîWÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kbuild: clean up marker
2009-11-16 5:49 [PATCH] Kbuild: clean up marker Wenji Huang
2009-11-16 5:49 ` [PATCH] Kbuild: clear marker out of modpost Wenji Huang
2009-11-16 6:26 ` [PATCH] Kbuild: clean up marker Américo Wang
@ 2009-11-18 21:20 ` Andrew Morton
2009-11-19 1:02 ` Wenji Huang
2 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2009-11-18 21:20 UTC (permalink / raw)
To: Wenji Huang; +Cc: linux-kernel, linux-kbuild
On Mon, 16 Nov 2009 13:49:54 +0800
Wenji Huang <wenji.huang@oracle.com> wrote:
> Drop Module.markers from cleaning list.
The changelog failed to explain the reason for this change. Please
always include that vital information in changelogs.
I, for one, don't have a clue why you made this change.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kbuild: clean up marker
2009-11-18 21:20 ` Andrew Morton
@ 2009-11-19 1:02 ` Wenji Huang
0 siblings, 0 replies; 6+ messages in thread
From: Wenji Huang @ 2009-11-19 1:02 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org
Hi,
> The changelog failed to explain the reason for this change. Please
> always include that vital information in changelogs.
>
> I, for one, don't have a clue why you made this change.
>
>
Thanks for your comment. Please see updated one
[PATCH v2] Kbuild: clean up marker
already cc'd to you and mailing list.
Regards,
Wenji
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-11-19 1:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-16 5:49 [PATCH] Kbuild: clean up marker Wenji Huang
2009-11-16 5:49 ` [PATCH] Kbuild: clear marker out of modpost Wenji Huang
2009-11-16 6:31 ` Américo Wang
2009-11-16 6:26 ` [PATCH] Kbuild: clean up marker Américo Wang
2009-11-18 21:20 ` Andrew Morton
2009-11-19 1:02 ` Wenji Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox