From: Ross Lagerwall <ross.lagerwall@citrix.com>
Date: Wed, 20 Jan 2016 13:48:46 +0000 (+0000)
Subject: Revert "Add 64 bytes of padding to xsplice_patch_funcs structure"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c88a9450c1b688d6bbc91c34e4b2619fd08915c2;p=livepatch-build-tools.git

Revert "Add 64 bytes of padding to xsplice_patch_funcs structure"

This reverts commit be95e2474439fbdddcd347e7ea1bd3a842927351.
It doesn't match the hypervisor structure layout in the latest xsplice
code.
---

diff --git a/common.h b/common.h
index 1d74488..a6eb924 100644
--- a/common.h
+++ b/common.h
@@ -122,7 +122,7 @@ struct xsplice_patch_func {
 	unsigned long old_addr;
 	unsigned long old_size;
 	char *name;
-	unsigned char pad[64];
+	unsigned char undo[8];
 };
 
 struct special_section {
diff --git a/create-diff-object.c b/create-diff-object.c
index 6153e7b..92ad48a 100644
--- a/create-diff-object.c
+++ b/create-diff-object.c
@@ -1677,7 +1677,7 @@ static void xsplice_create_patches_sections(struct kpatch_elf *kelf,
 			funcs[index].old_size = result.size;
 			funcs[index].new_addr = 0;
 			funcs[index].new_size = sym->sym.st_size;
-			memset(funcs[index].pad, 0, sizeof funcs[index].pad);
+			memset(funcs[index].undo, 0, sizeof funcs[index].undo);
 
 			/*
 			 * Add a relocation that will populate