linux-kernel - [PATCH] regmap: Fix regmap compilation with CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon,  5 Sep 2011 21:29:38 +0200
From:	Lars-Peter Clausen <lars@...afoo.de>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	linux-kernel@...r.kernel.org, Lars-Peter Clausen <lars@...afoo.de>
Subject: [PATCH] regmap: Fix regmap compilation with CONFIG_DEBUGFS=n

With CONFIG_DEBUGFS disabled the regmap compilation fails with the following
errors:

	drivers/base/regmap/regcache.o: In function `regmap_debugfs_initcall':
	drivers/base/regmap/internal.h:96: multiple definition of `regmap_debugfs_initcall'
	drivers/base/regmap/regmap.o:drivers/base/regmap/internal.h:96: first defined here
	drivers/base/regmap/regcache.o: In function `regmap_debugfs_init':
	drivers/base/regmap/internal.h:97: multiple definition of `regmap_debugfs_init'
	drivers/base/regmap/regmap.o:drivers/base/regmap/internal.h:97: first
	defined here drivers/base/regmap/regcache.o: In function `regmap_debugfs_exit':
	...

Make the debugfs stubs static inline to fix this.

Signed-off-by: Lars-Peter Clausen <lars@...afoo.de>
---
 drivers/base/regmap/internal.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 5ab3fef..b4acd94 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -58,9 +58,9 @@ extern void regmap_debugfs_initcall(void);
 extern void regmap_debugfs_init(struct regmap *map);
 extern void regmap_debugfs_exit(struct regmap *map);
 #else
-void regmap_debugfs_initcall(void) { }
-void regmap_debugfs_init(struct regmap *map) { }
-void regmap_debugfs_exit(struct regmap *map) { }
+static inline void regmap_debugfs_initcall(void) { }
+static inline void regmap_debugfs_init(struct regmap *map) { }
+static inline void regmap_debugfs_exit(struct regmap *map) { }
 #endif
 
 #endif
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/