Skip to contentSkip to conversation

dmi: Fix build breakage

PATCH In review Kumar Gala 2 participants 2 messages Jan 28, 2009

Subsystems (2)
lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

PATCH 1/1 dmi: Fix build breakage

The following commit introduced:

commit d7b1956fed33d30c4815e848fd7a143722916868

Author: Rafael J. Wysocki <[email protected]>
Date:   Mon Jan 19 20:55:50 2009 +0100

DMI: Introduce dmi_first_match to make the interface more flexible

compile errors like the following when !CONFIG_DMI

drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match' drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast

We just need a dummy version of dmi_first_match() to fix this all up.

---

This should supercede the driver specific patches I posted earlier.

- k

 include/linux/dmi.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/dmi.h +2 -0
index aea2310..d741b9c 100644
@@ -65,6 +65,8 @@ static inline int dmi_walk(void (*decode)(const struct dmi_header *))
 	{ return -1; }
 static inline bool dmi_match(enum dmi_field f, const char *str)
 	{ return false; }
+static inline const struct dmi_system_id *
+	dmi_first_match(const struct dmi_system_id *list) { return NULL; }
 
 #endif
 
Signature · 1 line
1.5.6.6
#1 lore raw
Quoted 8 lines · Kumar Gala

The following commit introduced:

commit d7b1956fed33d30c4815e848fd7a143722916868

Author: Rafael J. Wysocki <[email protected]>
Date:   Mon Jan 19 20:55:50 2009 +0100

DMI: Introduce dmi_first_match to make the interface more flexible

Quoted 7 lines

compile errors like the following when !CONFIG_DMI

drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match' drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast

We just need a dummy version of dmi_first_match() to fix this all up.

Well, my bad. Thanks for the fix!

Quoted 15 lines

---

This should supercede the driver specific patches I posted earlier.

- k

 include/linux/dmi.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/dmi.h +0 -0
index aea2310..d741b9c 100644

include/linux/dmi.h static inline int dmi_walk(void (*decode)(const struct dmi_header *)) · line 72

Quoted 8 lines
include/linux/dmi.h +2 -0
@@ -65,6 +65,8 @@ static inline int dmi_walk(void (*decode)(const struct dmi_header *))
 	{ return -1; }
 static inline bool dmi_match(enum dmi_field f, const char *str)
 	{ return false; }
+static inline const struct dmi_system_id *
+	dmi_first_match(const struct dmi_system_id *list) { return NULL; }
 
 #endif
 

Rafael