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

Commit 7840a94c authored by Wolfram Sang's avatar Wolfram Sang Committed by Linus Torvalds
Browse files

checkpatch: refactor 'allowed asm includes' and add memory.h 



Change the check suggesting replacement of asm-includes with
linux-includes.  Exceptions to this rule are easier to extend now.  Add
memory.h because ARM has a custom one.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1986aaf8

scripts/checkpatch.pl

+7 −1
Original line number Diff line number Diff line
@@ -224,6 +224,12 @@ our @modifierList = ( 
	qr{fastcall},

);



our $allowed_asm_includes = qr{(?x:

	irq|

	memory

)};

# memory.h: ARM has a custom one



sub build_types {

	my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";

	my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
@@ -2308,7 +2314,7 @@ sub process { 
			my $checkfile = "include/linux/$file";

			if (-f "$root/$checkfile" &&

			    $realfile ne $checkfile &&

			    $1 ne 'irq')

			    $1 !~ /$allowed_asm_includes/)

			{

				if ($realfile =~ m{^arch/}) {

					CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);