x86: consolidate header guards

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / asm-x86 / srat.h

diff --git a/include/asm-x86/srat.h b/include/asm-x86/srat.h
index f4bba131d0686733a7060f6d4227977fdf6c2588..5363e4f7e1cddb7b52f0db52be72eb185f5a2a5a 100644 (file)
--- a/include/asm-x86/srat.h
+++ b/include/asm-x86/srat.h
@@ -24,14 +24,16 @@
  * Send feedback to Pat Gaughen <gone@us.ibm.com>
  */
 
-#ifndef _ASM_SRAT_H_
-#define _ASM_SRAT_H_
-
-#ifndef CONFIG_ACPI_SRAT
-#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
-#endif
+#ifndef ASM_X86__SRAT_H
+#define ASM_X86__SRAT_H
 
+#ifdef CONFIG_ACPI_NUMA
 extern int get_memcfg_from_srat(void);
-extern unsigned long *get_zholes_size(int);
+#else
+static inline int get_memcfg_from_srat(void)
+{
+       return 0;
+}
+#endif
 
-#endif /* _ASM_SRAT_H_ */
+#endif /* ASM_X86__SRAT_H */