- pm-schedule-sysrq-poweroff-on-boot-cpu-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     pm-schedule-sysrq-poweroff-on-boot-cpu fix
has been removed from the -mm tree.  Its filename was
     pm-schedule-sysrq-poweroff-on-boot-cpu-fix.patch

This patch was dropped because it was folded into pm-schedule-sysrq-poweroff-on-boot-cpu.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: pm-schedule-sysrq-poweroff-on-boot-cpu fix
From: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>

My IA64 machine can't build on today's mmotm(Jul 13).
So, below patch is necessary, I think.

----------------------------------------------------
Against: mmotm, Jul 13
Applies after: pm-schedule-sysrq-poweroff-on-boot-cpu.patch

Now, handle_poweroff() use cpu_online_map variable.
So cpumask.h sould be included.
Otherwise it cause following build error on ia64 (I guess also sevaral othor platfom).

	kernel/power/poweroff.c: In function 'handle_poweroff':
	kernel/power/poweroff.c:29: error: implicit declaration of function 'first_cpu'
	kernel/power/poweroff.c:29: error: 'cpu_online_map' undeclared (first use in this function)
	kernel/power/poweroff.c:29: error: (Each undeclared identifier is reported only once
	kernel/power/poweroff.c:29: error: for each function it appears in.)
	make[2]: *** [kernel/power/poweroff.o] Error 1
	make[1]: *** [kernel/power] Error 2

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Zhang Rui <rui.zhang@xxxxxxxxx>
Cc: Rus <harbour@xxxxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/power/poweroff.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN kernel/power/poweroff.c~pm-schedule-sysrq-poweroff-on-boot-cpu-fix kernel/power/poweroff.c
--- a/kernel/power/poweroff.c~pm-schedule-sysrq-poweroff-on-boot-cpu-fix
+++ a/kernel/power/poweroff.c
@@ -10,6 +10,7 @@
 #include <linux/pm.h>
 #include <linux/workqueue.h>
 #include <linux/reboot.h>
+#include <linux/cpumask.h>
 
 /*
  * When the user hits Sys-Rq o to power down the machine this is the
_

Patches currently in -mm which might be from kosaki.motohiro@xxxxxxxxxxxxxx are

page-allocator-inlnie-some-__alloc_pages-wrappers.patch
mm-hugetlbc-fix-duplicate-variable.patch
page-flags-record-page-flag-overlays-explicitly.patch
slub-record-page-flag-overlays-explicitly.patch
slob-record-page-flag-overlays-explicitly.patch
mm-create-sys-kernel-mm.patch
mm-make-config_migration-available-w-o-config_numa.patch
mm-fix-ever-decreasing-swap-priority.patch
pm-schedule-sysrq-poweroff-on-boot-cpu.patch
pm-schedule-sysrq-poweroff-on-boot-cpu-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux