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 --- No ARM counterpart, as Julien means to remove the macro anyway. --- 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 * #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))