# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID a06fdf9a1ea4c6553161007846758b92825d82a6
# Parent  94f1712d98019c10a47b7a38739934e33a8d13c1
A few clean ups in __xen_create/destroy_contiguous_region.
This is the IA64 counter part of the C/S
10563:a75c1bdfe76146ad591574d805be5be0a3098d2a of xen-unstable.hg
PATCHNAME: clean_up_xen_create_destroy_contiguous_region

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 94f1712d9801 -r a06fdf9a1ea4 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Mon Jul 03 11:34:32 2006 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Mon Jul 03 11:34:35 2006 +0900
@@ -198,7 +198,7 @@ __xen_create_contiguous_region(unsigned 
 		.nr_exchanged = 0
 	};
 
-	if (order > MAX_CONTIG_ORDER)
+	if (unlikely(order > MAX_CONTIG_ORDER))
 		return -ENOMEM;
 	
 	set_xen_guest_handle(exchange.in.extent_start, in_frames);
@@ -299,7 +299,7 @@ __xen_destroy_contiguous_region(unsigned
 	if (!test_bit(start_gpfn, contiguous_bitmap))
 		return;
 
-	if (order > MAX_CONTIG_ORDER)
+	if (unlikely(order > MAX_CONTIG_ORDER))
 		return;
 
 	set_xen_guest_handle(exchange.in.extent_start, &in_frame);