]> xenbits.xensource.com Git - people/wipawel/livepatch-build-tools/commitdiff
Revert "Add 64 bytes of padding to xsplice_patch_funcs structure"
authorRoss Lagerwall <ross.lagerwall@citrix.com>
Wed, 20 Jan 2016 13:48:46 +0000 (13:48 +0000)
committerRoss Lagerwall <ross.lagerwall@citrix.com>
Wed, 20 Jan 2016 13:48:46 +0000 (13:48 +0000)
This reverts commit be95e2474439fbdddcd347e7ea1bd3a842927351.
It doesn't match the hypervisor structure layout in the latest xsplice
code.

common.h
create-diff-object.c

index 1d74488f52d2c438a8c9410bb1ffa6d27c7e80bc..a6eb92413104d2d52af21b2fd3838f514300b628 100644 (file)
--- 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 {
index 6153e7b495cf0e3c3ccfb691daa6a17335ec6bc4..92ad48ad68ffd0f2bc58eff5e4028d06d43910ef 100644 (file)
@@ -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