Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a28a05f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: fix modpost warnings for xtensa
  kbuild: be more foregiving on init section naming
  kbuild: rearrange a few function in modpost
  kbuild: use LDFLAGS_MODULE only for .ko links
  kconfig: remove unused members from struct symbol
  kconfig: attach help text to menus
  kbuild: fix up printing of Linux C Library version in scripts/ver_linux
  kbuild: do not do section mismatch checks on vmlinux in 2nd pass
parents 4bf3b0bc cb7e51d8

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C 
MODFLAGS	= -DMODULE

CFLAGS_MODULE   = $(MODFLAGS)

AFLAGS_MODULE   = $(MODFLAGS)

LDFLAGS_MODULE  = -r

LDFLAGS_MODULE  =

CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

scripts/Makefile.build

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ quiet_cmd_link_multi-y = LD $@ 
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)



quiet_cmd_link_multi-m = LD [M]  $@

cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)

cmd_link_multi-m = $(cmd_link_multi-y)



# We would rather have a list of rules like

# 	foo.o: $(foo-objs)

scripts/Makefile.modpost

+11 −10
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) 


# Step 2), invoke modpost

#  Includes step 3,4

quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules

      cmd_modpost = scripts/mod/modpost            \

modpost = scripts/mod/modpost                    \

 $(if $(CONFIG_MODVERSIONS),-m)                  \

 $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)       \

 $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile)   \
@@ -65,14 +64,16 @@ quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules 
 $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \

 $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)



quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules

      cmd_modpost = $(modpost) -s



PHONY += __modpost

__modpost: $(modules:.ko=.o) FORCE

	$(call cmd,modpost) $(wildcard vmlinux) $(filter-out FORCE,$^)



quiet_cmd_kernel-mod = MODPOST $@

      cmd_kernel-mod = $(cmd_modpost) $@

      cmd_kernel-mod = $(modpost) $@



PHONY += vmlinux

vmlinux.o: FORCE

	$(call cmd,kernel-mod)
@@ -97,7 +98,7 @@ targets += $(modules:.ko=.mod.o) 


# Step 6), final link of the modules

quiet_cmd_ld_ko_o = LD [M]  $@

      cmd_ld_ko_o = $(LD) $(LDFLAGS) $(LDFLAGS_MODULE) -o $@		\

      cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@		\

			  $(filter-out FORCE,$^)



$(modules): %.ko :%.o %.mod.o FORCE

scripts/kconfig/conf.c

+15 −16
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ static struct menu *rootEntry; 


static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");



static const char *get_help(struct menu *menu)

{

	if (menu_has_help(menu))

		return menu_get_help(menu);

	else

		return nohelp_text;

}



static void strip(char *str)

{

	char *p = str;
@@ -171,7 +179,7 @@ static void conf_askvalue(struct symbol *sym, const char *def) 
int conf_string(struct menu *menu)

{

	struct symbol *sym = menu->sym;

	const char *def, *help;

	const char *def;



	while (1) {

		printf("%*s%s ", indent - 1, "", menu->prompt->text);
@@ -186,10 +194,7 @@ int conf_string(struct menu *menu) 
		case '?':

			/* print help */

			if (line[1] == '\n') {

				help = nohelp_text;

				if (menu->sym->help)

					help = menu->sym->help;

				printf("\n%s\n", menu->sym->help);

				printf("\n%s\n", get_help(menu));

				def = NULL;

				break;

			}
@@ -207,7 +212,6 @@ static int conf_sym(struct menu *menu) 
	struct symbol *sym = menu->sym;

	int type;

	tristate oldval, newval;

	const char *help;



	while (1) {

		printf("%*s%s ", indent - 1, "", menu->prompt->text);
@@ -233,7 +237,7 @@ static int conf_sym(struct menu *menu) 
			printf("/m");

		if (oldval != yes && sym_tristate_within_range(sym, yes))

			printf("/y");

		if (sym->help)

		if (menu_has_help(menu))

			printf("/?");

		printf("] ");

		conf_askvalue(sym, sym_get_string_value(sym));
@@ -269,10 +273,7 @@ static int conf_sym(struct menu *menu) 
		if (sym_set_tristate_value(sym, newval))

			return 0;

help:

		help = nohelp_text;

		if (sym->help)

			help = sym->help;

		printf("\n%s\n", help);

		printf("\n%s\n", get_help(menu));

	}

}
@@ -342,7 +343,7 @@ static int conf_choice(struct menu *menu) 
			goto conf_childs;

		}

		printf("[1-%d", cnt);

		if (sym->help)

		if (menu_has_help(menu))

			printf("?");

		printf("]: ");

		switch (input_mode) {
@@ -359,8 +360,7 @@ static int conf_choice(struct menu *menu) 
			fgets(line, 128, stdin);

			strip(line);

			if (line[0] == '?') {

				printf("\n%s\n", menu->sym->help ?

					menu->sym->help : nohelp_text);

				printf("\n%s\n", get_help(menu));

				continue;

			}

			if (!line[0])
@@ -391,8 +391,7 @@ static int conf_choice(struct menu *menu) 
		if (!child)

			continue;

		if (line[strlen(line) - 1] == '?') {

			printf("\n%s\n", child->sym->help ?

				child->sym->help : nohelp_text);

			printf("\n%s\n", get_help(child));

			continue;

		}

		sym_set_choice_value(sym, child->sym);

scripts/kconfig/expr.h

+1 −3
Original line number Diff line number Diff line
@@ -71,14 +71,12 @@ enum { 
struct symbol {

	struct symbol *next;

	char *name;

	char *help;

	enum symbol_type type;

	struct symbol_value curr;

	struct symbol_value def[4];

	tristate visible;

	int flags;

	struct property *prop;

	struct expr *dep, *dep2;

	struct expr_value rev_dep;

};
@@ -139,7 +137,7 @@ struct menu { 
	struct property *prompt;

	struct expr *dep;

	unsigned int flags;

	//char *help;

	char *help;

	struct file *file;

	int lineno;

	void *data;