Commit aaa119a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  fix XEN_SAVE_RESTORE Kconfig dependencies
  PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
parents 6faf9a54 d419e4c0

arch/powerpc/kernel/ibmebus.c

+3 −3
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int ibmebus_bus_pm_resume_noirq(struct device *dev) 


#endif /* !CONFIG_SUSPEND */



#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATE_CALLBACKS



static int ibmebus_bus_pm_freeze(struct device *dev)

{
@@ -665,7 +665,7 @@ static int ibmebus_bus_pm_restore_noirq(struct device *dev) 
	return ret;

}



#else /* !CONFIG_HIBERNATION */

#else /* !CONFIG_HIBERNATE_CALLBACKS */



#define ibmebus_bus_pm_freeze		NULL

#define ibmebus_bus_pm_thaw		NULL
@@ -676,7 +676,7 @@ static int ibmebus_bus_pm_restore_noirq(struct device *dev) 
#define ibmebus_bus_pm_poweroff_noirq	NULL

#define ibmebus_bus_pm_restore_noirq	NULL



#endif /* !CONFIG_HIBERNATION */

#endif /* !CONFIG_HIBERNATE_CALLBACKS */



static struct dev_pm_ops ibmebus_bus_dev_pm_ops = {

	.prepare = ibmebus_bus_pm_prepare,

arch/x86/xen/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ config XEN_MAX_DOMAIN_MEMORY 
config XEN_SAVE_RESTORE

       bool

       depends on XEN

       select HIBERNATE_CALLBACKS

       default y



config XEN_DEBUG_FS

drivers/amba/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int amba_pm_resume_noirq(struct device *dev) 


#endif /* !CONFIG_SUSPEND */



#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATE_CALLBACKS



static int amba_pm_freeze(struct device *dev)

{
@@ -352,7 +352,7 @@ static int amba_pm_restore_noirq(struct device *dev) 
	return ret;

}



#else /* !CONFIG_HIBERNATION */

#else /* !CONFIG_HIBERNATE_CALLBACKS */



#define amba_pm_freeze		NULL

#define amba_pm_thaw		NULL
@@ -363,7 +363,7 @@ static int amba_pm_restore_noirq(struct device *dev) 
#define amba_pm_poweroff_noirq	NULL

#define amba_pm_restore_noirq	NULL



#endif /* !CONFIG_HIBERNATION */

#endif /* !CONFIG_HIBERNATE_CALLBACKS */



#ifdef CONFIG_PM

drivers/base/platform.c

+3 −3
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ int __weak platform_pm_resume_noirq(struct device *dev) 


#endif /* !CONFIG_SUSPEND */



#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATE_CALLBACKS



static int platform_pm_freeze(struct device *dev)

{
@@ -910,7 +910,7 @@ static int platform_pm_restore_noirq(struct device *dev) 
	return ret;

}



#else /* !CONFIG_HIBERNATION */

#else /* !CONFIG_HIBERNATE_CALLBACKS */



#define platform_pm_freeze		NULL

#define platform_pm_thaw		NULL
@@ -921,7 +921,7 @@ static int platform_pm_restore_noirq(struct device *dev) 
#define platform_pm_poweroff_noirq	NULL

#define platform_pm_restore_noirq	NULL



#endif /* !CONFIG_HIBERNATION */

#endif /* !CONFIG_HIBERNATE_CALLBACKS */



#ifdef CONFIG_PM_RUNTIME

drivers/base/power/main.c

+4 −4
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int pm_op(struct device *dev, 
		}

		break;

#endif /* CONFIG_SUSPEND */

#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATE_CALLBACKS

	case PM_EVENT_FREEZE:

	case PM_EVENT_QUIESCE:

		if (ops->freeze) {
@@ -260,7 +260,7 @@ static int pm_op(struct device *dev, 
			suspend_report_result(ops->restore, error);

		}

		break;

#endif /* CONFIG_HIBERNATION */

#endif /* CONFIG_HIBERNATE_CALLBACKS */

	default:

		error = -EINVAL;

	}
@@ -308,7 +308,7 @@ static int pm_noirq_op(struct device *dev, 
		}

		break;

#endif /* CONFIG_SUSPEND */

#ifdef CONFIG_HIBERNATION

#ifdef CONFIG_HIBERNATE_CALLBACKS

	case PM_EVENT_FREEZE:

	case PM_EVENT_QUIESCE:

		if (ops->freeze_noirq) {
@@ -335,7 +335,7 @@ static int pm_noirq_op(struct device *dev, 
			suspend_report_result(ops->restore_noirq, error);

		}

		break;

#endif /* CONFIG_HIBERNATION */

#endif /* CONFIG_HIBERNATE_CALLBACKS */

	default:

		error = -EINVAL;

	}