[Xen-changelog] [xen stable-4.4] Revert "tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125"

[patchbot@xxxxxxx]

commit 7062ac62f03fe22adeb4955f7323e20f5941a9da
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Jun 23 14:42:52 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Jun 23 14:42:52 2015 +0100

    Revert "tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following 
XSA-125"
    
    Revert mistakenly half-applied patch.
    
    This reverts commit a2895efbcde8c54f0c9d9a6808ace02fe58e6944.
---
 tools/libxc/xc_domain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 46eef92..40ca771 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -1669,7 +1669,7 @@ int xc_domain_memory_mapping(
     max_batch_sz = nr_mfns;
     do
     {
-        nr = min_t(unsigned long, nr_mfns - done, max_batch_sz);
+        nr = min(nr_mfns - done, max_batch_sz);
         domctl.u.memory_mapping.nr_mfns = nr;
         domctl.u.memory_mapping.first_gfn = first_gfn + done;
         domctl.u.memory_mapping.first_mfn = first_mfn + done;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.4

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog