[PATCH] Fix build failure in recent pm_prepare_* changes.
Fix compilation problem in PM headers. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
7b4fe29e00
commit
46cd2f32ba
@@ -42,13 +42,21 @@ extern void mark_free_pages(struct zone *zone);
|
||||
#ifdef CONFIG_PM
|
||||
/* kernel/power/swsusp.c */
|
||||
extern int software_suspend(void);
|
||||
|
||||
#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
|
||||
extern int pm_prepare_console(void);
|
||||
extern void pm_restore_console(void);
|
||||
#else
|
||||
static inline int pm_prepare_console(void) { return 0; }
|
||||
static inline void pm_restore_console(void) {}
|
||||
#endif /* defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) */
|
||||
#else
|
||||
static inline int software_suspend(void)
|
||||
{
|
||||
printk("Warning: fake suspend called\n");
|
||||
return -EPERM;
|
||||
}
|
||||
#endif
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
#ifdef CONFIG_SUSPEND_SMP
|
||||
extern void disable_nonboot_cpus(void);
|
||||
|
Reference in New Issue
Block a user