2005-12-12 15:53:05

by Miklos Szeredi

[permalink] [raw]
Subject: [PATCH] uml: fix pm_power_off link failure

Andrew,

please scrap my the previous pm_power_off fix, it didn't work out.
This just fixes UML:

LD .tmp_vmlinux1
kernel/built-in.o(.text+0x148e1): In function `sys_reboot':
kernel/sys.c:535: undefined reference to `pm_power_off'

On uml machine_halt() just calls machine_power_off() so it's safe to
leave pm_power_off as NULL.

Signed-off-by: Miklos Szeredi <[email protected]>
---

Index: linux/arch/um/kernel/reboot.c
===================================================================
--- linux.orig/arch/um/kernel/reboot.c 2005-10-28 02:02:08.000000000 +0200
+++ linux/arch/um/kernel/reboot.c 2005-12-12 16:10:16.000000000 +0100
@@ -12,6 +12,8 @@
#include "mode.h"
#include "choose-mode.h"

+void (*pm_power_off)(void);
+
#ifdef CONFIG_SMP
static void kill_idlers(int me)
{