From 3ef0c620a15994097e3e30d2ba4a90afb39d17fe Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 4 Aug 2017 03:13:26 -0400
Subject: [PATCH] Fix ppc64el build failure, by not redefining
 AT_VECTOR_SIZE_ARCH

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1477803

Backport of following commit on the 2.12 release:

commit c10e0d215412edac55e941f57cc4ba80422968dd
Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date:   Wed Jul 5 12:50:07 2017 +0200

    Fix ppc64el build failure, by not redefining AT_VECTOR_SIZE_ARCH

    This fixes the ppc64el build failure
      CC       criu/arch/ppc64/sigframe.o
    In file included from criu/arch/ppc64/sigframe.c:5:0:
    criu/arch/ppc64/include/asm/types.h:32:0: error: "AT_VECTOR_SIZE_ARCH" redefined [-Werror]
     #define AT_VECTOR_SIZE_ARCH 6

    Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/ppc64/include/asm/infect-types.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/arch/ppc64/include/asm/infect-types.h b/criu/arch/ppc64/include/asm/infect-types.h
index 1969ca2..e07bf1e 100644
--- a/criu/arch/ppc64/include/asm/infect-types.h
+++ b/criu/arch/ppc64/include/asm/infect-types.h
@@ -83,7 +83,9 @@ typedef struct {
  *	include/linux/mm_types.h
  */
 #define AT_VECTOR_SIZE_BASE	20
+#if !defined AT_VECTOR_SIZE_ARCH
 #define AT_VECTOR_SIZE_ARCH	6
+#endif
 #define AT_VECTOR_SIZE		(2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
 
 typedef uint64_t auxv_t;
-- 
1.8.3.1