diff mbox

pm: provide stubs for PM VT console switch routines

Message ID 1360945078-27865-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Jesse Barnes Feb. 15, 2013, 4:17 p.m. UTC 
If PM_SLEEP is disabled, we need stub versions of these functions.

v2: fix up struct device forward decl.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 include/linux/pm.h |    9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Daniel Vetter Feb. 15, 2013, 5 p.m. UTC | #1 
On Fri, Feb 15, 2013 at 08:17:58AM -0800, Jesse Barnes wrote:
> If PM_SLEEP is disabled, we need stub versions of these functions.
> 
> v2: fix up struct device forward decl.
> 
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Ok, squashed into the old commit and tested. The trick is to disable
HIBERNATE and XEN support (since disabling VT_CONSOLE will also kill fbdev
support and so drm).
-Daniel

> ---
>  include/linux/pm.h |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/include/linux/pm.h b/include/linux/pm.h
> index 98310eb..e5da2f3 100644
> --- a/include/linux/pm.h
> +++ b/include/linux/pm.h
> @@ -36,8 +36,17 @@ extern void (*pm_power_off)(void);
>  extern void (*pm_power_off_prepare)(void);
>  
>  struct device; /* we have a circular dep with device.h */
> +#ifdef CONFIG_VT_CONSOLE_SLEEP
>  extern void pm_vt_switch_required(struct device *dev, bool required);
>  extern void pm_vt_switch_unregister(struct device *dev);
> +#else
> +static inline void pm_vt_switch_required(struct device *dev, bool required)
> +{
> +}
> +static inline void pm_vt_switch_unregister(struct device *dev)
> +{
> +}
> +#endif /* CONFIG_VT_CONSOLE_SLEEP */
>  
>  /*
>   * Device power management
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 98310eb..e5da2f3 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -36,8 +36,17 @@  extern void (*pm_power_off)(void);
 extern void (*pm_power_off_prepare)(void);
 
 struct device; /* we have a circular dep with device.h */
+#ifdef CONFIG_VT_CONSOLE_SLEEP
 extern void pm_vt_switch_required(struct device *dev, bool required);
 extern void pm_vt_switch_unregister(struct device *dev);
+#else
+static inline void pm_vt_switch_required(struct device *dev, bool required)
+{
+}
+static inline void pm_vt_switch_unregister(struct device *dev)
+{
+}
+#endif /* CONFIG_VT_CONSOLE_SLEEP */
 
 /*
  * Device power management