[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-fc4ac7a5f5996712d9123ae4850948c640edb315@git.kernel.org>
Date: Tue, 8 Jun 2010 01:01:00 GMT
From: tip-bot for Andres Salomon <dilinger@...ued.net>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
dilinger@...ued.net, tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/urgent] x86: use __ASSEMBLY__ rather than __ASSEMBLER__
Commit-ID: fc4ac7a5f5996712d9123ae4850948c640edb315
Gitweb: http://git.kernel.org/tip/fc4ac7a5f5996712d9123ae4850948c640edb315
Author: Andres Salomon <dilinger@...ued.net>
AuthorDate: Sat, 5 Jun 2010 11:40:42 -0400
Committer: H. Peter Anvin <hpa@...ux.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@...ued.net>
LKML-Reference: <20100605114042.35ac69c1@....queued.net>
Signed-off-by: H. Peter Anvin <hpa@...ux.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists