Subject: [PATCH 5/12] acpi: fix compile error with ACPI && !ACPI_SYSTEM

Fix build error if ACPI && !ACPI_SYSTEM as
bus.c depended on event.c

Signed-off-by: Andreas Herrmann <[email protected]>
---
drivers/acpi/bus.c | 2 +-
drivers/acpi/event.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index e5084ec..b4a9ea5 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -281,7 +281,7 @@ static DEFINE_SPINLOCK(acpi_bus_event_lock);
LIST_HEAD(acpi_bus_event_list);
DECLARE_WAIT_QUEUE_HEAD(acpi_bus_event_queue);

-extern int event_is_open;
+int event_is_open = 0;

int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
{
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 3b23562..15886c1 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -17,7 +17,7 @@ ACPI_MODULE_NAME("event");

/* Global vars for handling event proc entry */
static DEFINE_SPINLOCK(acpi_system_event_lock);
-int event_is_open = 0;
+extern int event_is_open;
extern struct list_head acpi_bus_event_list;
extern wait_queue_head_t acpi_bus_event_queue;

--
1.5.0.7





2007-06-20 03:36:20

by Len Brown

[permalink] [raw]
Subject: Re: [PATCH 5/12] acpi: fix compile error with ACPI && !ACPI_SYSTEM

On Tuesday 19 June 2007 18:49, Andreas Herrmann wrote:
> Fix build error if ACPI && !ACPI_SYSTEM as
> bus.c depended on event.c

How were you able to get ACPI & !ACPI_SYSTEM to survive "make oldconfig"?

-Len

> Signed-off-by: Andreas Herrmann <[email protected]>
> ---
> drivers/acpi/bus.c | 2 +-
> drivers/acpi/event.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index e5084ec..b4a9ea5 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -281,7 +281,7 @@ static DEFINE_SPINLOCK(acpi_bus_event_lock);
> LIST_HEAD(acpi_bus_event_list);
> DECLARE_WAIT_QUEUE_HEAD(acpi_bus_event_queue);
>
> -extern int event_is_open;
> +int event_is_open = 0;
>
> int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
> {
> diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
> index 3b23562..15886c1 100644
> --- a/drivers/acpi/event.c
> +++ b/drivers/acpi/event.c
> @@ -17,7 +17,7 @@ ACPI_MODULE_NAME("event");
>
> /* Global vars for handling event proc entry */
> static DEFINE_SPINLOCK(acpi_system_event_lock);
> -int event_is_open = 0;
> +extern int event_is_open;
> extern struct list_head acpi_bus_event_list;
> extern wait_queue_head_t acpi_bus_event_queue;
>