| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 27 Dec 2010 16:48:37 -0800
From: Yinghai Lu <yinghai@...nel.org>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH 6/6] x86: Rename e820_table_* to pgt_buf_*
Now it is found from memblock way.
Change the name to purpose related.
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
---
arch/x86/include/asm/init.h | 6 +++---
arch/x86/mm/init.c | 20 ++++++++++----------
arch/x86/mm/init_32.c | 8 ++++----
arch/x86/mm/init_64.c | 4 ++--
arch/x86/xen/mmu.c | 2 +-
5 files changed, 20 insertions(+), 20 deletions(-)
Index: linux-2.6/arch/x86/include/asm/init.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/init.h
+++ linux-2.6/arch/x86/include/asm/init.h
@@ -11,8 +11,8 @@ kernel_physical_mapping_init(unsigned lo
unsigned long page_size_mask);
-extern unsigned long __meminitdata e820_table_start;
-extern unsigned long __initdata e820_table_end;
-extern unsigned long __meminitdata e820_table_bottom;
+extern unsigned long __meminitdata pgt_buf_start;
+extern unsigned long __initdata pgt_buf_end;
+extern unsigned long __meminitdata pgt_buf_bottom;
#endif /* _ASM_X86_INIT_32_H */
Index: linux-2.6/arch/x86/mm/init.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/init.c
+++ linux-2.6/arch/x86/mm/init.c
@@ -18,9 +18,9 @@
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-unsigned long __meminitdata e820_table_start;
-unsigned long __initdata e820_table_end;
-unsigned long __meminitdata e820_table_bottom;
+unsigned long __meminitdata pgt_buf_start;
+unsigned long __initdata pgt_buf_end;
+unsigned long __meminitdata pgt_buf_bottom;
int after_bootmem;
@@ -73,12 +73,12 @@ static void __init find_early_table_spac
if (base == MEMBLOCK_ERROR)
panic("Cannot find space for the kernel page tables");
- e820_table_start = (base + tables) >> PAGE_SHIFT;
- e820_table_end = e820_table_start;
- e820_table_bottom = base >> PAGE_SHIFT;
+ pgt_buf_start = (base + tables) >> PAGE_SHIFT;
+ pgt_buf_end = pgt_buf_start;
+ pgt_buf_bottom = base >> PAGE_SHIFT;
printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n",
- end, e820_table_bottom << PAGE_SHIFT, e820_table_end << PAGE_SHIFT);
+ end, pgt_buf_bottom << PAGE_SHIFT, pgt_buf_end << PAGE_SHIFT);
}
struct map_range {
@@ -272,9 +272,9 @@ unsigned long __init_refok init_memory_m
__flush_tlb_all();
- if (!after_bootmem && e820_table_end > e820_table_start)
- memblock_x86_reserve_range(e820_table_start << PAGE_SHIFT,
- e820_table_end << PAGE_SHIFT, "PGTABLE");
+ if (!after_bootmem && pgt_buf_end > pgt_buf_start)
+ memblock_x86_reserve_range(pgt_buf_start << PAGE_SHIFT,
+ pgt_buf_end << PAGE_SHIFT, "PGTABLE");
if (!after_bootmem)
early_memtest(start, end);
Index: linux-2.6/arch/x86/mm/init_32.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/init_32.c
+++ linux-2.6/arch/x86/mm/init_32.c
@@ -61,10 +61,10 @@ bool __read_mostly __vmalloc_start_set =
static __init void *alloc_low_page(void)
{
- unsigned long pfn = --e820_table_start;
+ unsigned long pfn = --pgt_buf_start;
void *adr;
- if (pfn < e820_table_bottom)
+ if (pfn < pgt_buf_bottom)
panic("alloc_low_page: ran out of memory");
adr = __va(pfn * PAGE_SIZE);
@@ -162,8 +162,8 @@ static pte_t *__init page_table_kmap_che
if (pmd_idx_kmap_begin != pmd_idx_kmap_end
&& (vaddr >> PMD_SHIFT) >= pmd_idx_kmap_begin
&& (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end
- && ((__pa(pte) >> PAGE_SHIFT) < e820_table_start
- || (__pa(pte) >> PAGE_SHIFT) >= e820_table_end)) {
+ && ((__pa(pte) >> PAGE_SHIFT) < pgt_buf_start
+ || (__pa(pte) >> PAGE_SHIFT) >= pgt_buf_end)) {
pte_t *newpte;
int i;
Index: linux-2.6/arch/x86/mm/init_64.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/init_64.c
+++ linux-2.6/arch/x86/mm/init_64.c
@@ -324,8 +324,8 @@ static __ref void *alloc_low_page(unsign
return adr;
}
- pfn = --e820_table_start;
- if (pfn < e820_table_bottom)
+ pfn = --pgt_buf_start;
+ if (pfn < pgt_buf_bottom)
panic("alloc_low_page: ran out of memory");
adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
Index: linux-2.6/arch/x86/xen/mmu.c
===================================================================
--- linux-2.6.orig/arch/x86/xen/mmu.c
+++ linux-2.6/arch/x86/xen/mmu.c
@@ -1807,7 +1807,7 @@ static __init pte_t mask_rw_pte(pte_t *p
* early_ioremap fixmap slot, make sure it is RO.
*/
if (!is_early_ioremap_ptep(ptep) &&
- pfn >= e820_table_start && pfn < e820_table_end)
+ pfn >= pgt_buf_start && pfn < pgt_buf_end)
pte = pte_wrprotect(pte);
return pte;
--
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