On Mon, 2014-05-19 at 11:50 -0600, Ross Zwisler wrote: > A comment introduced by this 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.zwis...@linux.intel.com> > > Cc: Thomas Gleixner <t...@linutronix.de> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: "H. Peter Anvin" <h...@zytor.com> > Cc: x...@kernel.org > --- > arch/x86/include/uapi/asm/e820.h | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/arch/x86/include/uapi/asm/e820.h > b/arch/x86/include/uapi/asm/e820.h > index bbae024..d993e33 100644 > --- a/arch/x86/include/uapi/asm/e820.h > +++ b/arch/x86/include/uapi/asm/e820.h > @@ -21,11 +21,6 @@ > * this size. > */ > > -/* > - * Odd: 'make headers_check' complains about numa.h if I try > - * to collapse the next two #ifdef lines to a single line: > - * #if defined(__KERNEL__) && defined(CONFIG_EFI) > - */ > #ifndef __KERNEL__ > #define E820_X_MAX E820MAX > #endif
Ping. :) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/