Home Home > GIT Browse
diff options
authorArnd Bergmann <arnd@arndb.de>2019-03-06 11:52:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:16:05 +0200
commit0c00f71e7d7c1d21f630059b1f009956da5d673a (patch)
parent9e91db59e3b9b604995b158154bfac5569669d91 (diff)
appletalk: Fix compile regression
[ Upstream commit 27da0d2ef998e222a876c0cec72aa7829a626266 ] A bugfix just broke compilation of appletalk when CONFIG_SYSCTL is disabled: In file included from net/appletalk/ddp.c:65: net/appletalk/ddp.c: In function 'atalk_init': include/linux/atalk.h:164:34: error: expected expression before 'do' #define atalk_register_sysctl() do { } while(0) ^~ net/appletalk/ddp.c:1934:7: note: in expansion of macro 'atalk_register_sysctl' rc = atalk_register_sysctl(); This is easier to avoid by using conventional inline functions as stubs rather than macros. The header already has inline functions for other purposes, so I'm changing over all the macros for consistency. Fixes: 6377f787aeb9 ("appletalk: Fix use-after-free in atalk_proc_exit") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 files changed, 14 insertions, 4 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 5a90f28d5ff2..d5cfc0b15b76 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -161,16 +161,26 @@ extern int sysctl_aarp_resolve_time;
extern int atalk_register_sysctl(void);
extern void atalk_unregister_sysctl(void);
-#define atalk_register_sysctl() do { } while(0)
-#define atalk_unregister_sysctl() do { } while(0)
+static inline int atalk_register_sysctl(void)
+ return 0;
+static inline void atalk_unregister_sysctl(void)
extern int atalk_proc_init(void);
extern void atalk_proc_exit(void);
-#define atalk_proc_init() ({ 0; })
-#define atalk_proc_exit() do { } while(0)
+static inline int atalk_proc_init(void)
+ return 0;
+static inline void atalk_proc_exit(void)
#endif /* CONFIG_PROC_FS */
#endif /* __LINUX_ATALK_H__ */