Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af06216a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

ACPI: Fix build for CONFIG_NET unset 



Several ACPI drivers fail to build if CONFIG_NET is unset, because
they refer to things depending on CONFIG_THERMAL that in turn depends
on CONFIG_NET.  However, CONFIG_THERMAL doesn't really need to depend
on CONFIG_NET, because the only part of it requiring CONFIG_NET is
the netlink interface in thermal_sys.c.

Put the netlink interface in thermal_sys.c under #ifdef CONFIG_NET
and remove the dependency of CONFIG_THERMAL on CONFIG_NET from
drivers/thermal/Kconfig.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Len Brown <lenb@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Luming Yu <luming.yu@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dbc39ec4

drivers/thermal/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


menuconfig THERMAL

	tristate "Generic Thermal sysfs driver"

	depends on NET

	help

	  Generic Thermal Sysfs driver offers a generic mechanism for

	  thermal management. Usually it's made up of one or more thermal

drivers/thermal/thermal_sys.c

+21 −19
Original line number Diff line number Diff line
@@ -62,20 +62,6 @@ static DEFINE_MUTEX(thermal_list_lock); 


static unsigned int thermal_event_seqnum;



static struct genl_family thermal_event_genl_family = {

	.id = GENL_ID_GENERATE,

	.name = THERMAL_GENL_FAMILY_NAME,

	.version = THERMAL_GENL_VERSION,

	.maxattr = THERMAL_GENL_ATTR_MAX,

};



static struct genl_multicast_group thermal_event_mcgrp = {

	.name = THERMAL_GENL_MCAST_GROUP_NAME,

};



static int genetlink_init(void);

static void genetlink_exit(void);



static int get_idr(struct idr *idr, struct mutex *lock, int *id)

{

	int err;
@@ -1225,6 +1211,18 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) 


EXPORT_SYMBOL(thermal_zone_device_unregister);



#ifdef CONFIG_NET

static struct genl_family thermal_event_genl_family = {

	.id = GENL_ID_GENERATE,

	.name = THERMAL_GENL_FAMILY_NAME,

	.version = THERMAL_GENL_VERSION,

	.maxattr = THERMAL_GENL_ATTR_MAX,

};



static struct genl_multicast_group thermal_event_mcgrp = {

	.name = THERMAL_GENL_MCAST_GROUP_NAME,

};



int generate_netlink_event(u32 orig, enum events event)

{

	struct sk_buff *skb;
@@ -1301,6 +1299,15 @@ static int genetlink_init(void) 
	return result;

}



static void genetlink_exit(void)

{

	genl_unregister_family(&thermal_event_genl_family);

}

#else /* !CONFIG_NET */

static inline int genetlink_init(void) { return 0; }

static inline void genetlink_exit(void) {}

#endif /* !CONFIG_NET */



static int __init thermal_init(void)

{

	int result = 0;
@@ -1316,11 +1323,6 @@ static int __init thermal_init(void) 
	return result;

}



static void genetlink_exit(void)

{

	genl_unregister_family(&thermal_event_genl_family);

}



static void __exit thermal_exit(void)

{

	class_unregister(&thermal_class);

include/linux/thermal.h

+8 −0
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ void thermal_zone_device_update(struct thermal_zone_device *); 
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,

		const struct thermal_cooling_device_ops *);

void thermal_cooling_device_unregister(struct thermal_cooling_device *);



#ifdef CONFIG_NET

extern int generate_netlink_event(u32 orig, enum events event);

#else

static inline int generate_netlink_event(u32 orig, enum events event)

{

	return 0;

}

#endif



#endif /* __THERMAL_H__ */