Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37cce26b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Rafael J. Wysocki
Browse files

PM / VT: Cleanup #if defined uglyness and fix compile error 



Introduce the config option CONFIG_VT_CONSOLE_SLEEP in order to cleanup
the #if defined ugliness for the vt suspend support functions. Note that
CONFIG_VT_CONSOLE is already dependant on CONFIG_VT.

The function pm_set_vt_switch is actually dependant on CONFIG_VT and not
CONFIG_PM_SLEEP. This fixes a compile error when CONFIG_PM_SLEEP is
not set:

drivers/tty/vt/vt_ioctl.c:1794: error: redefinition of 'pm_set_vt_switch'
include/linux/suspend.h:17: error: previous definition of 'pm_set_vt_switch' was here

Also, remove the incorrect path from the comment in console.c.

[rjw: Replaced #if defined() with #ifdef in suspend.h.]

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 528f7ce6

drivers/tty/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ config VT_CONSOLE 


	  If unsure, say Y.



config VT_CONSOLE_SLEEP

	def_bool y

	depends on VT_CONSOLE && PM_SLEEP



config HW_CONSOLE

	bool

	depends on VT && !S390 && !UML

include/linux/suspend.h

+6 −3
Original line number Diff line number Diff line
@@ -8,15 +8,18 @@ 
#include <linux/mm.h>

#include <asm/errno.h>



#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)

#ifdef CONFIG_VT

extern void pm_set_vt_switch(int);

extern int pm_prepare_console(void);

extern void pm_restore_console(void);

#else

static inline void pm_set_vt_switch(int do_switch)

{

}

#endif



#ifdef CONFIG_VT_CONSOLE_SLEEP

extern int pm_prepare_console(void);

extern void pm_restore_console(void);

#else

static inline int pm_prepare_console(void)

{

	return 0;

kernel/power/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
ccflags-$(CONFIG_PM_DEBUG)	:= -DDEBUG



obj-$(CONFIG_PM)		+= main.o qos.o

obj-$(CONFIG_PM_SLEEP)		+= console.o

obj-$(CONFIG_VT_CONSOLE_SLEEP)	+= console.o

obj-$(CONFIG_FREEZER)		+= process.o

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_PM_TEST_SUSPEND)	+= suspend_test.o

kernel/power/console.c

+1 −3
Original line number Diff line number Diff line 
/*

 * drivers/power/process.c - Functions for saving/restoring console.

 * Functions for saving/restoring console.

 *

 * Originally from swsusp.

 */
@@ -10,7 +10,6 @@ 
#include <linux/module.h>

#include "power.h"



#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)

#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)



static int orig_fgconsole, orig_kmsg;
@@ -32,4 +31,3 @@ void pm_restore_console(void) 
		vt_kmsg_redirect(orig_kmsg);

	}

}
 
#endif