Re: OLPC power management patches - merge for 3.1?

[Randy Dunlap <rdunlap@xenotime.net>]

On Sat, 23 Jul 2011 23:44:09 +0100 Daniel Drake wrote:

> Hi,
> 
> Many thanks for committing the OLPC power management patches to
> linux-tip a few weeks ago.
> 
> Even though they were never merged into the master branch of linux-tip
> (where I presume linux-next pulls from), they have been included in
> linux-next for even longer via Andrew Morton's tree.
> 
> Is there any chance you could send them for inclusion in Linux 3.1?
> The functionality is working well, but a small fixup is needed for
> XO-1.5 (see "[PATCH] x86, olpc-xo15-sci: enable EC wakeup capability"
> from 2011-07-09).

Hi,

I should have posted this sooner...

I have no objection to merging OLPC patches, but they should build
without errors.

>From linux-next 20110722:

arch/x86/built-in.o: In function `battery_status_changed':
olpc-xo15-sci.c:(.text+0x3acdd): undefined reference to `power_supply_get_by_name'
olpc-xo15-sci.c:(.text+0x3ad04): undefined reference to `power_supply_changed'
arch/x86/built-in.o: In function `ac_status_changed':
olpc-xo15-sci.c:(.text+0x3ad4d): undefined reference to `power_supply_get_by_name'
olpc-xo15-sci.c:(.text+0x3ad74): undefined reference to `power_supply_changed'

Looks like this problem is caused by:

config OLPC_XO1_SCI
	bool "OLPC XO-1 SCI extras"
	depends on OLPC && OLPC_XO1_PM && POWER_SUPPLY

or
config OLPC_XO15_SCI
	bool "OLPC XO-1.5 SCI extras"
	depends on OLPC && ACPI && POWER_SUPPLY

In both cases, the 'bool' depends on one or more tristate symbols, so
the tristates are satisfied if they are =m or =y.  This should work fine
if these kconfig symbols (listed above) were tristate instead of bool.


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***