Commit 61f84a1e authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 9f996d2c 08549610
......@@ -107,6 +107,11 @@ export KBUILD_MODULES KBUILD_BUILTIN KBUILD_VERBOSE
# For now, leave verbose as default
ifdef V
ifeq ("$(origin V)", "command line")
KBUILD_VERBOSE = $(V)
endif
endif
ifndef KBUILD_VERBOSE
KBUILD_VERBOSE = 1
endif
......@@ -322,13 +327,14 @@ endef
# set -e makes the rule exit immediately on error
define rule_vmlinux__
set -e; \
set -e \
$(if $(filter .tmp_kallsyms%,$^),, \
echo ' GEN .version'; \
. $(srctree)/scripts/mkversion > .tmp_version; \
mv -f .tmp_version .version; \
$(MAKE) $(build)=init; \
)
set -e \
$(call cmd,vmlinux__); \
echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
endef
......
......@@ -17,7 +17,7 @@ extern int get_filesystem_list(char * buf);
int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */
int root_mountflags = MS_RDONLY | MS_VERBOSE;
static char * __initdata root_device_name;
char * __initdata root_device_name;
static char __initdata saved_root_name[64];
/* this is initialized in init/main.c */
......
......@@ -27,6 +27,7 @@ void change_floppy(char *fmt, ...);
void mount_block_root(char *name, int flags);
void mount_root(void);
extern int root_mountflags;
extern char *root_device_name;
#ifdef CONFIG_DEVFS_FS
......
......@@ -242,6 +242,7 @@ int __init rd_load_disk(int n)
{
if (rd_prompt)
change_floppy("root floppy disk to be loaded into RAM disk");
create_dev("/dev/root", ROOT_DEV, root_device_name);
create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, n), NULL);
return rd_load_image("/dev/root");
}
......
......@@ -163,12 +163,12 @@ endif
# Single-part modules are special since we need to mark them in $(MODVERDIR)
$(single-used-m): %.o: %.c FORCE
$(touch-module)
ifdef CONFIG_MODVERSIONS
$(call if_changed_rule,vcc_o_c)
else
$(call if_changed_dep,cc_o_c)
endif
$(touch-module)
quiet_cmd_cc_lst_c = MKLST $@
cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
......@@ -262,8 +262,8 @@ $(multi-used-y) : %.o: $(multi-objs-y) FORCE
$(call if_changed,link_multi-y)
$(multi-used-m) : %.o: $(multi-objs-m) FORCE
$(touch-module)
$(call if_changed,link_multi-m)
$(touch-module)
targets += $(multi-used-y) $(multi-used-m)
......
......@@ -37,7 +37,7 @@ targets += $(modules)
quiet_cmd_cc_o_c = CC $@
cmd_cc_o_c = $(CC) $(CFLAGS) $(CFLAGS_MODULE) -c -o $@ $<
$(modules:.ko=.mod.o): %.mod.o: %.mod.c
$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE
$(call if_changed,cc_o_c)
targets += $(modules:.ko=.mod.o)
......@@ -51,9 +51,9 @@ $(modules:.ko=.mod.c): __modpost ;
# Extract all checksums for all exported symbols
quiet_cmd_modpost = MODPOST
cmd_modpost = scripts/modpost $^
cmd_modpost = scripts/modpost $(filter-out FORCE,$^)
__modpost: $(wildcard vmlinux) $(modules:.ko=.o)
__modpost: $(wildcard vmlinux) $(modules:.ko=.o) FORCE
$(call if_changed,modpost)
targets += __modpost
......
......@@ -293,6 +293,9 @@ handle_modversions(struct module *mod, struct elf_info *info,
/* undefined symbol */
if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
break;
/* ignore global offset table */
if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
break;
if (memcmp(symname, MODULE_SYMBOL_PREFIX,
strlen(MODULE_SYMBOL_PREFIX)) == 0) {
......
......@@ -6,7 +6,7 @@
IN_PER_CPU=0
}
/__per_cpu$$/ && ! ( / __ksymtab_/ || / __kstrtab_/ || / __kcrctab_/ ) {
/__per_cpu$$/ && ! ( / __ksymtab_/ || / __kstrtab_/ || / __kcrctab_/ || / __crc_/ ) {
if (!IN_PER_CPU) {
print $$3 " not in per-cpu section" > "/dev/stderr";
FOUND=1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment