From patchwork Tue Sep 3 15:06:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 11128181 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 253CD14F7 for ; Tue, 3 Sep 2019 15:08:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3B332168B for ; Tue, 3 Sep 2019 15:08:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dUY3N9dI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729953AbfICPIB (ORCPT ); Tue, 3 Sep 2019 11:08:01 -0400 Received: from mail-yw1-f74.google.com ([209.85.161.74]:43253 "EHLO mail-yw1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729944AbfICPIA (ORCPT ); Tue, 3 Sep 2019 11:08:00 -0400 Received: by mail-yw1-f74.google.com with SMTP id a12so13553352ywm.10 for ; Tue, 03 Sep 2019 08:07:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=uiVNUyTgfDxnaV9scOzT4vW0KvshsQB635VtUxZQBM0=; b=dUY3N9dINS8P9nAXq9sYzaRpdrofHAbTSiuyGDpgFTyPgUaXpTpPrAcxu7cJf4WDhI 57eSTg+g6cbT9paImYywxXHeMtivP09GcRsdwzrT0KDk0tiyUfTtXCso9k3PipLzDzCE RHGY0I0FdOkD+lQmIuEQKGVyeJtgw32ICnqCFWaB+OyMdKxNeTzonO6aneGEErSf8EJc llR4PWpMiFg9Yn9DBDHmD38zqRzDv4M6IBVI6CnUwtt7YxGAemtAEmwBKnVdAgyw8dhO CD4Pa8nKSu9gnZo9CJbWTQ5cewRqHBtWklDDk9P63FAVy0bOpAK1BnHlCvaoZ3UzMuiK zN+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=uiVNUyTgfDxnaV9scOzT4vW0KvshsQB635VtUxZQBM0=; b=o3igE0z4fL2rAxGzLA4FXpyZbNy9dqJaiKfwoRZpSlFbBYnIpCHrBXrIFv1LqL3hMN luz5fL0Lr+jAKWPTzNDN5tVeRb5clhi6+H3Q9Dc4iJ7ywFc7eF5Nl/wHA3ZqRY4WGi+7 2KSx+61aZ9Pes52OISv8KTAglnrJAwfufMgpOqVKzjaXVU9FSXnDmu3zfmWEHe03ciH9 SzYTxcHockXRkNqmQ2DbxS/ZSX1QmMAZ+mi33Da2F+Zp4fD4NTBr0gA5qfp1/peCxqTD 98jMIsVS5y7WxdxuH5O1axG9mX1I5dxsJcydY8Gte1OHdWVMK8D5EvKlNrN2hdAX28uK +Ujw== X-Gm-Message-State: APjAAAWI5Fbfhw31etmBw0EoUqUT0/3vSvBxVVpwkNo+iG9cEToda++v yCE0Xx+iOXwYotPTitGNEQlI1znwrb9C6A== X-Google-Smtp-Source: APXvYqzvlO+tcuWOV9t9xdhpM2jnxlF1TDGX1QPt38w61xOPhCRE8T+4fcQrVBOpotKc7Vn7bDuQsM0WfLR+Yg== X-Received: by 2002:a81:a401:: with SMTP id b1mr8357693ywh.280.1567523278933; Tue, 03 Sep 2019 08:07:58 -0700 (PDT) Date: Tue, 3 Sep 2019 16:06:38 +0100 In-Reply-To: <20190903150638.242049-1-maennich@google.com> Message-Id: <20190903150638.242049-13-maennich@google.com> Mime-Version: 1.0 References: <20180716122125.175792-1-maco@android.com> <20190903150638.242049-1-maennich@google.com> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH v4 12/12] RFC: watchdog: export core symbols in WATCHDOG_CORE namespace From: Matthias Maennich To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, arnd@arndb.de, gregkh@linuxfoundation.org, jeyu@kernel.org, joel@joelfernandes.org, lucas.de.marchi@gmail.com, maco@android.com, sspatil@google.com, will@kernel.org, yamada.masahiro@socionext.com, linux-kbuild@vger.kernel.org, linux-modules@vger.kernel.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-watchdog@vger.kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Modules using symbols from the WATCHDOG_CORE namespace are required to explicitly import the namespace. This patch was generated with the following steps and serves as a reference to use the symbol namespace feature: 1) Use EXPORT_SYMBOL_NS* macros instead of EXPORT_SYMBOL* for symbols in watchdog_core.c 2) make (see warnings during modpost about missing imports) 3) make nsdeps I used 'allmodconfig' for the above steps to ensure all occurrences are patched. Defining DEFAULT_SYMBOL_NAMESPACE in the Makefile is not trivial in this case as not only watchdog_core is defined in drivers/watchdog/Makefile. Hence this patch uses the variant of using the EXPORT_SYMBOL_NS* macros to export into a different namespace. An alternative to this patch would be a single definition line before any use of EXPORT_SYMBOL*: #define DEFAULT_SYMBOL_NAMESPACE WATCHDOG_CORE This patch serves as a reference on how to use the symbol namespaces. Reviewed-by: Greg Kroah-Hartman Signed-off-by: Matthias Maennich --- drivers/hwmon/ftsteutates.c | 1 + drivers/hwmon/sch56xx-common.c | 1 + drivers/rtc/rtc-abx80x.c | 1 + drivers/watchdog/armada_37xx_wdt.c | 1 + drivers/watchdog/asm9260_wdt.c | 1 + drivers/watchdog/aspeed_wdt.c | 1 + drivers/watchdog/at91sam9_wdt.c | 1 + drivers/watchdog/atlas7_wdt.c | 1 + drivers/watchdog/bcm2835_wdt.c | 1 + drivers/watchdog/bcm47xx_wdt.c | 1 + drivers/watchdog/bcm7038_wdt.c | 1 + drivers/watchdog/bcm_kona_wdt.c | 1 + drivers/watchdog/bd70528_wdt.c | 1 + drivers/watchdog/cadence_wdt.c | 1 + drivers/watchdog/da9052_wdt.c | 1 + drivers/watchdog/da9055_wdt.c | 1 + drivers/watchdog/da9062_wdt.c | 1 + drivers/watchdog/da9063_wdt.c | 1 + drivers/watchdog/davinci_wdt.c | 1 + drivers/watchdog/digicolor_wdt.c | 1 + drivers/watchdog/dw_wdt.c | 1 + drivers/watchdog/ebc-c384_wdt.c | 1 + drivers/watchdog/ep93xx_wdt.c | 1 + drivers/watchdog/ftwdt010_wdt.c | 1 + drivers/watchdog/gpio_wdt.c | 1 + drivers/watchdog/hpwdt.c | 1 + drivers/watchdog/i6300esb.c | 1 + drivers/watchdog/iTCO_wdt.c | 1 + drivers/watchdog/ie6xx_wdt.c | 1 + drivers/watchdog/imgpdc_wdt.c | 1 + drivers/watchdog/imx2_wdt.c | 1 + drivers/watchdog/intel-mid_wdt.c | 1 + drivers/watchdog/it87_wdt.c | 1 + drivers/watchdog/kempld_wdt.c | 1 + drivers/watchdog/lpc18xx_wdt.c | 1 + drivers/watchdog/max63xx_wdt.c | 1 + drivers/watchdog/max77620_wdt.c | 1 + drivers/watchdog/mei_wdt.c | 1 + drivers/watchdog/mena21_wdt.c | 1 + drivers/watchdog/menf21bmc_wdt.c | 1 + drivers/watchdog/menz69_wdt.c | 1 + drivers/watchdog/meson_gxbb_wdt.c | 1 + drivers/watchdog/meson_wdt.c | 1 + drivers/watchdog/mlx_wdt.c | 1 + drivers/watchdog/moxart_wdt.c | 1 + drivers/watchdog/mtk_wdt.c | 1 + drivers/watchdog/ni903x_wdt.c | 1 + drivers/watchdog/nic7018_wdt.c | 1 + drivers/watchdog/npcm_wdt.c | 1 + drivers/watchdog/of_xilinx_wdt.c | 1 + drivers/watchdog/omap_wdt.c | 1 + drivers/watchdog/pm8916_wdt.c | 1 + drivers/watchdog/qcom-wdt.c | 1 + drivers/watchdog/rave-sp-wdt.c | 1 + drivers/watchdog/renesas_wdt.c | 1 + drivers/watchdog/retu_wdt.c | 1 + drivers/watchdog/rn5t618_wdt.c | 1 + drivers/watchdog/rza_wdt.c | 1 + drivers/watchdog/s3c2410_wdt.c | 1 + drivers/watchdog/sama5d4_wdt.c | 1 + drivers/watchdog/sirfsoc_wdt.c | 1 + drivers/watchdog/softdog.c | 1 + drivers/watchdog/sp5100_tco.c | 1 + drivers/watchdog/sprd_wdt.c | 1 + drivers/watchdog/st_lpc_wdt.c | 1 + drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 + drivers/watchdog/stpmic1_wdt.c | 1 + drivers/watchdog/sunxi_wdt.c | 1 + drivers/watchdog/tangox_wdt.c | 1 + drivers/watchdog/tegra_wdt.c | 1 + drivers/watchdog/tqmx86_wdt.c | 1 + drivers/watchdog/ts4800_wdt.c | 1 + drivers/watchdog/ts72xx_wdt.c | 1 + drivers/watchdog/twl4030_wdt.c | 1 + drivers/watchdog/uniphier_wdt.c | 1 + drivers/watchdog/via_wdt.c | 1 + drivers/watchdog/w83627hf_wdt.c | 1 + drivers/watchdog/watchdog_core.c | 10 +++++----- drivers/watchdog/wdat_wdt.c | 1 + drivers/watchdog/wm831x_wdt.c | 1 + drivers/watchdog/wm8350_wdt.c | 1 + drivers/watchdog/xen_wdt.c | 1 + drivers/watchdog/ziirave_wdt.c | 1 + 83 files changed, 87 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/ftsteutates.c b/drivers/hwmon/ftsteutates.c index 371ce7745f5e..fa67f7c565be 100644 --- a/drivers/hwmon/ftsteutates.c +++ b/drivers/hwmon/ftsteutates.c @@ -830,3 +830,4 @@ module_i2c_driver(fts_driver); MODULE_AUTHOR("Thilo Cestonaro "); MODULE_DESCRIPTION("FTS Teutates driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index 6c84780e358e..06dd840f3bf7 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/drivers/hwmon/sch56xx-common.c @@ -571,6 +571,7 @@ static void __exit sch56xx_exit(void) MODULE_DESCRIPTION("SMSC SCH56xx Hardware Monitoring Common Code"); MODULE_AUTHOR("Hans de Goede "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); module_init(sch56xx_init); module_exit(sch56xx_exit); diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c index 73830670a41f..3ff3b96d14d7 100644 --- a/drivers/rtc/rtc-abx80x.c +++ b/drivers/rtc/rtc-abx80x.c @@ -880,3 +880,4 @@ MODULE_AUTHOR("Philippe De Muyter "); MODULE_AUTHOR("Alexandre Belloni "); MODULE_DESCRIPTION("Abracon ABX80X RTC driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c index e5dcb26d85f0..00e153ae70eb 100644 --- a/drivers/watchdog/armada_37xx_wdt.c +++ b/drivers/watchdog/armada_37xx_wdt.c @@ -370,4 +370,5 @@ MODULE_AUTHOR("Marek Behun "); MODULE_DESCRIPTION("Armada 37xx CPU Watchdog"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:armada_37xx_wdt"); diff --git a/drivers/watchdog/asm9260_wdt.c b/drivers/watchdog/asm9260_wdt.c index 45047e514b8e..fd7289df2cb3 100644 --- a/drivers/watchdog/asm9260_wdt.c +++ b/drivers/watchdog/asm9260_wdt.c @@ -374,3 +374,4 @@ module_platform_driver(asm9260_wdt_driver); MODULE_DESCRIPTION("asm9260 WatchDog Timer Driver"); MODULE_AUTHOR("Oleksij Rempel "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index cc71861e033a..2607158965d6 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -334,3 +334,4 @@ module_exit(aspeed_wdt_exit); MODULE_DESCRIPTION("Aspeed Watchdog Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 292b5a1ca831..e7aa31fe4336 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -416,3 +416,4 @@ module_platform_driver_probe(at91wdt_driver, at91wdt_probe); MODULE_AUTHOR("Renaud CERRATO "); MODULE_DESCRIPTION("Watchdog driver for Atmel AT91SAM9x processors"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/atlas7_wdt.c b/drivers/watchdog/atlas7_wdt.c index 9bfe650d802f..f67e6f101102 100644 --- a/drivers/watchdog/atlas7_wdt.c +++ b/drivers/watchdog/atlas7_wdt.c @@ -218,4 +218,5 @@ module_platform_driver(atlas7_wdt_driver); MODULE_DESCRIPTION("CSRatlas7 watchdog driver"); MODULE_AUTHOR("Guo Zeng "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:atlas7-wdt"); diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index dec6ca019bea..2f41b8a6e2f6 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -242,3 +242,4 @@ MODULE_ALIAS("platform:bcm2835-wdt"); MODULE_AUTHOR("Lubomir Rintel "); MODULE_DESCRIPTION("Driver for Broadcom BCM2835 watchdog timer"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index 05425c1dfd4c..231009f01024 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c @@ -241,3 +241,4 @@ MODULE_AUTHOR("Aleksandar Radovanovic"); MODULE_AUTHOR("Hauke Mehrtens "); MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 979caa18d3c8..e66184997775 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -212,5 +212,6 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_DESCRIPTION("Driver for Broadcom 7038 SoCs Watchdog"); MODULE_AUTHOR("Justin Chen"); diff --git a/drivers/watchdog/bcm_kona_wdt.c b/drivers/watchdog/bcm_kona_wdt.c index eb850a8d19df..5b5a6a76c1aa 100644 --- a/drivers/watchdog/bcm_kona_wdt.c +++ b/drivers/watchdog/bcm_kona_wdt.c @@ -339,3 +339,4 @@ MODULE_ALIAS("platform:" BCM_KONA_WDT_NAME); MODULE_AUTHOR("Markus Mayer "); MODULE_DESCRIPTION("Broadcom Kona Watchdog Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/bd70528_wdt.c b/drivers/watchdog/bd70528_wdt.c index b0152fef4fc7..790748a3a30a 100644 --- a/drivers/watchdog/bd70528_wdt.c +++ b/drivers/watchdog/bd70528_wdt.c @@ -288,3 +288,4 @@ module_platform_driver(bd70528_wdt); MODULE_AUTHOR("Matti Vaittinen "); MODULE_DESCRIPTION("BD70528 watchdog driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index f8d4e91d0383..a44f3140656e 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -438,3 +438,4 @@ module_platform_driver(cdns_wdt_driver); MODULE_AUTHOR("Xilinx, Inc."); MODULE_DESCRIPTION("Watchdog driver for Cadence WDT"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index d708c091bf1b..a5ceea0503bb 100644 --- a/drivers/watchdog/da9052_wdt.c +++ b/drivers/watchdog/da9052_wdt.c @@ -191,4 +191,5 @@ module_platform_driver(da9052_wdt_driver); MODULE_AUTHOR("Anthony Olech "); MODULE_DESCRIPTION("DA9052 SM Device Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:da9052-watchdog"); diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c index 389a4bdd208c..05b075f2ea90 100644 --- a/drivers/watchdog/da9055_wdt.c +++ b/drivers/watchdog/da9055_wdt.c @@ -166,4 +166,5 @@ module_platform_driver(da9055_wdt_driver); MODULE_AUTHOR("David Dajun Chen "); MODULE_DESCRIPTION("DA9055 watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:da9055-watchdog"); diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c index e149e66a6ea9..dfc2025d36ba 100644 --- a/drivers/watchdog/da9062_wdt.c +++ b/drivers/watchdog/da9062_wdt.c @@ -232,4 +232,5 @@ module_platform_driver(da9062_wdt_driver); MODULE_AUTHOR("S Twiss "); MODULE_DESCRIPTION("WDT device driver for Dialog DA9062 and DA9061"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:da9062-watchdog"); diff --git a/drivers/watchdog/da9063_wdt.c b/drivers/watchdog/da9063_wdt.c index 3d65e92a4e3f..ae0cb7011762 100644 --- a/drivers/watchdog/da9063_wdt.c +++ b/drivers/watchdog/da9063_wdt.c @@ -239,4 +239,5 @@ module_platform_driver(da9063_wdt_driver); MODULE_AUTHOR("Mariusz Wojtasik "); MODULE_DESCRIPTION("Watchdog driver for Dialog DA9063"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:" DA9063_DRVNAME_WATCHDOG); diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 2b3f3cd382ef..4fa01dfa4edb 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -274,4 +274,5 @@ MODULE_PARM_DESC(heartbeat, __MODULE_STRING(DEFAULT_HEARTBEAT)); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:davinci-wdt"); diff --git a/drivers/watchdog/digicolor_wdt.c b/drivers/watchdog/digicolor_wdt.c index 073d37867f47..ed86cf879dae 100644 --- a/drivers/watchdog/digicolor_wdt.c +++ b/drivers/watchdog/digicolor_wdt.c @@ -161,3 +161,4 @@ module_platform_driver(dc_wdt_driver); MODULE_AUTHOR("Baruch Siach "); MODULE_DESCRIPTION("Driver for Conexant Digicolor watchdog timer"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index fef7c61f5555..e98ccb38eb1d 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -340,3 +340,4 @@ module_platform_driver(dw_wdt_driver); MODULE_AUTHOR("Jamie Iles"); MODULE_DESCRIPTION("Synopsys DesignWare Watchdog Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c index 8ef4b0df3855..7e4349472745 100644 --- a/drivers/watchdog/ebc-c384_wdt.c +++ b/drivers/watchdog/ebc-c384_wdt.c @@ -139,4 +139,5 @@ module_exit(ebc_c384_wdt_exit); MODULE_AUTHOR("William Breathitt Gray "); MODULE_DESCRIPTION("WinSystems EBC-C384 watchdog timer driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("isa:" MODULE_NAME); diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 38e26f160b9a..edfa422896d7 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -144,3 +144,4 @@ MODULE_AUTHOR("Alessandro Zummo "); MODULE_AUTHOR("H Hartley Sweeten "); MODULE_DESCRIPTION("EP93xx Watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index 21dcc7765688..c19186bc00b6 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -227,3 +227,4 @@ module_platform_driver(ftwdt010_wdt_driver); MODULE_AUTHOR("Linus Walleij"); MODULE_DESCRIPTION("Watchdog driver for Faraday Technology FTWDT010"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c index 0923201ce874..6a90a7ecadeb 100644 --- a/drivers/watchdog/gpio_wdt.c +++ b/drivers/watchdog/gpio_wdt.c @@ -194,3 +194,4 @@ module_platform_driver(gpio_wdt_driver); MODULE_AUTHOR("Alexander Shiyan "); MODULE_DESCRIPTION("GPIO Watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 7d34bcf1c45b..fb4d228a0d7e 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -386,6 +386,7 @@ static struct pci_driver hpwdt_driver = { MODULE_AUTHOR("Tom Mingarelli"); MODULE_DESCRIPTION("hpe watchdog driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_VERSION(HPWDT_VERSION); module_param(soft_margin, int, 0); diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index a30835f547b3..700a8c6cae00 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c @@ -351,3 +351,4 @@ module_pci_driver(esb_driver); MODULE_AUTHOR("Ross Biro and David Härdeman"); MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index c559f706ae7e..454d8ff3edc1 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -632,4 +632,5 @@ MODULE_AUTHOR("Wim Van Sebroeck "); MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver"); MODULE_VERSION(DRV_VERSION); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:" DRV_NAME); diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c index 8f28993fab8b..76bcff28eaf9 100644 --- a/drivers/watchdog/ie6xx_wdt.c +++ b/drivers/watchdog/ie6xx_wdt.c @@ -314,4 +314,5 @@ module_exit(ie6xx_wdt_exit); MODULE_AUTHOR("Alexander Stein "); MODULE_DESCRIPTION("Intel Atom E6xx Watchdog Device Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c index b57ff3787052..6fe0fd7c0719 100644 --- a/drivers/watchdog/imgpdc_wdt.c +++ b/drivers/watchdog/imgpdc_wdt.c @@ -314,3 +314,4 @@ MODULE_AUTHOR("Jude Abraham "); MODULE_AUTHOR("Naidu Tellapati "); MODULE_DESCRIPTION("Imagination Technologies PDC Watchdog Timer Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 32af3974e6bb..dc6d4132ec1f 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -433,4 +433,5 @@ module_platform_driver_probe(imx2_wdt_driver, imx2_wdt_probe); MODULE_AUTHOR("Wolfram Sang"); MODULE_DESCRIPTION("Watchdog driver for IMX2 and later"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/drivers/watchdog/intel-mid_wdt.c b/drivers/watchdog/intel-mid_wdt.c index 2cdbd37c700c..b859fd6d263b 100644 --- a/drivers/watchdog/intel-mid_wdt.c +++ b/drivers/watchdog/intel-mid_wdt.c @@ -181,3 +181,4 @@ module_platform_driver(mid_wdt_driver); MODULE_AUTHOR("David Cohen "); MODULE_DESCRIPTION("Watchdog Driver for Intel MID platform"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c index a4b71ebc8cab..610f5cdebf72 100644 --- a/drivers/watchdog/it87_wdt.c +++ b/drivers/watchdog/it87_wdt.c @@ -354,3 +354,4 @@ module_exit(it87_wdt_exit); MODULE_AUTHOR("Oliver Schuster"); MODULE_DESCRIPTION("Hardware Watchdog Device Driver for IT87xx EC-LPC I/O"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index 40bd518ed873..20a40e221dbb 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c @@ -550,3 +550,4 @@ module_platform_driver(kempld_wdt_driver); MODULE_DESCRIPTION("KEM PLD Watchdog Driver"); MODULE_AUTHOR("Michael Brunner "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c index 78cf11c94941..4e34a4bd0b24 100644 --- a/drivers/watchdog/lpc18xx_wdt.c +++ b/drivers/watchdog/lpc18xx_wdt.c @@ -316,3 +316,4 @@ module_platform_driver(lpc18xx_wdt_driver); MODULE_AUTHOR("Ariel D'Alessandro "); MODULE_DESCRIPTION("NXP LPC18xx Watchdog Timer Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 3a899628a834..053c9285adac 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c @@ -284,3 +284,4 @@ MODULE_PARM_DESC(nodelay, "(max6373/74 only, default=0)"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c index be6a53c30002..304817d379a7 100644 --- a/drivers/watchdog/max77620_wdt.c +++ b/drivers/watchdog/max77620_wdt.c @@ -209,3 +209,4 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " MODULE_AUTHOR("Laxman Dewangan "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c index 5391bf3e6b11..5e03226cada1 100644 --- a/drivers/watchdog/mei_wdt.c +++ b/drivers/watchdog/mei_wdt.c @@ -662,4 +662,5 @@ module_mei_cl_driver(mei_wdt_driver); MODULE_AUTHOR("Intel Corporation"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_DESCRIPTION("Device driver for Intel MEI iAMT watchdog"); diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c index 99d2359d5a8a..b759c66f1446 100644 --- a/drivers/watchdog/mena21_wdt.c +++ b/drivers/watchdog/mena21_wdt.c @@ -225,4 +225,5 @@ module_platform_driver(a21_wdt_driver); MODULE_AUTHOR("MEN Mikro Elektronik"); MODULE_DESCRIPTION("MEN A21 Watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:a21-watchdog"); diff --git a/drivers/watchdog/menf21bmc_wdt.c b/drivers/watchdog/menf21bmc_wdt.c index 81ebdfc371f4..358881618e2f 100644 --- a/drivers/watchdog/menf21bmc_wdt.c +++ b/drivers/watchdog/menf21bmc_wdt.c @@ -181,4 +181,5 @@ module_platform_driver(menf21bmc_wdt); MODULE_DESCRIPTION("MEN 14F021P00 BMC Watchdog driver"); MODULE_AUTHOR("Andreas Werner "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:menf21bmc_wdt"); diff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c index ed18238c5407..d13fcfc0f59c 100644 --- a/drivers/watchdog/menz69_wdt.c +++ b/drivers/watchdog/menz69_wdt.c @@ -167,4 +167,5 @@ module_mcb_driver(men_z069_driver); MODULE_AUTHOR("Johannes Thumshirn "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("mcb:16z069"); diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c index d17c1a6ed723..f30f85380679 100644 --- a/drivers/watchdog/meson_gxbb_wdt.c +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -204,3 +204,4 @@ module_platform_driver(meson_gxbb_wdt_driver); MODULE_AUTHOR("Neil Armstrong "); MODULE_DESCRIPTION("Amlogic Meson GXBB Watchdog timer driver"); MODULE_LICENSE("Dual BSD/GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c index 459f3ae02c91..0d60bb5aa688 100644 --- a/drivers/watchdog/meson_wdt.c +++ b/drivers/watchdog/meson_wdt.c @@ -228,5 +228,6 @@ MODULE_PARM_DESC(nowayout, __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Carlo Caione "); MODULE_DESCRIPTION("Meson Watchdog Timer Driver"); diff --git a/drivers/watchdog/mlx_wdt.c b/drivers/watchdog/mlx_wdt.c index 03b9ac4b99af..2df48a6ed04b 100644 --- a/drivers/watchdog/mlx_wdt.c +++ b/drivers/watchdog/mlx_wdt.c @@ -287,4 +287,5 @@ module_platform_driver(mlxreg_wdt_driver); MODULE_AUTHOR("Michael Shych "); MODULE_DESCRIPTION("Mellanox watchdog driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:mlx-wdt"); diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c index 6340a1f5f471..02dbfe2accfa 100644 --- a/drivers/watchdog/moxart_wdt.c +++ b/drivers/watchdog/moxart_wdt.c @@ -164,4 +164,5 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds"); MODULE_DESCRIPTION("MOXART watchdog driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Jonas Jensen "); diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 9c3d0033260d..074c04324738 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -247,6 +247,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Matthias Brugger "); MODULE_DESCRIPTION("Mediatek WatchDog Timer Driver"); MODULE_VERSION(DRV_VERSION); diff --git a/drivers/watchdog/ni903x_wdt.c b/drivers/watchdog/ni903x_wdt.c index 4cebad324b20..724d47f2f325 100644 --- a/drivers/watchdog/ni903x_wdt.c +++ b/drivers/watchdog/ni903x_wdt.c @@ -255,3 +255,4 @@ MODULE_DESCRIPTION("NI 903x Watchdog"); MODULE_AUTHOR("Jeff Westfahl "); MODULE_AUTHOR("Kyle Roeschley "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c index 2a46cc662943..efe0f188c79a 100644 --- a/drivers/watchdog/nic7018_wdt.c +++ b/drivers/watchdog/nic7018_wdt.c @@ -250,3 +250,4 @@ module_platform_driver(watchdog_driver); MODULE_DESCRIPTION("National Instruments NIC7018 Watchdog driver"); MODULE_AUTHOR("Hui Chun Ong "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index 9c773c3d6d5d..aa2022a44985 100644 --- a/drivers/watchdog/npcm_wdt.c +++ b/drivers/watchdog/npcm_wdt.c @@ -248,3 +248,4 @@ module_platform_driver(npcm_wdt_driver); MODULE_AUTHOR("Joel Stanley"); MODULE_DESCRIPTION("Watchdog driver for NPCM"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 7fe4f7c3f7ce..8d93e2089c6d 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -308,3 +308,4 @@ module_platform_driver(xwdt_driver); MODULE_AUTHOR("Alejandro Cabrera "); MODULE_DESCRIPTION("Xilinx Watchdog driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 9b91882fe3c4..49565608924a 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -375,4 +375,5 @@ module_platform_driver(omap_wdt_driver); MODULE_AUTHOR("George G. Davis"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:omap_wdt"); diff --git a/drivers/watchdog/pm8916_wdt.c b/drivers/watchdog/pm8916_wdt.c index 2d3652004e39..f13c1c2bec07 100644 --- a/drivers/watchdog/pm8916_wdt.c +++ b/drivers/watchdog/pm8916_wdt.c @@ -210,3 +210,4 @@ module_platform_driver(pm8916_wdt_driver); MODULE_AUTHOR("Loic Poulain "); MODULE_DESCRIPTION("Qualcomm pm8916 watchdog driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c index 7be7f87be28f..1ae02d3b5cb2 100644 --- a/drivers/watchdog/qcom-wdt.c +++ b/drivers/watchdog/qcom-wdt.c @@ -272,3 +272,4 @@ module_platform_driver(qcom_watchdog_driver); MODULE_DESCRIPTION("QCOM KPSS Watchdog Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c index 2c95615b6354..7fac3fabfcfb 100644 --- a/drivers/watchdog/rave-sp-wdt.c +++ b/drivers/watchdog/rave-sp-wdt.c @@ -329,6 +329,7 @@ module_platform_driver(rave_sp_wdt_driver); MODULE_DEVICE_TABLE(of, rave_sp_wdt_of_match); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Andrey Vostrikov "); MODULE_AUTHOR("Nikita Yushchenko "); MODULE_AUTHOR("Andrey Smirnov "); diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c index 00662a8e039c..ec5b1ec6c292 100644 --- a/drivers/watchdog/renesas_wdt.c +++ b/drivers/watchdog/renesas_wdt.c @@ -315,4 +315,5 @@ module_platform_driver(rwdt_driver); MODULE_DESCRIPTION("Renesas WDT Watchdog Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Wolfram Sang "); diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c index 258dfcf9cbda..6a3e2b8e5226 100644 --- a/drivers/watchdog/retu_wdt.c +++ b/drivers/watchdog/retu_wdt.c @@ -168,3 +168,4 @@ MODULE_DESCRIPTION("Retu watchdog"); MODULE_AUTHOR("Amit Kucheria"); MODULE_AUTHOR("Aaro Koskinen "); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c index 234876047431..8f7bc6b1cb64 100644 --- a/drivers/watchdog/rn5t618_wdt.c +++ b/drivers/watchdog/rn5t618_wdt.c @@ -191,3 +191,4 @@ module_platform_driver(rn5t618_wdt_driver); MODULE_AUTHOR("Beniamino Galvani "); MODULE_DESCRIPTION("RN5T618 watchdog driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/rza_wdt.c b/drivers/watchdog/rza_wdt.c index 7b6c365f7cd3..31ff9acc9af2 100644 --- a/drivers/watchdog/rza_wdt.c +++ b/drivers/watchdog/rza_wdt.c @@ -245,3 +245,4 @@ module_platform_driver(rza_wdt_driver); MODULE_DESCRIPTION("Renesas RZ/A WDT Driver"); MODULE_AUTHOR("Chris Brandt "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 2395f353e52d..5c1800d41411 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -739,3 +739,4 @@ module_platform_driver(s3c2410wdt_driver); MODULE_AUTHOR("Ben Dooks , Dimitry Andric "); MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index d193a60430b2..725f68703f1e 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -321,3 +321,4 @@ module_platform_driver(sama5d4_wdt_driver); MODULE_AUTHOR("Atmel Corporation"); MODULE_DESCRIPTION("Atmel SAMA5D4 Watchdog Timer driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c index 734cf2966ecb..bcb75d9978f0 100644 --- a/drivers/watchdog/sirfsoc_wdt.c +++ b/drivers/watchdog/sirfsoc_wdt.c @@ -213,4 +213,5 @@ module_platform_driver(sirfsoc_wdt_driver); MODULE_DESCRIPTION("SiRF SoC watchdog driver"); MODULE_AUTHOR("Xianglong Du "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:sirfsoc-wdt"); diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index 3e4885c1545e..8d50543f7340 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c @@ -165,3 +165,4 @@ module_exit(softdog_exit); MODULE_AUTHOR("Alan Cox"); MODULE_DESCRIPTION("Software Watchdog Device Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c index 93bd302ae7c5..716b9c43baf1 100644 --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c @@ -486,3 +486,4 @@ module_exit(sp5100_tco_exit); MODULE_AUTHOR("Priyanka Gupta"); MODULE_DESCRIPTION("TCO timer driver for SP5100/SB800 chipset"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c index edba4e278685..55e883e8dcf4 100644 --- a/drivers/watchdog/sprd_wdt.c +++ b/drivers/watchdog/sprd_wdt.c @@ -384,3 +384,4 @@ module_platform_driver(sprd_watchdog_driver); MODULE_AUTHOR("Eric Long "); MODULE_DESCRIPTION("Spreadtrum Watchdog Timer Controller Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c index 14ab6559c748..4a7e6b4694fa 100644 --- a/drivers/watchdog/st_lpc_wdt.c +++ b/drivers/watchdog/st_lpc_wdt.c @@ -305,3 +305,4 @@ module_platform_driver(st_wdog_driver); MODULE_AUTHOR("David Paris "); MODULE_DESCRIPTION("ST LPC Watchdog Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c index 7caf3aa71c6a..f1dd033c2b4b 100644 --- a/drivers/watchdog/stmp3xxx_rtc_wdt.c +++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c @@ -150,4 +150,5 @@ module_platform_driver(stmp3xxx_wdt_driver); MODULE_DESCRIPTION("STMP3XXX RTC Watchdog Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Wolfram Sang "); diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c index 45d0c543466f..6cdbe4bf5aaa 100644 --- a/drivers/watchdog/stpmic1_wdt.c +++ b/drivers/watchdog/stpmic1_wdt.c @@ -138,3 +138,4 @@ module_platform_driver(stpmic1_wdt_driver); MODULE_DESCRIPTION("Watchdog driver for STPMIC1 device"); MODULE_AUTHOR("Pascal Paillet "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index 5f05a45ac187..dea10c79b817 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -289,6 +289,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Carlo Caione "); MODULE_AUTHOR("Henrik Nordstrom "); MODULE_DESCRIPTION("sunxi WatchDog Timer Driver"); diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c index 1afb0e9d808c..bc9025d31977 100644 --- a/drivers/watchdog/tangox_wdt.c +++ b/drivers/watchdog/tangox_wdt.c @@ -207,3 +207,4 @@ module_platform_driver(tangox_wdt_driver); MODULE_AUTHOR("Mans Rullgard "); MODULE_DESCRIPTION("SMP86xx/SMP87xx Watchdog driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c index dfe06e506cad..06acd8251928 100644 --- a/drivers/watchdog/tegra_wdt.c +++ b/drivers/watchdog/tegra_wdt.c @@ -276,3 +276,4 @@ module_platform_driver(tegra_wdt_driver); MODULE_AUTHOR("NVIDIA Corporation"); MODULE_DESCRIPTION("Tegra Watchdog Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/tqmx86_wdt.c b/drivers/watchdog/tqmx86_wdt.c index 72d0b0adde38..35b8bfffa34d 100644 --- a/drivers/watchdog/tqmx86_wdt.c +++ b/drivers/watchdog/tqmx86_wdt.c @@ -124,3 +124,4 @@ MODULE_AUTHOR("Andrew Lunn "); MODULE_DESCRIPTION("TQMx86 Watchdog"); MODULE_ALIAS("platform:tqmx86-wdt"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c index c137ad2bd5c3..b07f75f9049b 100644 --- a/drivers/watchdog/ts4800_wdt.c +++ b/drivers/watchdog/ts4800_wdt.c @@ -200,4 +200,5 @@ module_platform_driver(ts4800_wdt_driver); MODULE_AUTHOR("Damien Riegel "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:ts4800_wdt"); diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index bf918f5fa131..efd74cfabbf8 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c @@ -174,4 +174,5 @@ module_platform_driver(ts72xx_wdt_driver); MODULE_AUTHOR("Mika Westerberg "); MODULE_DESCRIPTION("TS-72xx SBC Watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:ts72xx-wdt"); diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c index 355e428c0b99..98bcebe3a0b7 100644 --- a/drivers/watchdog/twl4030_wdt.c +++ b/drivers/watchdog/twl4030_wdt.c @@ -123,5 +123,6 @@ module_platform_driver(twl4030_wdt_driver); MODULE_AUTHOR("Nokia Corporation"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:twl4030_wdt"); diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c index 8e9242c23022..3a6d2d3a8f3c 100644 --- a/drivers/watchdog/uniphier_wdt.c +++ b/drivers/watchdog/uniphier_wdt.c @@ -255,3 +255,4 @@ MODULE_PARM_DESC(nowayout, MODULE_AUTHOR("Keiji Hayashibara "); MODULE_DESCRIPTION("UniPhier Watchdog Device Driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index eeb39f96e72e..899a4fe1d7b6 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c @@ -259,3 +259,4 @@ module_pci_driver(wdt_driver); MODULE_AUTHOR("Marc Vertes"); MODULE_DESCRIPTION("Driver for watchdog timer on VIA chipset"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c index 38b31e9947aa..b66aea20a96e 100644 --- a/drivers/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c @@ -528,5 +528,6 @@ module_init(wdt_init); module_exit(wdt_exit); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_AUTHOR("Pádraig Brady "); MODULE_DESCRIPTION("w83627hf/thf WDT driver"); diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 21e8085b848b..9deb22af5daa 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -145,7 +145,7 @@ int watchdog_init_timeout(struct watchdog_device *wdd, return ret; } -EXPORT_SYMBOL_GPL(watchdog_init_timeout); +EXPORT_SYMBOL_NS_GPL(watchdog_init_timeout, WATCHDOG_CORE); static int watchdog_restart_notifier(struct notifier_block *nb, unsigned long action, void *data) @@ -180,7 +180,7 @@ void watchdog_set_restart_priority(struct watchdog_device *wdd, int priority) { wdd->restart_nb.priority = priority; } -EXPORT_SYMBOL_GPL(watchdog_set_restart_priority); +EXPORT_SYMBOL_NS_GPL(watchdog_set_restart_priority, WATCHDOG_CORE); static int __watchdog_register_device(struct watchdog_device *wdd) { @@ -279,7 +279,7 @@ int watchdog_register_device(struct watchdog_device *wdd) return ret; } -EXPORT_SYMBOL_GPL(watchdog_register_device); +EXPORT_SYMBOL_NS_GPL(watchdog_register_device, WATCHDOG_CORE); static void __watchdog_unregister_device(struct watchdog_device *wdd) { @@ -311,7 +311,7 @@ void watchdog_unregister_device(struct watchdog_device *wdd) mutex_unlock(&wtd_deferred_reg_mutex); } -EXPORT_SYMBOL_GPL(watchdog_unregister_device); +EXPORT_SYMBOL_NS_GPL(watchdog_unregister_device, WATCHDOG_CORE); static void devm_watchdog_unregister_device(struct device *dev, void *res) { @@ -348,7 +348,7 @@ int devm_watchdog_register_device(struct device *dev, return ret; } -EXPORT_SYMBOL_GPL(devm_watchdog_register_device); +EXPORT_SYMBOL_NS_GPL(devm_watchdog_register_device, WATCHDOG_CORE); static int __init watchdog_deferred_registration(void) { diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c index e7cf41aa26c3..027339a557ce 100644 --- a/drivers/watchdog/wdat_wdt.c +++ b/drivers/watchdog/wdat_wdt.c @@ -523,4 +523,5 @@ module_platform_driver(wdat_wdt_driver); MODULE_AUTHOR("Mika Westerberg "); MODULE_DESCRIPTION("ACPI Hardware Watchdog (WDAT) driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:wdat_wdt"); diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c index 030ce240620d..a17e2ac251a1 100644 --- a/drivers/watchdog/wm831x_wdt.c +++ b/drivers/watchdog/wm831x_wdt.c @@ -282,4 +282,5 @@ module_platform_driver(wm831x_wdt_driver); MODULE_AUTHOR("Mark Brown"); MODULE_DESCRIPTION("WM831x Watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:wm831x-watchdog"); diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index 33c62d51f00a..f81e661662e6 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -175,4 +175,5 @@ module_platform_driver(wm8350_wdt_driver); MODULE_AUTHOR("Mark Brown"); MODULE_DESCRIPTION("WM8350 Watchdog"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); MODULE_ALIAS("platform:wm8350-wdt"); diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c index b343f421dc72..8b21a4b51047 100644 --- a/drivers/watchdog/xen_wdt.c +++ b/drivers/watchdog/xen_wdt.c @@ -206,3 +206,4 @@ module_exit(xen_wdt_cleanup_module); MODULE_AUTHOR("Jan Beulich "); MODULE_DESCRIPTION("Xen WatchDog Timer Driver"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(WATCHDOG_CORE); diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c index dec660c509b3..2d81c7b546f2 100644 --- a/drivers/watchdog/ziirave_wdt.c +++ b/drivers/watchdog/ziirave_wdt.c @@ -751,3 +751,4 @@ module_i2c_driver(ziirave_wdt_driver); MODULE_AUTHOR("Martyn Welch