There's an outer scope rc already, and its use for the mem-sharing logic does not conflict with its use elsewhere in the function.
Signed-off-by: Jan Beulich <jbeul...@suse.com> --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -905,7 +905,6 @@ guest_physmap_add_entry(struct domain *d if ( p2m_is_shared(ot) ) { /* Do an unshare to cleanly take care of all corner cases. */ - int rc; rc = mem_sharing_unshare_page(p2m->domain, gfn_x(gfn_add(gfn, i))); if ( rc ) {