From ba76cd575ffd461d83507c23cf53c78d56d1ea0a Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 14 Nov 2005 21:56:57 +1100 Subject: [PATCH] powerpc: Remove __init from a function used in suspend/resume. Suspend/resume on powermacs uses the pmac_get_boot_time function, so it can't be marked as __init. Signed-off-by: Paul Mackerras --- arch/powerpc/platforms/powermac/time.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c index b1714f9bd920..feb0a94e7819 100644 --- a/arch/powerpc/platforms/powermac/time.c +++ b/arch/powerpc/platforms/powermac/time.c @@ -199,7 +199,8 @@ static unsigned long smu_get_time(void) #define smu_set_rtc_time(tm, spin) 0 #endif -unsigned long __init pmac_get_boot_time(void) +/* Can't be __init, it's called when suspending and resuming */ +unsigned long pmac_get_boot_time(void) { /* Get the time from the RTC, used only at boot time */ switch (sys_ctrler) { -- 2.30.2