leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: adjust vmalloc_sync_all() for Xen (2nd try)

Browse Source 
Since the fourth PDPT entry cannot be shared under Xen,
vmalloc_sync_all() must iterate over pmd-s rather than pgd-s here.
Luckily, the code isn't used for native PAE (SHARED_KERNEL_PMD is 1)
and the change is benign to non-PAE.

Also do a little more cleanup in that function.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
This commit is contained in:
Jan Beulich 2008-08-29 12:53:45 +01:00 committed by Ingo Molnar
parent 913da64b54
commit cc643d4687
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/mm/fault.c
View File

@ -915,15 +915,15 @@ LIST_HEAD(pgd_list);
void vmalloc_sync_all(void) void vmalloc_sync_all(void)
{ {
#ifdef CONFIG_X86_32
unsigned long start = VMALLOC_START & PGDIR_MASK;
unsigned long address; unsigned long address;
#ifdef CONFIG_X86_32
if (SHARED_KERNEL_PMD) if (SHARED_KERNEL_PMD)
return; return;
BUILD_BUG_ON(TASK_SIZE & ~PGDIR_MASK); for (address = VMALLOC_START & PMD_MASK;
for (address = start; address >= TASK_SIZE; address += PGDIR_SIZE) { address >= TASK_SIZE && address < FIXADDR_TOP;
address += PMD_SIZE) {
unsigned long flags; unsigned long flags;
struct page *page; struct page *page;
@ -936,10 +936,8 @@ void vmalloc_sync_all(void)
spin_unlock_irqrestore(&pgd_lock, flags); spin_unlock_irqrestore(&pgd_lock, flags);
} }
#else /* CONFIG_X86_64 */ #else /* CONFIG_X86_64 */
unsigned long start = VMALLOC_START & PGDIR_MASK; for (address = VMALLOC_START & PGDIR_MASK; address <= VMALLOC_END;
unsigned long address; address += PGDIR_SIZE) {
for (address = start; address <= VMALLOC_END; address += PGDIR_SIZE) {
const pgd_t *pgd_ref = pgd_offset_k(address); const pgd_t *pgd_ref = pgd_offset_k(address);
unsigned long flags; unsigned long flags;
struct page *page; struct page *page;