Hi Masahiro, After merging the kbuild tree, today's linux-next build (arm multi_v7_defconfig) failed like this: In file included from include/linux/module.h:18, from drivers/clocksource/timer-ti-dm.c:40: drivers/clocksource/timer-ti-dm.c:973:26: error: expected ',' or ';' before 'DRIVER_NAME' MODULE_ALIAS("platform:" DRIVER_NAME); ^~~~~~~~~~~ include/linux/moduleparam.h:26:47: note: in definition of macro '__MODULE_INFO' = __MODULE_INFO_PREFIX __stringify(tag) "=" info ^~~~ include/linux/module.h:164:30: note: in expansion of macro 'MODULE_INFO' #define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias) ^~~~~~~~~~~ drivers/clocksource/timer-ti-dm.c:973:1: note: in expansion of macro 'MODULE_ALIAS' MODULE_ALIAS("platform:" DRIVER_NAME); ^~~~~~~~~~~~ Caused by commit 6a26793a7891 ("moduleparam: Save information about built-in modules in separate file") DRIVER_NAME is not defined and this kbuild tree change has exposed it. It has been this way since commit df28472a1b28 ("ARM: OMAP: dmtimer: platform driver") From v3.2-rc1 in 2011. I have applied the following patch for today. From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Mon, 6 May 2019 09:26:24 +1000 Subject: [PATCH] arm: omap: remove unused MODULE_ALIAS from timer-ti-dm.c DRIVER_NAME has never been defined, so this cannot have ever been used. Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- drivers/clocksource/timer-ti-dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index ee8ec5a8cb16..b357bd56ba63 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -970,5 +970,5 @@ module_platform_driver(omap_dm_timer_driver); MODULE_DESCRIPTION("OMAP Dual-Mode Timer Driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRIVER_NAME); +// MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_AUTHOR("Texas Instruments Inc"); -- 2.20.1 -- Cheers, Stephen Rothwell
Attachment:
pgplhhZGQVq3b.pgp
Description: OpenPGP digital signature