aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Zwisler <ross.zwisler@linux.intel.com>2014-05-19 13:50:24 -0400
committerIngo Molnar <mingo@kernel.org>2014-08-21 02:43:39 -0400
commit448466b723cc7b44016547116aa2b55a3736f1f0 (patch)
tree43694d729a3f22547d647ea3f5761a693d7061ce
parent98a96f202203fecad65b44449077c695686ad4db (diff)
x86: Remove obsolete comment in uapi/e820.h
A comment introduced by this old commit: 028b785888c5 ("x86 boot: extend some internal memory map arrays to handle larger EFI input") had to do with some nested preprocessor directives. The directives were split into separate files by this commit: af170c5061dd ("UAPI: (Scripted) Disintegrate arch/x86/include/asm") The comment explaining their interaction was retained and is now present in arch/x86/include/uapi/asm/e820.h. This comment is no longer correct, so delete it. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Link: http://lkml.kernel.org/r/1400521824-21040-1-git-send-email-ross.zwisler@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/include/uapi/asm/e820.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
index bbae02470701..d993e33f5236 100644
--- a/arch/x86/include/uapi/asm/e820.h
+++ b/arch/x86/include/uapi/asm/e820.h
@@ -21,11 +21,6 @@
21 * this size. 21 * this size.
22 */ 22 */
23 23
24/*
25 * Odd: 'make headers_check' complains about numa.h if I try
26 * to collapse the next two #ifdef lines to a single line:
27 * #if defined(__KERNEL__) && defined(CONFIG_EFI)
28 */
29#ifndef __KERNEL__ 24#ifndef __KERNEL__
30#define E820_X_MAX E820MAX 25#define E820_X_MAX E820MAX
31#endif 26#endif