Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv24069
Modified Files:
Makefile
Log Message:
Merge with 2.5.49
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Makefile 19 Jun 2003 23:31:46 -0000 1.56
+++ Makefile 22 Jun 2003 16:18:53 -0000 1.57
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 48
+SUBLEVEL = 49
EXTRAVERSION =
# *DOCUMENTATION*
@@ -157,7 +157,7 @@
OBJDUMP = $(CROSS_COMPILE)objdump
AWK = awk
GENKSYMS = /sbin/genksyms
-KALLSYMS = /sbin/kallsyms
+KALLSYMS = scripts/kallsyms
PERL = perl
MODFLAGS = -DMODULE
CFLAGS_MODULE = $(MODFLAGS)
@@ -299,6 +299,8 @@
endef
# set -e makes the rule exit immediately on error
+# Final awk script makes sure per-cpu vars are in per-cpu section, as
+# old gcc (eg egcs 2.92.11) ignores section attribute if uninitialized.
define rule_vmlinux__
set -e
@@ -312,11 +314,22 @@
echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
endef
-define rule_vmlinux
+define rule_vmlinux_no_percpu
$(rule_vmlinux__)
$(NM) $@ | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
endef
+ifdef CONFIG_SMP
+define rule_vmlinux
+ $(rule_vmlinux_no_percpu)
+ $(AWK) -f scripts/per-cpu-check.awk < System.map
+endef
+else
+define rule_vmlinux
+ $(rule_vmlinux_no_percpu)
+endef
+endif
+
LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s
# Generate section listing all symbols and add it into vmlinux
@@ -335,7 +348,7 @@
kallsyms.o := .tmp_kallsyms2.o
quiet_cmd_kallsyms = KSYM $@
-cmd_kallsyms = $(KALLSYMS) $< > $@
+cmd_kallsyms = sh $(KALLSYMS) $< $@
.tmp_kallsyms1.o: .tmp_vmlinux1
$(call cmd,kallsyms)
|
