From: tip-bot for Ross Zwisler <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
ross.zwisler@linux.intel.com, tglx@linutronix.de
Subject: [tip:x86/cleanups] x86: Remove obsolete comment in uapi/e820.h
Date: Wed, 20 Aug 2014 23:45:36 -0700 [thread overview]
Message-ID: <tip-448466b723cc7b44016547116aa2b55a3736f1f0@git.kernel.org> (raw)
In-Reply-To: <1400521824-21040-1-git-send-email-ross.zwisler@linux.intel.com>
Commit-ID: 448466b723cc7b44016547116aa2b55a3736f1f0
Gitweb: http://git.kernel.org/tip/448466b723cc7b44016547116aa2b55a3736f1f0
Author: Ross Zwisler <ross.zwisler@linux.intel.com>
AuthorDate: Mon, 19 May 2014 11:50:24 -0600
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 21 Aug 2014 08:43:39 +0200
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>
---
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
prev parent reply other threads:[~2014-08-21 6:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 17:50 [PATCH] x86: remove " Ross Zwisler
2014-08-20 20:25 ` Ross Zwisler
2014-08-21 6:45 ` tip-bot for Ross Zwisler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-448466b723cc7b44016547116aa2b55a3736f1f0@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=ross.zwisler@linux.intel.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome