Commit 3f100dd6 authored by Pengpeng Hou's avatar Pengpeng Hou Committed by Juergen Gross
Browse files

xen/grant-table: guard gnttab_suspend/resume with CONFIG_HIBERNATE_CALLBACKS 



In current linux.git, gnttab_suspend() and gnttab_resume() are defined
and declared unconditionally. However, their only in-tree callers reside
in drivers/xen/manage.c, which are guarded by CONFIG_HIBERNATE_CALLBACKS.

Match the helper scope to their callers by wrapping the definitions in
CONFIG_HIBERNATE_CALLBACKS and providing no-op stubs in the header. This
fixes the config-scope mismatch and reduces the code footprint when
hibernation callbacks are disabled.

Signed-off-by: default avatarPengpeng Hou <pengpeng.hou@isrc.iscas.ac.cn>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Message-ID: <20260310080800.742223-1-pengpeng.hou@isrc.iscas.ac.cn>
parent bdd5de3d

drivers/xen/grant-table.c

+2 −1
Original line number Diff line number Diff line
@@ -1579,7 +1579,7 @@ static int gnttab_setup(void) 
	}

	return gnttab_map(0, nr_grant_frames - 1);

}



#ifdef CONFIG_HIBERNATE_CALLBACKS

int gnttab_resume(void)

{

	gnttab_request_version();
@@ -1592,6 +1592,7 @@ int gnttab_suspend(void) 
		gnttab_interface->unmap_frames();

	return 0;

}

#endif



static int gnttab_expand(unsigned int req_entries)

{

include/xen/grant_table.h

+12 −0
Original line number Diff line number Diff line
@@ -84,8 +84,20 @@ struct gntab_unmap_queue_data 
};



int gnttab_init(void);

#ifdef CONFIG_HIBERNATE_CALLBACKS

int gnttab_suspend(void);

int gnttab_resume(void);

#else

static inline int gnttab_suspend(void)

{

	return 0;

}



static inline int gnttab_resume(void)

{

	return 0;

}

#endif



int gnttab_grant_foreign_access(domid_t domid, unsigned long frame,

				int readonly);