Updated headers related to live patching.

Signed-off-by: Frediano Ziglio <frediano.ziglio@cloud.com>
---
 xen/arch/x86/include/asm/livepatch.h | 6 +++---
 xen/include/xen/livepatch.h          | 6 +++---
 xen/include/xen/livepatch_elf.h      | 6 +++---
 xen/include/xen/livepatch_payload.h  | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xen/arch/x86/include/asm/livepatch.h b/xen/arch/x86/include/asm/livepatch.h
index 00aefd2d63..7f838f418d 100644
--- a/xen/arch/x86/include/asm/livepatch.h
+++ b/xen/arch/x86/include/asm/livepatch.h
@@ -3,8 +3,8 @@
  *
  */
 
-#ifndef __XEN_X86_LIVEPATCH_H__
-#define __XEN_X86_LIVEPATCH_H__
+#ifndef ASM__X86__LIVEPATCH_H
+#define ASM__X86__LIVEPATCH_H
 
 #include <xen/sizes.h> /* For SZ_* macros. */
 
@@ -12,7 +12,7 @@
 #define ARCH_LIVEPATCH_RANGE SZ_2G
 #define LIVEPATCH_FEATURE    X86_FEATURE_ALWAYS
 
-#endif /* __XEN_X86_LIVEPATCH_H__ */
+#endif /* ASM__X86__LIVEPATCH_H */
 
 /*
  * Local variables:
diff --git a/xen/include/xen/livepatch.h b/xen/include/xen/livepatch.h
index d074a5bebe..69220ece21 100644
--- a/xen/include/xen/livepatch.h
+++ b/xen/include/xen/livepatch.h
@@ -3,8 +3,8 @@
  *
  */
 
-#ifndef __XEN_LIVEPATCH_H__
-#define __XEN_LIVEPATCH_H__
+#ifndef XEN__LIVEPATCH_H
+#define XEN__LIVEPATCH_H
 
 struct livepatch_elf;
 struct livepatch_elf_sec;
@@ -167,7 +167,7 @@ static inline bool is_patch(const void *addr)
 }
 #endif /* CONFIG_LIVEPATCH */
 
-#endif /* __XEN_LIVEPATCH_H__ */
+#endif /* XEN__LIVEPATCH_H */
 
 /*
  * Local variables:
diff --git a/xen/include/xen/livepatch_elf.h b/xen/include/xen/livepatch_elf.h
index 842111e145..bb221aeaa0 100644
--- a/xen/include/xen/livepatch_elf.h
+++ b/xen/include/xen/livepatch_elf.h
@@ -2,8 +2,8 @@
  * Copyright (C) 2016 Citrix Systems R&D Ltd.
  */
 
-#ifndef __XEN_LIVEPATCH_ELF_H__
-#define __XEN_LIVEPATCH_ELF_H__
+#ifndef XEN__LIVEPATCH_ELF_H
+#define XEN__LIVEPATCH_ELF_H
 
 #include <xen/types.h>
 #include <xen/elfstructs.h>
@@ -52,7 +52,7 @@ static inline bool livepatch_elf_ignore_section(const Elf_Shdr *sec)
 {
     return !(sec->sh_flags & SHF_ALLOC);
 }
-#endif /* __XEN_LIVEPATCH_ELF_H__ */
+#endif /* XEN__LIVEPATCH_ELF_H */
 
 /*
  * Local variables:
diff --git a/xen/include/xen/livepatch_payload.h b/xen/include/xen/livepatch_payload.h
index c6dc7cb5fa..f35d8b9d83 100644
--- a/xen/include/xen/livepatch_payload.h
+++ b/xen/include/xen/livepatch_payload.h
@@ -2,8 +2,8 @@
  * Copyright (C) 2016 Citrix Systems R&D Ltd.
  */
 
-#ifndef __XEN_LIVEPATCH_PAYLOAD_H__
-#define __XEN_LIVEPATCH_PAYLOAD_H__
+#ifndef XEN__LIVEPATCH_PAYLOAD_H
+#define XEN__LIVEPATCH_PAYLOAD_H
 #include <xen/virtual_region.h>
 
 /* To contain the ELF Note header. */
@@ -140,7 +140,7 @@ struct payload {
     livepatch_actioncall_t *__attribute__((weak, used)) \
         const livepatch_revert_data_##_fn __section(".livepatch.hooks.revert") = _fn;
 
-#endif /* __XEN_LIVEPATCH_PAYLOAD_H__ */
+#endif /* XEN__LIVEPATCH_PAYLOAD_H */
 
 /*
  * Local variables:
-- 
2.34.1