From eca0cfdfe2cc0e9eedeae4e7718e5f2cc0f6e804 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Fri, 9 Apr 2010 13:43:01 +0200 Subject: [PATCH] --- yaml --- r: 189743 b: refs/heads/master c: 6af7eea2aee57b869f34eba0a94ef122fe90fbfd h: refs/heads/master i: 189741: 1988578c5e0e2e8965dd11576c95e60b811f53b1 189739: b95a2420f12647aee492e557c831d984ab748733 189735: 4e38ab947b1c267638a8f0e3149c9a4b811b9028 189727: 8a5585b808bf21e9373e76d8665df3d2917872b8 v: v3 --- [refs] | 2 +- trunk/arch/s390/mm/vmem.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2b5459739a7c..e3390eb22e7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 176b1803ce4690d0dd94e16f118dbd14af045034 +refs/heads/master: 6af7eea2aee57b869f34eba0a94ef122fe90fbfd diff --git a/trunk/arch/s390/mm/vmem.c b/trunk/arch/s390/mm/vmem.c index 8ea3144b45b8..90165e7ca04e 100644 --- a/trunk/arch/s390/mm/vmem.c +++ b/trunk/arch/s390/mm/vmem.c @@ -71,12 +71,8 @@ static pte_t __ref *vmem_pte_alloc(void) pte = alloc_bootmem(PTRS_PER_PTE * sizeof(pte_t)); if (!pte) return NULL; - if (MACHINE_HAS_HPAGE) - clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY | _PAGE_CO, - PTRS_PER_PTE * sizeof(pte_t)); - else - clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY, - PTRS_PER_PTE * sizeof(pte_t)); + clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY, + PTRS_PER_PTE * sizeof(pte_t)); return pte; } @@ -117,8 +113,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro) if (MACHINE_HAS_HPAGE && !(address & ~HPAGE_MASK) && (address + HPAGE_SIZE <= start + size) && (address >= HPAGE_SIZE)) { - pte_val(pte) |= _SEGMENT_ENTRY_LARGE | - _SEGMENT_ENTRY_CO; + pte_val(pte) |= _SEGMENT_ENTRY_LARGE; pmd_val(*pm_dir) = pte_val(pte); address += HPAGE_SIZE - PAGE_SIZE; continue;