2009-01-28 06:08:00

by Kumar Gala

[permalink] [raw]
Subject: [PATCH] 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.

Signed-off-by: Kumar Gala <[email protected]>
---

This should supercede the driver specific patches I posted earlier.

- k

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

diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index aea2310..d741b9c 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -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

--
1.5.6.6


2009-01-28 22:26:15

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH] dmi: Fix build breakage

On Wednesday 28 January 2009, Kumar Gala wrote:
> 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.

Well, my bad. Thanks for the fix!

> Signed-off-by: Kumar Gala <[email protected]>
> ---
>
> This should supercede the driver specific patches I posted earlier.
>
> - k
>
> include/linux/dmi.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/dmi.h b/include/linux/dmi.h
> index aea2310..d741b9c 100644
> --- a/include/linux/dmi.h
> +++ b/include/linux/dmi.h
> @@ -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