Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (51b550a4) · Commits · 戴 / test

Makefile

+6 −3

Original line number	Diff line number	Diff line
		@@ -1009,7 +1009,8 @@ include/generated/utsrelease.h: include/config/kernel.release FORCE

		PHONY += headerdep
		headerdep:
		$(Q)find include/ -name '*.h' \| xargs --max-args 1 scripts/headerdep.pl
		$(Q)find $(srctree)/include/ -name '*.h' \| xargs --max-args 1 \
		$(srctree)/scripts/headerdep.pl -I$(srctree)/include

		# ---------------------------------------------------------------------------

		@@ -1417,13 +1418,15 @@ tags TAGS cscope gtags: FORCE
		# Scripts to check various things for consistency
		# ---------------------------------------------------------------------------

		PHONY += includecheck versioncheck coccicheck namespacecheck export_report

		includecheck:
		find * $(RCS_FIND_IGNORE) \
		find $(srctree)/* $(RCS_FIND_IGNORE) \
		-name '*.[hcS]' -type f -print \| sort \
		\| xargs $(PERL) -w $(srctree)/scripts/checkincludes.pl

		versioncheck:
		find * $(RCS_FIND_IGNORE) \
		find $(srctree)/* $(RCS_FIND_IGNORE) \
		-name '*.[hcS]' -type f -print \| sort \
		\| xargs $(PERL) -w $(srctree)/scripts/checkversion.pl

scripts/checkversion.pl

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ $\| = 1;
		my $debugging;

		foreach my $file (@ARGV) {
		next if $file =~ "include/linux/version\.h";
		# Open this file.
		open( my $f, '<', $file )
		or die "Can't open $file: $!\n";

scripts/export_report.pl

+20 −6

Original line number	Diff line number	Diff line
		@@ -25,11 +25,12 @@ sub alphabetically {
		sub print_depends_on {
		my ($href) = @_;
		print "\n";
		while (my ($mod, $list) = each %$href) {
		for my $mod (sort keys %$href) {
		my $list = $href->{$mod};
		print "\t$mod:\n";
		foreach my $sym (sort numerically @{$list}) {
		my ($symbol, $no) = split /\s+/, $sym;
		printf("\t\t%-25s\t%-25d\n", $symbol, $no);
		printf("\t\t%-25s\n", $symbol);
		}
		print "\n";
		}
		@@ -49,8 +50,14 @@ sub usage {
		}

		sub collectcfiles {
		my @file
		= `cat .tmp_versions/.mod \| grep '.\.ko\$' \| sed s/\.ko$/.mod.c/`;
		my @file;
		while (<.tmp_versions/*.mod>) {
		open my $fh, '<', $_ or die "cannot open $_: $!\n";
		push (@file,
		grep s/\.ko/.mod.c/, # change the suffix
		grep m/.+\.ko/, # find the .ko path
		<$fh>); # lines in opened file
		}
		chomp @file;
		return @file;
		}
		@@ -95,6 +102,8 @@ close($module_symvers);
		#
		# collect the usage count of each symbol.
		#
		my $modversion_warnings = 0;

		foreach my $thismod (@allcfiles) {
		my $module;

		@@ -125,7 +134,8 @@ foreach my $thismod (@allcfiles) {
		}
		}
		if ($state != 2) {
		print "WARNING:$thismod is not built with CONFIG_MODVERSION enabled\n";
		warn "WARNING:$thismod is not built with CONFIG_MODVERSIONS enabled\n";
		$modversion_warnings++;
		}
		close($module);
		}
		@@ -159,8 +169,12 @@ printf("SECTION 2:\n\tThis section reports export-symbol-usage of in-kernel
		modules. Each module lists the modules, and the symbols from that module that
		it uses. Each listed symbol reports the number of modules using it\n");

		print "\nNOTE: Got $modversion_warnings CONFIG_MODVERSIONS warnings\n\n"
		if $modversion_warnings;

		print "~"x80 , "\n";
		while (my ($thismod, $list) = each %MODULE) {
		for my $thismod (sort keys %MODULE) {
		my $list = $MODULE{$thismod};
		my %depends;
		$thismod =~ s/\.mod\.c/.ko/;
		print "\t\t\t$thismod\n";

scripts/patch-kernel

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s)
		do
		CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
		EXTRAVER=
		if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
		if [ x$STOPFULLVERSION = x$CURRENTFULLVERSION ]; then
		echo "Stopping at $CURRENTFULLVERSION base as requested."
		break
		fi

Admin message