Re: [dm-devel] [PATCH] multipath-tools: sync third-party headers with 3.13 upstream

[Christophe Varoqui]

Merged.
Thanks.

On Wed, Jun 21, 2017 at 5:14 PM, Bart Van Assche 
wrote:

> On Wed, 2017-06-21 at 14:26 +0200, Xose Vazquez Perez wrote:
> > Cc: Bart Van Assche 
> > Cc: Christophe Varoqui 
> > Cc: device-mapper development 
> > Signed-off-by: Xose Vazquez Perez 
>
> Reviewed-by: Bart Van Assche 
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

Re: [dm-devel] [PATCH] multipath-tools: sync third-party headers with 3.13 upstream

[Bart Van Assche]

On Wed, 2017-06-21 at 14:26 +0200, Xose Vazquez Perez wrote:
> Cc: Bart Van Assche 
> Cc: Christophe Varoqui 
> Cc: device-mapper development 
> Signed-off-by: Xose Vazquez Perez 

Reviewed-by: Bart Van Assche 

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

[dm-devel] [PATCH] multipath-tools: sync third-party headers with 3.13 upstream

[Xose Vazquez Perez]

Cc: Bart Van Assche 
Cc: Christophe Varoqui 
Cc: device-mapper development 
Signed-off-by: Xose Vazquez Perez 
---
 third-party/valgrind/drd.h  |   2 +-
 third-party/valgrind/valgrind.h | 556 ++--
 2 files changed, 21 insertions(+), 537 deletions(-)

diff --git a/third-party/valgrind/drd.h b/third-party/valgrind/drd.h
index 4615e5b..d63b3dd 100644
--- a/third-party/valgrind/drd.h
+++ b/third-party/valgrind/drd.h
@@ -12,7 +12,7 @@
   This file is part of DRD, a Valgrind tool for verification of
   multithreaded programs.
 
-  Copyright (C) 2006-2015 Bart Van Assche .
+  Copyright (C) 2006-2017 Bart Van Assche .
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
diff --git a/third-party/valgrind/valgrind.h b/third-party/valgrind/valgrind.h
index 6892007..5aed0df 100644
--- a/third-party/valgrind/valgrind.h
+++ b/third-party/valgrind/valgrind.h
@@ -12,7 +12,7 @@
This file is part of Valgrind, a dynamic binary instrumentation
framework.
 
-   Copyright (C) 2000-2015 Julian Seward.  All rights reserved.
+   Copyright (C) 2000-2017 Julian Seward.  All rights reserved.
 
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -89,7 +89,7 @@
 || (__VALGRIND_MAJOR__ == 3 && __VALGRIND_MINOR__ >= 6))
 */
 #define __VALGRIND_MAJOR__3
-#define __VALGRIND_MINOR__12
+#define __VALGRIND_MINOR__13
 
 
 #include 
@@ -122,7 +122,6 @@
 #undef PLAT_s390x_linux
 #undef PLAT_mips32_linux
 #undef PLAT_mips64_linux
-#undef PLAT_tilegx_linux
 #undef PLAT_x86_solaris
 #undef PLAT_amd64_solaris
 
@@ -160,8 +159,6 @@
 #  define PLAT_mips64_linux 1
 #elif defined(__linux__) && defined(__mips__) && (__mips!=64)
 #  define PLAT_mips32_linux 1
-#elif defined(__linux__) && defined(__tilegx__)
-#  define PLAT_tilegx_linux 1
 #elif defined(__sun) && defined(__i386__)
 #  define PLAT_x86_solaris 1
 #elif defined(__sun) && defined(__x86_64__)
@@ -1048,73 +1045,6 @@ typedef
 
 #endif /* PLAT_mips64_linux */
 
-/*  tilegx-linux --- */
-#if defined(PLAT_tilegx_linux)
-
-typedef
-   struct {
-  unsigned long long int nraddr; /* where's the code? */
-   }
-   OrigFn;
-/*** special instruction sequence.
- 0:02b3c7ff91234fff { moveli zero, 4660 ; moveli zero, 22136 }
- 8:0091a7ff95678fff { moveli zero, 22136 ; moveli zero, 4660 }
-/
-
-#define __SPECIAL_INSTRUCTION_PREAMBLE \
-   ".quad  0x02b3c7ff91234fff\n"   \
-   ".quad  0x0091a7ff95678fff\n"
-
-#define VALGRIND_DO_CLIENT_REQUEST_EXPR(   \
-   _zzq_default, _zzq_request,  \
-   _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)  \
-   ({ volatile unsigned long long int _zzq_args[6];\
-  volatile unsigned long long int _zzq_result; \
-  _zzq_args[0] = (unsigned long long int)(_zzq_request);   \
-  _zzq_args[1] = (unsigned long long int)(_zzq_arg1);  \
-  _zzq_args[2] = (unsigned long long int)(_zzq_arg2);  \
-  _zzq_args[3] = (unsigned long long int)(_zzq_arg3);  \
-  _zzq_args[4] = (unsigned long long int)(_zzq_arg4);  \
-  _zzq_args[5] = (unsigned long long int)(_zzq_arg5);  \
-  __asm__ volatile("move r11, %1\n\t" /*default*/  \
-   "move r12, %2\n\t" /*ptr*/  \
-   __SPECIAL_INSTRUCTION_PREAMBLE  \
-   /* r11 = client_request */  \
-   "or r13, r13, r13\n\t"  \
-   "move %0, r11\n\t" /*result*/   \
-   : "=r" (_zzq_result)\
-   : "r" (_zzq_default), "r" (&_zzq_args[0])   \
-   : "memory", "r11", "r12");  \
-  _zzq_result; \
-   })
-
-#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)\
-   {  volatile OrigFn* _zzq_orig = &(_zzq_rlval);  \
-  volatile unsigned long long int __addr;  \
-  __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE  \
-   /* r11 = guest_NRADDR */\
-   "or r14, r14, r14\n"\
-   "move %0, r11\n"\
-   : "=r" (__addr) \
-   :   \
-   : "memory", "r11"   \
-