linux-kernel - [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs

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-next>] [day] [month] [year] [list]

Message-Id: <201108231342.25101.jkrzyszt@tis.icnet.pl>
Date:	Tue, 23 Aug 2011 13:42:24 +0200
From:	Janusz Krzysztofik <jkrzyszt@....icnet.pl>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-kernel@...r.kernel.org, linux-omap@...r.kernel.org,
	Kevin Hilman <khilman@...com>
Subject: [PATCH 3.1-rc3] gpio/omap: fix build error with certain OMAP1 configs

With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove 
ifdefs", access to build time conditionally omitted 'suspend_wakeup' 
member of the 'gpio_bank' structure has been placed unconditionally in 
function _set_gpio_wakeup(), which is always built. This resulted in the 
driver compilation broken for certain OMAP1, i.e., non-OMAP16xx, 
configurations.

Really required or not in previously excluded cases, define this 
structure member unconditionally as a fix.

Tested with a custom OMAP1510 only configuration.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@....icnet.pl>
---
 drivers/gpio/gpio-omap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- git/drivers/gpio/gpio-omap.c.orig	2011-08-22 08:34:02.000000000 +0200
+++ git/drivers/gpio/gpio-omap.c	2011-08-23 12:47:36.000000000 +0200
@@ -34,8 +34,8 @@ struct gpio_bank {
 	u16 irq;
 	u16 virtual_irq_start;
 	int method;
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
 	u32 suspend_wakeup;
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
 	u32 saved_wakeup;
 #endif
 	u32 non_wakeup_gpios;
--
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/