Skip to content

Commit

Permalink
modpost: reduce visibility of symbols and constify r/o arrays
Browse files Browse the repository at this point in the history
Internally used symbols of modpost don't need to be externally visible;
make them static. Also constify the string arrays so they resist in the
r/o section instead of being runtime writable.

Those changes lead to a small size reduction as can be seen below:

   text    data     bss     dec     hex filename
  51381    2640   12416   66437   10385 scripts/mod/modpost.old
  51765    2224   12416   66405   10365 scripts/mod/modpost.new

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Mathias Krause authored and Rusty Russell committed Aug 27, 2014
1 parent 7a486d3 commit 7a3ee75
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include "../../include/linux/export.h"

/* Are we using CONFIG_MODVERSIONS? */
int modversions = 0;
static int modversions = 0;
/* Warn about undefined symbols? (do so if we have vmlinux) */
int have_vmlinux = 0;
static int have_vmlinux = 0;
/* Is CONFIG_MODULE_SRCVERSION_ALL set? */
static int all_versions = 0;
/* If we are modposting external module set to 1 */
Expand Down Expand Up @@ -229,7 +229,7 @@ static struct symbol *find_symbol(const char *name)
return NULL;
}

static struct {
static const struct {
const char *str;
enum export export;
} export_list[] = {
Expand Down Expand Up @@ -805,7 +805,7 @@ static int match(const char *sym, const char * const pat[])
}

/* sections that we do not want to do full section mismatch check on */
static const char *section_white_list[] =
static const char *const section_white_list[] =
{
".comment*",
".debug*",
Expand Down Expand Up @@ -882,17 +882,18 @@ static void check_section(const char *modname, struct elf_info *elf,
#define MEM_EXIT_SECTIONS ".memexit.*"

/* init data sections */
static const char *init_data_sections[] = { ALL_INIT_DATA_SECTIONS, NULL };
static const char *const init_data_sections[] =
{ ALL_INIT_DATA_SECTIONS, NULL };

/* all init sections */
static const char *init_sections[] = { ALL_INIT_SECTIONS, NULL };
static const char *const init_sections[] = { ALL_INIT_SECTIONS, NULL };

/* All init and exit sections (code + data) */
static const char *init_exit_sections[] =
static const char *const init_exit_sections[] =
{ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL };

/* data section */
static const char *data_sections[] = { DATA_SECTIONS, NULL };
static const char *const data_sections[] = { DATA_SECTIONS, NULL };


/* symbols in .data that may refer to init/exit sections */
Expand All @@ -906,8 +907,8 @@ static const char *data_sections[] = { DATA_SECTIONS, NULL };
"*_probe_one", \
"*_console"

static const char *head_sections[] = { ".head.text*", NULL };
static const char *linker_symbols[] =
static const char *const head_sections[] = { ".head.text*", NULL };
static const char *const linker_symbols[] =
{ "__init_begin", "_sinittext", "_einittext", NULL };

enum mismatch {
Expand All @@ -929,7 +930,7 @@ struct sectioncheck {
const char *symbol_white_list[20];
};

const struct sectioncheck sectioncheck[] = {
static const struct sectioncheck sectioncheck[] = {
/* Do not reference init/exit code/data from
* normal code and data
*/
Expand Down

0 comments on commit 7a3ee75

Please sign in to comment.