From patchwork Thu Oct 8 08:05:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 527628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:4830:134:3::10]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CA44F14012C for ; Thu, 8 Oct 2015 19:07:08 +1100 (AEDT) Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zk6DA-0005Zo-M9 for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2015 04:07:06 -0400 Received: from lists.gnu.org ([2001:4830:134:3::11]:52707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zk6D9-0005Xc-Tb for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2015 04:06:00 -0400 Received: from localhost ([::1]:32916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zk6D9-0001SV-P8 for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2015 04:05:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zk6CU-00014h-Ct for qemu-devel@nongnu.org; Thu, 08 Oct 2015 04:05:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zk6CO-00044N-K4 for qemu-devel@nongnu.org; Thu, 08 Oct 2015 04:05:18 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:35172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zk6CO-00042o-AM for qemu-devel@nongnu.org; Thu, 08 Oct 2015 04:05:12 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Oct 2015 09:05:10 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Oct 2015 09:05:08 +0100 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: borntraeger@de.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id DA2A617D8059 for ; Thu, 8 Oct 2015 09:05:10 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t98858oL35324098 for ; Thu, 8 Oct 2015 08:05:08 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t98856cH027911 for ; Thu, 8 Oct 2015 02:05:07 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t98855FQ027876 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 8 Oct 2015 02:05:05 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id 93BAD20F20D; Thu, 8 Oct 2015 10:05:05 +0200 (CEST) From: Christian Borntraeger To: qemu-devel Date: Thu, 8 Oct 2015 10:05:24 +0200 Message-Id: <1444291524-66569-1-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 2.4.3 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15100808-0041-0000-0000-000005DF1ED8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x Cc: Andy Whitcroft , Peter Maydell , Christian Borntraeger , Paolo Bonzini Subject: [Qemu-devel] [PATCH/] checkpatch: port fix from kernel "## is not a valid modifier" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 From: Andy Whitcroft checkpatch currently loops on fpu/softfloat.c Turns out this is fixed in the Linux version of checkpatch. So this is a port of Andy Whitcrofts fix from Linux, Original commit was commit 89a883530fe7 ("checkpatch: ## is not a valid modifier") As suggested by Peter Maydell for the QEMU version we drop the last "|" as there seems to be no need for that. (FWIW, the kernel discusion about that dried out: http://www.spinics.net/lists/kernel/msg1944421.html ) Cc: Andy Whitcroft Signed-off-by: Christian Borntraeger --- scripts/checkpatch.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b6d71ea..9755e82 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1010,7 +1010,9 @@ sub possible { case| else| asm|__asm__| - do + do| + \#| + \#\# )(?:\s|$)| ^(?:typedef|struct|enum)\b )}x;