Commit 03c8142b authored by Ian Campbell's avatar Ian Campbell Committed by Stefano Stabellini
Browse files

xen: suspend: add "arch" to pre/post suspend hooks 



xen_pre_device_suspend is unused on ia64.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 36b401e2

arch/ia64/xen/suspend.c

+2 −7
Original line number Diff line number Diff line
@@ -37,19 +37,14 @@ xen_mm_unpin_all(void) 
	/* nothing */

}



void xen_pre_device_suspend(void)

{

	/* nothing */

}



void

xen_pre_suspend()

xen_arch_pre_suspend()

{

	/* nothing */

}



void

xen_post_suspend(int suspend_cancelled)

xen_arch_post_suspend(int suspend_cancelled)

{

	if (suspend_cancelled)

		return;

arch/x86/xen/suspend.c

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "xen-ops.h"

#include "mmu.h"



void xen_pre_suspend(void)

void xen_arch_pre_suspend(void)

{

	xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);

	xen_start_info->console.domU.mfn =
@@ -26,7 +26,7 @@ void xen_pre_suspend(void) 
		BUG();

}



void xen_hvm_post_suspend(int suspend_cancelled)

void xen_arch_hvm_post_suspend(int suspend_cancelled)

{

#ifdef CONFIG_XEN_PVHVM

	int cpu;
@@ -41,7 +41,7 @@ void xen_hvm_post_suspend(int suspend_cancelled) 
#endif

}



void xen_post_suspend(int suspend_cancelled)

void xen_arch_post_suspend(int suspend_cancelled)

{

	xen_build_mfn_list_list();

drivers/xen/manage.c

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int xen_hvm_suspend(void *data) 
	 */

	si->cancelled = HYPERVISOR_suspend(si->arg);



	xen_hvm_post_suspend(si->cancelled);

	xen_arch_hvm_post_suspend(si->cancelled);

	gnttab_resume();



	if (!si->cancelled) {
@@ -91,7 +91,7 @@ static int xen_suspend(void *data) 


	xen_mm_pin_all();

	gnttab_suspend();

	xen_pre_suspend();

	xen_arch_pre_suspend();



	/*

	 * This hypercall returns 1 if suspend was cancelled
@@ -100,7 +100,7 @@ static int xen_suspend(void *data) 
	 */

	si->cancelled = HYPERVISOR_suspend(si->arg);



	xen_post_suspend(si->cancelled);

	xen_arch_post_suspend(si->cancelled);

	gnttab_resume();

	xen_mm_unpin_all();

include/xen/xen-ops.h

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 


DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);



void xen_pre_suspend(void);

void xen_post_suspend(int suspend_cancelled);

void xen_hvm_post_suspend(int suspend_cancelled);

void xen_arch_pre_suspend(void);

void xen_arch_post_suspend(int suspend_cancelled);

void xen_arch_hvm_post_suspend(int suspend_cancelled);



void xen_mm_pin_all(void);

void xen_mm_unpin_all(void);