sysrq-o broken since 2.6.38

DISCUSSION Rafael J. Wysocki 1 participant 3 messages Jan 4, 2012 – Jan 10, 2012 3 messages not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Rafael J. Wysocki

author

2012-01-04 22:52 UTC #1 lore raw

Quoted 3 lines · Phil Oester

In commit 1eb208ae [PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)], sysrq-o option no longer works unless PM_SLEEP or PM_RUNTIME is enabled. I doubt this was an intended consequence of this change. Could someone confirm?

No, it wasn't.

I'll try to find out what the problem is.

Thanks,
Rafael

Rafael J. Wysocki

author

2012-01-08 21:35 UTC #2 lore raw

Quoted 8 lines · Rafael J. Wysocki

Quoted 3 lines · Phil Oester
In commit 1eb208ae [PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)], sysrq-o option no longer works unless PM_SLEEP or PM_RUNTIME is enabled. I doubt this was an intended consequence of this change. Could someone confirm?
No, it wasn't.
I'll try to find out what the problem is.

I don't really see what the problem is right now and I'm unable to reproduce it on the boxes available to me at the moment.

Please send your .config.

Thanks,
Rafael

A message that is not in the archive (sent off-list or not yet received): [email protected]

Rafael J. Wysocki

author

2012-01-10 20:53 UTC #5 lore raw

PM: Make sysrq-o be available for CONFIG_PM unset (was: Re: sysrq-o broken since 2.6.38)

Quoted 7 lines · Phil Oester

Quoted 4 lines · Rafael J. Wysocki
OK, so I think the appended patch should help.
Thanks,
Rafael
Confirmed, your patch solves the issue, thanks.

Great, thanks for testing!

The patch is reproduced below with a changelog and tags.

Thanks,
Rafael

---
From: Rafael J. Wysocki <[email protected]>
Subject: PM: Make sysrq-o be available for CONFIG_PM unset

After commit 1eb208aea3179dd2fc0cdeea45ef869d75b4fe70, "PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)", the files under kernel/power are not built unless CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME is set. In particular, this causes kernel/power/poweroff.c to be omitted, even though it should be compiled, because CONFIG_MAGIC_SYSRQ is set.

Fix the problem by causing kernel/power/Makefile to be processed for CONFIG_PM unset too.

Reported-and-tested-by Phil Oester <[email protected]>

Signed-off-by Rafael J. Wysocki <[email protected]>

---
 kernel/Makefile |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

kernel/Makefile +1 -2

Index: linux/kernel/Makefile
===================================================================
@@ -23,6 +23,7 @@ CFLAGS_REMOVE_irq_work.o = -pg
 endif
 
 obj-y += sched/
+obj-y += power/
 
 obj-$(CONFIG_FREEZER) += freezer.o
 obj-$(CONFIG_PROFILING) += profile.o

@@ -52,8 +53,6 @@ obj-$(CONFIG_PROVE_LOCKING) += spinlock.
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
-obj-$(CONFIG_PM) += power/
-obj-$(CONFIG_FREEZER) += power/
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KEXEC) += kexec.o
 obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o