From patchwork Mon May 10 16:24:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Palix X-Patchwork-Id: 98206 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4AGQJMJ019543 for ; Mon, 10 May 2010 16:26:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754903Ab0EJQZ5 (ORCPT ); Mon, 10 May 2010 12:25:57 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:43841 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753446Ab0EJQYp (ORCPT ); Mon, 10 May 2010 12:24:45 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id 46BF819BBE2; Mon, 10 May 2010 18:24:44 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 01465-14; Mon, 10 May 2010 18:24:44 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id 1825F19BBD3; Mon, 10 May 2010 18:24:44 +0200 (CEST) Received: from localhost.localdomain (tyr.diku.dk [130.225.96.226]) by nhugin.diku.dk (Postfix) with ESMTP id 615366DFD0D; Mon, 10 May 2010 18:17:38 +0200 (CEST) From: Nicolas Palix To: Randy Dunlap , Roland Dreier , Joe Perches , Andrew Morton , "David S. Miller" , Michal Marek , Sam Ravnborg , Julia Lawall , Gilles Muller , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, cocci@diku.dk, Wolfram Sang Cc: Kernel Janitors , Nicolas Palix , Julia Lawall Subject: [PATCH 1/4] Add targets to use the Coccinelle checker Date: Mon, 10 May 2010 18:24:24 +0200 Message-Id: <1273508667-5152-2-git-send-email-npalix@diku.dk> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1273508667-5152-1-git-send-email-npalix@diku.dk> References: <1273508667-5152-1-git-send-email-npalix@diku.dk> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 10 May 2010 16:26:20 +0000 (UTC) diff --git a/MAINTAINERS b/MAINTAINERS index d5b0b1b..84f527a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1543,6 +1543,16 @@ L: platform-driver-x86@vger.kernel.org S: Supported F: drivers/platform/x86/classmate-laptop.c +COCCINELLE/Semantic Patches (SmPL) +M: Julia Lawall +M: Gilles Muller +M: Nicolas Palix +L: cocci@diku.dk (moderated for non-subscribers) +W: http://coccinelle.lip6.fr/ +S: Supported +F: scripts/coccinelle/ +F: scripts/coccinelle.sh + CODA FILE SYSTEM M: Jan Harkes M: coda@cs.cmu.edu diff --git a/Makefile b/Makefile index 701bc65..7bf168f 100644 --- a/Makefile +++ b/Makefile @@ -325,6 +325,7 @@ INSTALLKERNEL := installkernel DEPMOD = /sbin/depmod KALLSYMS = scripts/kallsyms PERL = perl +COCCINELLE = spatch CHECK = sparse CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ @@ -411,7 +412,8 @@ endif no-dot-config-targets := clean mrproper distclean \ cscope TAGS tags help %docs check% \ include/linux/version.h headers_% \ - kernelrelease kernelversion + kernelrelease kernelversion \ + coccicheck-% config-targets := 0 mixed-targets := 0 @@ -1264,7 +1266,8 @@ help: @echo ' includecheck - Check for duplicate included header files' @echo ' export_report - List the usages of all exported symbols' @echo ' headers_check - Sanity check on exported headers' - @echo ' headerdep - Detect inclusion cycles in headers'; \ + @echo ' headerdep - Detect inclusion cycles in headers' + @echo ' coccicheck- - Check with Coccinelle in mode (report, context, patch, org)'; \ echo '' @echo 'Kernel packaging:' @$(MAKE) $(build)=$(package-dir) help @@ -1424,6 +1427,19 @@ versioncheck: -name '*.[hcS]' -type f -print | sort \ | xargs $(PERL) -w $(srctree)/scripts/checkversion.pl +coccicheck-context coccicheck-patch coccicheck-org coccicheck-report: + @echo '' + @echo 'Please check for false positives in the output before submitting a patch.' + @echo 'When using "patch" mode, carefully review the patch before submitting it.' + @echo '' + @if [ "$(COCCI)" = "" ] ; then \ + find $(srctree)/scripts/coccinelle/ \ + -name '*.cocci' -type f \ + -exec $(srctree)/scripts/coccinelle.sh $(COCCINELLE) $(@:coccicheck-%=%) \{} $(srctree) \; ; \ + else \ + $(srctree)/scripts/coccinelle.sh $(COCCINELLE) $(@:coccicheck-%=%) $(COCCI) $(srctree) ; \ + fi + namespacecheck: $(PERL) $(srctree)/scripts/namespace.pl diff --git a/scripts/coccinelle.sh b/scripts/coccinelle.sh new file mode 100755 index 0000000..0d29e93 --- /dev/null +++ b/scripts/coccinelle.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +SPATCH="`which $1`" +MODE="$2" +COCCI="$3" +DIR="$4" + +OPT=`grep "Option" $COCCI | cut -d':' -f2` +FILE=`echo $COCCI | sed "s|$DIR/||"` + +if [ -x "$SPATCH" ]; then + + echo "Processing `basename $COCCI` with option(s) \"$(OPT)\"" + echo 'Message example to submit a patch:' + sed -e '/\/\/\//!d' -e 's|^///||' $COCCI + + echo ' The semantic patch that makes this change is available' + echo " in $FILE." + echo '' + echo ' More information about semantic patching is available at' + echo ' http://coccinelle.lip6.fr/' + echo '' + + $SPATCH -D $MODE -very_quiet -sp_file $COCCI $OPT -dir $DIR + +else + echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/' +fi