xavi/android_kernel_m2note/arch/m68k/include/asm/delay.h, branch ng-7.1.2Unnamed repository; edit this file 'description' to name the repository.
https://gitea.privatedns.org/xavi/android_kernel_m2note/atom?h=ng-7.1.22017-06-17T13:47:09+00:00m68k: Fix ndelay() macro2017-06-17T13:47:09+00:00Boris Brezillonboris.brezillon@free-electrons.com2016-10-28T15:12:28+00:00urn:sha1:bc4149701825cdd6a98ef86acb0d02fdabb74552
commit 7e251bb21ae08ca2e4fb28cc0981fac2685a8efa upstream.
The current ndelay() macro definition has an extra semi-colon at the
end of the line thus leading to a compilation error when ndelay is used
in a conditional block without curly braces like this one:
if (cond)
ndelay(t);
else
...
which, after the preprocessor pass gives:
if (cond)
m68k_ndelay(t);;
else
...
thus leading to the following gcc error:
error: 'else' without a previous 'if'
Remove this extra semi-colon.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: c8ee038bd1488 ("m68k: Implement ndelay() based on the existing udelay() logic")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
first commit2016-08-15T02:19:42+00:00Meizu OpenSourcepatchwork@meizu.com2016-08-15T02:19:42+00:00urn:sha1:d2e1446d81725c351dc73a03b397ce043fb18452