From: tip-bot for Andres Salomon <dilinger@queued.net>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
dilinger@queued.net, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/urgent] x86: use __ASSEMBLY__ rather than __ASSEMBLER__
Date: Tue, 8 Jun 2010 01:01:00 GMT [thread overview]
Message-ID: <tip-fc4ac7a5f5996712d9123ae4850948c640edb315@git.kernel.org> (raw)
In-Reply-To: <20100605114042.35ac69c1@dev.queued.net>
Commit-ID: fc4ac7a5f5996712d9123ae4850948c640edb315
Gitweb: http://git.kernel.org/tip/fc4ac7a5f5996712d9123ae4850948c640edb315
Author: Andres Salomon <dilinger@queued.net>
AuthorDate: Sat, 5 Jun 2010 11:40:42 -0400
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 7 Jun 2010 17:27:11 -0700
x86: use __ASSEMBLY__ rather than __ASSEMBLER__
As Ingo pointed out in a separate patch, we should be using __ASSEMBLY__.
Make that the case in pgtable headers.
Signed-off-by: Andres Salomon <dilinger@queued.net>
LKML-Reference: <20100605114042.35ac69c1@dev.queued.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/include/asm/pgtable_32_types.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
index 5e67c15..ed5903b 100644
--- a/arch/x86/include/asm/pgtable_32_types.h
+++ b/arch/x86/include/asm/pgtable_32_types.h
@@ -26,7 +26,7 @@
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
-#ifndef __ASSEMBLER__
+#ifndef __ASSEMBLY__
extern bool __vmalloc_start_set; /* set once high_memory is set */
#endif
prev parent reply other threads:[~2010-06-08 1:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 15:40 [PATCH] " Andres Salomon
2010-06-08 1:01 ` tip-bot for Andres Salomon [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-fc4ac7a5f5996712d9123ae4850948c640edb315@git.kernel.org \
--to=dilinger@queued.net \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.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
all inboxes | Powered by JetHome®