| Message ID | 1444291524-66569-1-git-send-email-borntraeger@de.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 08/10/2015 10:05, Christian Borntraeger wrote: > From: Andy Whitcroft <apw@canonical.com> > > 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 <apw@canonical.com> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Queued, thanks. Paolo > --- > 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; >
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;