Merge branch 'master' into tk71

[mv-sheeva.git] / arch / ia64 / xen / xen_pv_ops.c

diff --git a/arch/ia64/xen/xen_pv_ops.c b/arch/ia64/xen/xen_pv_ops.c
index 8adc6a14272abb990a104017eba40bf88aa2ebd0..3e8d350fdf39bf6bcdfaf314dd0cd5c9b0a0c4a9 100644 (file)
--- a/arch/ia64/xen/xen_pv_ops.c
+++ b/arch/ia64/xen/xen_pv_ops.c
@@ -1136,7 +1136,6 @@ __initconst = {
 static void __init
 xen_patch_branch(unsigned long tag, unsigned long type)
 {
-       const unsigned long nelem =
-               sizeof(xen_branch_target) / sizeof(xen_branch_target[0]);
-       __paravirt_patch_apply_branch(tag, type, xen_branch_target, nelem);
+       __paravirt_patch_apply_branch(tag, type, xen_branch_target,
+                                       ARRAY_SIZE(xen_branch_target));
 }