[Xen-changelog] [xen master] x86: partially undo "fix build with gcc 7"

[patchbot@xxxxxxx]

commit d6d6e4a19dc16f6d82ab9dec0f177f2105ab97ac
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Jun 1 10:50:25 2017 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jun 1 10:50:25 2017 +0200

    x86: partially undo "fix build with gcc 7"
    
    While f32400e90c ("x86: fix build with gcc 7")'s change to
    compat_array_access_ok() is necessary, I had blindly and needlessly
    also added it to array_access_ok(). There's no conditional expression
    involved there, so undo it.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/include/asm-x86/x86_64/uaccess.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/include/asm-x86/x86_64/uaccess.h 
b/xen/include/asm-x86/x86_64/uaccess.h
index 083ea9d..d7dad4f 100644
--- a/xen/include/asm-x86/x86_64/uaccess.h
+++ b/xen/include/asm-x86/x86_64/uaccess.h
@@ -42,7 +42,7 @@ extern void *xlat_malloc(unsigned long *xlat_page_current, 
size_t size);
 
 #define array_access_ok(addr, count, size) \
     (likely(((count) ?: 0UL) < (~0UL / (size))) && \
-     access_ok(addr, 0 + (count) * (size)))
+     access_ok(addr, (count) * (size)))
 
 #define __compat_addr_ok(d, addr) \
     ((unsigned long)(addr) < HYPERVISOR_COMPAT_VIRT_START(d))
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog