Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24924/scripts
Modified Files:
Makefile.build checkstack.pl
Log Message:
Merge with 2.6.10
Index: Makefile.build
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/Makefile.build,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.build 17 Nov 2004 00:25:37 -0000 1.21
+++ Makefile.build 21 Mar 2005 23:44:18 -0000 1.22
@@ -10,7 +10,7 @@
# Read .config if it exist, otherwise ignore
-include .config
-include $(obj)/Makefile
+include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile)
include scripts/Makefile.lib
@@ -83,6 +83,7 @@
# Linus' kernel sanity checking tool
ifneq ($(KBUILD_CHECKSRC),0)
+ CHECKFLAGS += -I$(shell $(CC) -print-file-name=include)
ifeq ($(KBUILD_CHECKSRC),2)
quiet_cmd_force_checksrc = CHECK $<
cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
Index: checkstack.pl
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/checkstack.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- checkstack.pl 8 Mar 2005 09:01:55 -0000 1.2
+++ checkstack.pl 21 Mar 2005 23:44:19 -0000 1.3
@@ -40,6 +40,9 @@
} elsif ($arch =~ /^i[3456]86$/) {
#c0105234: 81 ec ac 05 00 00 sub $0x5ac,%esp
$re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%esp$/o;
+ } elsif ($arch eq 'x86_64') {
+ # 2f60: 48 81 ec e8 05 00 00 sub $0x5e8,%rsp
+ $re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%rsp$/o;
} elsif ($arch eq 'ia64') {
#e0000000044011fc: 01 0f fc 8c adds r12=-384,r12
$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;
|
