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

Commit addd8c92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  script/checkpatch.pl: warn about deprecated use of EXTRA_{A,C,CPP,LD}FLAGS
  tags, powerpc: Update tags.sh to support _GLOBAL symbols
  scripts: add extract-vmlinux
parents a84f6aa6 c68e5878

scripts/checkpatch.pl

+14 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,20 @@ sub process { 
			#print "is_end<$is_end> length<$length>\n";

		}



		if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&

		    ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {

			my $flag = $1;

			my $replacement = {

				'EXTRA_AFLAGS' =>   'asflags-y',

				'EXTRA_CFLAGS' =>   'ccflags-y',

				'EXTRA_CPPFLAGS' => 'cppflags-y',

				'EXTRA_LDFLAGS' =>  'ldflags-y',

			};



			WARN("DEPRECATED_VARIABLE",

			     "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});

		}



# check we are in a valid source file if not then ignore this hunk

		next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);

scripts/extract-vmlinux

0 → 100755
+62 −0
Original line number Diff line number Diff line 
#!/bin/sh

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

# extract-vmlinux - Extract uncompressed vmlinux from a kernel image

#

# Inspired from extract-ikconfig

# (c) 2009,2010 Dick Streefland <dick@streefland.net>

#

# (c) 2011      Corentin Chary <corentin.chary@gmail.com>

#

# Licensed under the GNU General Public License, version 2 (GPLv2).

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



check_vmlinux()

{

	# Use readelf to check if it's a valid ELF

	# TODO: find a better to way to check that it's really vmlinux

	#       and not just an elf

	readelf -h $1 > /dev/null 2>&1 || return 1



	cat $1

	exit 0

}



try_decompress()

{

	# The obscure use of the "tr" filter is to work around older versions of

	# "grep" that report the byte offset of the line instead of the pattern.



	# Try to find the header ($1) and decompress from here

	for	pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`

	do

		pos=${pos%%:*}

		tail -c+$pos "$img" | $3 > $tmp 2> /dev/null

		check_vmlinux $tmp

	done

}



# Check invocation:

me=${0##*/}

img=$1

if	[ $# -ne 1 -o ! -s "$img" ]

then

	echo "Usage: $me <kernel-image>" >&2

	exit 2

fi



# Prepare temp files:

tmp=$(mktemp /tmp/vmlinux-XXX)

trap "rm -f $tmp" 0



# Initial attempt for uncompressed images or objects:

check_vmlinux $img



# That didn't work, so retry after decompression.

try_decompress '\037\213\010' xy    gunzip

try_decompress '\3757zXZ\000' abcde unxz

try_decompress 'BZh'          xy    bunzip2

try_decompress '\135\0\0\0'   xxx   unlzma

try_decompress '\211\114\132' xy    'lzop -d'



# Bail out:

echo "$me: Cannot find vmlinux." >&2

scripts/tags.sh

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ exuberant() 
	-I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \

	-I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \

	--extra=+f --c-kinds=+px                                \

	--regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \

	--regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/'        \

	--regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \

	--regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'		\

	--regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'
@@ -151,7 +151,7 @@ exuberant() 
emacs()

{

	all_sources | xargs $1 -a                               \

	--regex='/^ENTRY(\([^)]*\)).*/\1/'                      \

	--regex='/^(ENTRY|_GLOBAL)(\([^)]*\)).*/\2/'            \

	--regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \

	--regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'		\

	--regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/'