linux-kernel - Re: [PATCH] nouveau: fix undefined reference to acpi_lid

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20100217220401.GA3258@joi.lan>
Date:	Wed, 17 Feb 2010 23:04:01 +0100
From:	Marcin Slusarz <marcin.slusarz@...il.com>
To:	Daniel Mack <daniel@...aq.de>
Cc:	linux-kernel@...r.kernel.org, David Airlie <airlied@...ux.ie>,
	Ben Skeggs <bskeggs@...hat.com>,
	Francisco Jerez <currojerez@...eup.net>,
	Maarten Maathuis <madman2003@...il.com>,
	Xavier Chantry <shiningxc@...il.com>,
	dri-devel@...ts.sourceforge.net, nouveau@...ts.freedesktop.org
Subject: Re: [PATCH] nouveau: fix undefined reference to acpi_lid_open

On Wed, Feb 17, 2010 at 10:42:43AM +0100, Daniel Mack wrote:
> Fix the following compile time error:
> 
> drivers/built-in.o: In function `nouveau_connector_detect':
> /home/daniel/src/linux/jup/linux-2.6/drivers/gpu/drm/nouveau/nouveau_connector.c:243: undefined reference to `acpi_lid_open'
> 
> Signed-off-by: Daniel Mack <daniel@...aq.de>
> Cc: David Airlie <airlied@...ux.ie>
> Cc: Ben Skeggs <bskeggs@...hat.com>
> Cc: Francisco Jerez <currojerez@...eup.net>
> Cc: Maarten Maathuis <madman2003@...il.com>
> Cc: Xavier Chantry <shiningxc@...il.com>
> Cc: Marcin Slusarz <marcin.slusarz@...il.com>
> Cc: dri-devel@...ts.sourceforge.net
> ---
>  drivers/gpu/drm/nouveau/nouveau_connector.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index d2f6335..c74d45d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -239,7 +239,7 @@ nouveau_connector_detect(struct drm_connector *connector)
>  	if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
>  		nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
>  	if (nv_encoder && nv_connector->native_mode) {
> -#ifdef CONFIG_ACPI
> +#ifdef CONFIG_ACPI_BUTTON
>  		if (!nouveau_ignorelid && !acpi_lid_open())
>  			return connector_status_disconnected;
>  #endif
> -- 

You are fixing CONFIG_ACPI_BUTTON=m vs CONFIG_DRM_NOUVEAU=y compilation,
but breaking runtime behaviour of CONFIG_ACPI_BUTTON=m + CONFIG_DRM_NOUVEAU=m.

I think this code should be compiled when:
#if defined(CONFIG_ACPI_BUTTON) || (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(CONFIG_DRM_NOUVEAU_MODULE))

Marcin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/