projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a272e24
)
powerpc: Remove __init from a function used in suspend/resume.
author
Paul Mackerras
<paulus@samba.org>
Mon, 14 Nov 2005 10:56:57 +0000
(21:56 +1100)
committer
Paul Mackerras
<paulus@samba.org>
Tue, 15 Nov 2005 00:17:09 +0000
(11:17 +1100)
Suspend/resume on powermacs uses the pmac_get_boot_time function,
so it can't be marked as __init.
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/powermac/time.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/platforms/powermac/time.c
b/arch/powerpc/platforms/powermac/time.c
index
b1714f9
..
feb0a94
100644
(file)
--- 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) {