microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[S390] 4level-fixup cleanup 

Get independent from asm-generic/4level-fixup.h

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2007-10-22 12:52:48 +02:00
Родитель 3610cce87a
Коммит 190a1d722a
7 изменённых файлов: 129 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
arch/s390/lib/uaccess_pt.c
Просмотреть файл

@ -18,13 +18,18 @@
static inline pte_t *follow_table(struct mm_struct *mm, unsigned long addr) static inline pte_t *follow_table(struct mm_struct *mm, unsigned long addr)
{ {
pgd_t *pgd; pgd_t *pgd;
pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pgd = pgd_offset(mm, addr); pgd = pgd_offset(mm, addr);
if (pgd_none(*pgd) || unlikely(pgd_bad(*pgd))) if (pgd_none(*pgd) || unlikely(pgd_bad(*pgd)))
return NULL; return NULL;
pmd = pmd_offset(pgd, addr); pud = pud_offset(pgd, addr);
if (pud_none(*pud) || unlikely(pud_bad(*pud)))
return NULL;
pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd))) if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd)))
return NULL; return NULL;

4
arch/s390/mm/init.c
Просмотреть файл

@ -81,6 +81,7 @@ void show_mem(void)
static void __init setup_ro_region(void) static void __init setup_ro_region(void)
{ {
pgd_t *pgd; pgd_t *pgd;
pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte; pte_t *pte;
pte_t new_pte; pte_t new_pte;
@ -91,7 +92,8 @@ static void __init setup_ro_region(void)
for (; address < end; address += PAGE_SIZE) { for (; address < end; address += PAGE_SIZE) {
pgd = pgd_offset_k(address); pgd = pgd_offset_k(address);
pmd = pmd_offset(pgd, address); pud = pud_offset(pgd, address);
pmd = pmd_offset(pud, address);
pte = pte_offset_kernel(pmd, address); pte = pte_offset_kernel(pmd, address);
new_pte = mk_pte_phys(address, __pgprot(_PAGE_RO)); new_pte = mk_pte_phys(address, __pgprot(_PAGE_RO));
*pte = new_pte; *pte = new_pte;

34
arch/s390/mm/vmem.c
Просмотреть файл

@ -73,6 +73,8 @@ static void __init_refok *vmem_alloc_pages(unsigned int order)
return alloc_bootmem_pages((1 << order) * PAGE_SIZE); return alloc_bootmem_pages((1 << order) * PAGE_SIZE);
} }
#define vmem_pud_alloc() ({ BUG(); ((pud_t *) NULL); })
static inline pmd_t *vmem_pmd_alloc(void) static inline pmd_t *vmem_pmd_alloc(void)
{ {
pmd_t *pmd = NULL; pmd_t *pmd = NULL;
@ -103,6 +105,7 @@ static int vmem_add_range(unsigned long start, unsigned long size)
{ {
unsigned long address; unsigned long address;
pgd_t *pg_dir; pgd_t *pg_dir;
pud_t *pu_dir;
pmd_t *pm_dir; pmd_t *pm_dir;
pte_t *pt_dir; pte_t *pt_dir;
pte_t pte; pte_t pte;
@ -111,13 +114,21 @@ static int vmem_add_range(unsigned long start, unsigned long size)
for (address = start; address < start + size; address += PAGE_SIZE) { for (address = start; address < start + size; address += PAGE_SIZE) {
pg_dir = pgd_offset_k(address); pg_dir = pgd_offset_k(address);
if (pgd_none(*pg_dir)) { if (pgd_none(*pg_dir)) {
pu_dir = vmem_pud_alloc();
if (!pu_dir)
goto out;
pgd_populate_kernel(&init_mm, pg_dir, pu_dir);
}
pu_dir = pud_offset(pg_dir, address);
if (pud_none(*pu_dir)) {
pm_dir = vmem_pmd_alloc(); pm_dir = vmem_pmd_alloc();
if (!pm_dir) if (!pm_dir)
goto out; goto out;
pgd_populate_kernel(&init_mm, pg_dir, pm_dir); pud_populate_kernel(&init_mm, pu_dir, pm_dir);
} }
pm_dir = pmd_offset(pg_dir, address); pm_dir = pmd_offset(pu_dir, address);
if (pmd_none(*pm_dir)) { if (pmd_none(*pm_dir)) {
pt_dir = vmem_pte_alloc(); pt_dir = vmem_pte_alloc();
if (!pt_dir) if (!pt_dir)
@ -143,6 +154,7 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
{ {
unsigned long address; unsigned long address;
pgd_t *pg_dir; pgd_t *pg_dir;
pud_t *pu_dir;
pmd_t *pm_dir; pmd_t *pm_dir;
pte_t *pt_dir; pte_t *pt_dir;
pte_t pte; pte_t pte;
@ -150,9 +162,10 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
pte_val(pte) = _PAGE_TYPE_EMPTY; pte_val(pte) = _PAGE_TYPE_EMPTY;
for (address = start; address < start + size; address += PAGE_SIZE) { for (address = start; address < start + size; address += PAGE_SIZE) {
pg_dir = pgd_offset_k(address); pg_dir = pgd_offset_k(address);
if (pgd_none(*pg_dir)) pu_dir = pud_offset(pg_dir, address);
if (pud_none(*pu_dir))
continue; continue;
pm_dir = pmd_offset(pg_dir, address); pm_dir = pmd_offset(pu_dir, address);
if (pmd_none(*pm_dir)) if (pmd_none(*pm_dir))
continue; continue;
pt_dir = pte_offset_kernel(pm_dir, address); pt_dir = pte_offset_kernel(pm_dir, address);
@ -169,6 +182,7 @@ static int vmem_add_mem_map(unsigned long start, unsigned long size)
unsigned long address, start_addr, end_addr; unsigned long address, start_addr, end_addr;
struct page *map_start, *map_end; struct page *map_start, *map_end;
pgd_t *pg_dir; pgd_t *pg_dir;
pud_t *pu_dir;
pmd_t *pm_dir; pmd_t *pm_dir;
pte_t *pt_dir; pte_t *pt_dir;
pte_t pte; pte_t pte;
@ -183,13 +197,21 @@ static int vmem_add_mem_map(unsigned long start, unsigned long size)
for (address = start_addr; address < end_addr; address += PAGE_SIZE) { for (address = start_addr; address < end_addr; address += PAGE_SIZE) {
pg_dir = pgd_offset_k(address); pg_dir = pgd_offset_k(address);
if (pgd_none(*pg_dir)) { if (pgd_none(*pg_dir)) {
pu_dir = vmem_pud_alloc();
if (!pu_dir)
goto out;
pgd_populate_kernel(&init_mm, pg_dir, pu_dir);
}
pu_dir = pud_offset(pg_dir, address);
if (pud_none(*pu_dir)) {
pm_dir = vmem_pmd_alloc(); pm_dir = vmem_pmd_alloc();
if (!pm_dir) if (!pm_dir)
goto out; goto out;
pgd_populate_kernel(&init_mm, pg_dir, pm_dir); pud_populate_kernel(&init_mm, pu_dir, pm_dir);
} }
pm_dir = pmd_offset(pg_dir, address); pm_dir = pmd_offset(pu_dir, address);
if (pmd_none(*pm_dir)) { if (pmd_none(*pm_dir)) {
pt_dir = vmem_pte_alloc(); pt_dir = vmem_pte_alloc();
if (!pt_dir) if (!pt_dir)

4
include/asm-s390/page.h
Просмотреть файл

@ -82,6 +82,7 @@ typedef struct { unsigned long pte; } pte_t;
#ifndef __s390x__ #ifndef __s390x__
typedef struct { unsigned long pmd; } pmd_t; typedef struct { unsigned long pmd; } pmd_t;
typedef struct { unsigned long pud; } pud_t;
typedef struct { typedef struct {
unsigned long pgd0; unsigned long pgd0;
unsigned long pgd1; unsigned long pgd1;
@ -90,6 +91,7 @@ typedef struct {
} pgd_t; } pgd_t;
#define pmd_val(x) ((x).pmd) #define pmd_val(x) ((x).pmd)
#define pud_val(x) ((x).pud)
#define pgd_val(x) ((x).pgd0) #define pgd_val(x) ((x).pgd0)
#else /* __s390x__ */ #else /* __s390x__ */
@ -98,10 +100,12 @@ typedef struct {
unsigned long pmd0; unsigned long pmd0;
unsigned long pmd1; unsigned long pmd1;
} pmd_t; } pmd_t;
typedef struct { unsigned long pud; } pud_t;
typedef struct { unsigned long pgd; } pgd_t; typedef struct { unsigned long pgd; } pgd_t;
#define pmd_val(x) ((x).pmd0) #define pmd_val(x) ((x).pmd0)
#define pmd_val1(x) ((x).pmd1) #define pmd_val1(x) ((x).pmd1)
#define pud_val(x) ((x).pud)
#define pgd_val(x) ((x).pgd) #define pgd_val(x) ((x).pgd)
#endif /* __s390x__ */ #endif /* __s390x__ */

32
include/asm-s390/pgalloc.h
Просмотреть файл

@ -56,11 +56,17 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
return _SEGMENT_ENTRY_EMPTY; return _SEGMENT_ENTRY_EMPTY;
} }
#define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); })
#define pud_free(x) do { } while (0)
#define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(x) do { } while (0) #define pmd_free(x) do { } while (0)
#define pgd_populate(mm, pmd, pte) BUG() #define pgd_populate(mm, pgd, pud) BUG()
#define pgd_populate_kernel(mm, pmd, pte) BUG() #define pgd_populate_kernel(mm, pgd, pud) BUG()
#define pud_populate(mm, pud, pmd) BUG()
#define pud_populate_kernel(mm, pud, pmd) BUG()
#else /* __s390x__ */ #else /* __s390x__ */
@ -69,6 +75,9 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
return _REGION3_ENTRY_EMPTY; return _REGION3_ENTRY_EMPTY;
} }
#define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); })
#define pud_free(x) do { } while (0)
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr) static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
{ {
unsigned long *crst = crst_table_alloc(mm, s390_noexec); unsigned long *crst = crst_table_alloc(mm, s390_noexec);
@ -78,20 +87,23 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
} }
#define pmd_free(pmd) crst_table_free((unsigned long *) pmd) #define pmd_free(pmd) crst_table_free((unsigned long *) pmd)
static inline void pgd_populate_kernel(struct mm_struct *mm, #define pgd_populate(mm, pgd, pud) BUG()
pgd_t *pgd, pmd_t *pmd) #define pgd_populate_kernel(mm, pgd, pud) BUG()
static inline void pud_populate_kernel(struct mm_struct *mm,
pud_t *pud, pmd_t *pmd)
{ {
pgd_val(*pgd) = _REGION3_ENTRY | __pa(pmd); pud_val(*pud) = _REGION3_ENTRY | __pa(pmd);
} }
static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd) static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
{ {
pgd_t *shadow_pgd = get_shadow_table(pgd); pud_t *shadow_pud = get_shadow_table(pud);
pmd_t *shadow_pmd = get_shadow_table(pmd); pmd_t *shadow_pmd = get_shadow_table(pmd);
if (shadow_pgd && shadow_pmd) if (shadow_pud && shadow_pmd)
pgd_populate_kernel(mm, shadow_pgd, shadow_pmd); pud_populate_kernel(mm, shadow_pud, shadow_pmd);
pgd_populate_kernel(mm, pgd, pmd); pud_populate_kernel(mm, pud, pmd);
} }
#endif /* __s390x__ */ #endif /* __s390x__ */

127
include/asm-s390/pgtable.h
Просмотреть файл

@ -13,8 +13,6 @@
#ifndef _ASM_S390_PGTABLE_H #ifndef _ASM_S390_PGTABLE_H
#define _ASM_S390_PGTABLE_H #define _ASM_S390_PGTABLE_H
#include <asm-generic/4level-fixup.h>
/* /*
* The Linux memory management assumes a three-level page table setup. For * The Linux memory management assumes a three-level page table setup. For
* s390 31 bit we "fold" the mid level into the top-level page table, so * s390 31 bit we "fold" the mid level into the top-level page table, so
@ -60,14 +58,18 @@ extern char empty_zero_page[PAGE_SIZE];
*/ */
#ifndef __s390x__ #ifndef __s390x__
# define PMD_SHIFT 22 # define PMD_SHIFT 22
# define PUD_SHIFT 22
# define PGDIR_SHIFT 22 # define PGDIR_SHIFT 22
#else /* __s390x__ */ #else /* __s390x__ */
# define PMD_SHIFT 21 # define PMD_SHIFT 21
# define PUD_SHIFT 31
# define PGDIR_SHIFT 31 # define PGDIR_SHIFT 31
#endif /* __s390x__ */ #endif /* __s390x__ */
#define PMD_SIZE (1UL << PMD_SHIFT) #define PMD_SIZE (1UL << PMD_SHIFT)
#define PMD_MASK (~(PMD_SIZE-1)) #define PMD_MASK (~(PMD_SIZE-1))
#define PUD_SIZE (1UL << PUD_SHIFT)
#define PUD_MASK (~(PUD_SIZE-1))
#define PGDIR_SIZE (1UL << PGDIR_SHIFT) #define PGDIR_SIZE (1UL << PGDIR_SHIFT)
#define PGDIR_MASK (~(PGDIR_SIZE-1)) #define PGDIR_MASK (~(PGDIR_SIZE-1))
@ -80,10 +82,12 @@ extern char empty_zero_page[PAGE_SIZE];
#ifndef __s390x__ #ifndef __s390x__
# define PTRS_PER_PTE 1024 # define PTRS_PER_PTE 1024
# define PTRS_PER_PMD 1 # define PTRS_PER_PMD 1
# define PTRS_PER_PUD 1
# define PTRS_PER_PGD 512 # define PTRS_PER_PGD 512
#else /* __s390x__ */ #else /* __s390x__ */
# define PTRS_PER_PTE 512 # define PTRS_PER_PTE 512
# define PTRS_PER_PMD 1024 # define PTRS_PER_PMD 1024
# define PTRS_PER_PUD 1
# define PTRS_PER_PGD 2048 # define PTRS_PER_PGD 2048
#endif /* __s390x__ */ #endif /* __s390x__ */
@ -93,6 +97,8 @@ extern char empty_zero_page[PAGE_SIZE];
printk("%s:%d: bad pte %p.\n", __FILE__, __LINE__, (void *) pte_val(e)) printk("%s:%d: bad pte %p.\n", __FILE__, __LINE__, (void *) pte_val(e))
#define pmd_ERROR(e) \ #define pmd_ERROR(e) \
printk("%s:%d: bad pmd %p.\n", __FILE__, __LINE__, (void *) pmd_val(e)) printk("%s:%d: bad pmd %p.\n", __FILE__, __LINE__, (void *) pmd_val(e))
#define pud_ERROR(e) \
printk("%s:%d: bad pud %p.\n", __FILE__, __LINE__, (void *) pud_val(e))
#define pgd_ERROR(e) \ #define pgd_ERROR(e) \
printk("%s:%d: bad pgd %p.\n", __FILE__, __LINE__, (void *) pgd_val(e)) printk("%s:%d: bad pgd %p.\n", __FILE__, __LINE__, (void *) pgd_val(e))
@ -192,7 +198,7 @@ extern unsigned long vmalloc_end;
* I Segment-Invalid Bit: Segment is not available for address-translation * I Segment-Invalid Bit: Segment is not available for address-translation
* TT Type 01 * TT Type 01
* TF * TF
* TL Table lenght * TL Table length
* *
* The 64 bit regiontable origin of S390 has following format: * The 64 bit regiontable origin of S390 has following format:
* | region table origon | DTTL * | region table origon | DTTL
@ -435,22 +441,30 @@ static inline int pgd_present(pgd_t pgd) { return 1; }
static inline int pgd_none(pgd_t pgd) { return 0; } static inline int pgd_none(pgd_t pgd) { return 0; }
static inline int pgd_bad(pgd_t pgd) { return 0; } static inline int pgd_bad(pgd_t pgd) { return 0; }
static inline int pud_present(pud_t pud) { return 1; }
static inline int pud_none(pud_t pud) { return 0; }
static inline int pud_bad(pud_t pud) { return 0; }
#else /* __s390x__ */ #else /* __s390x__ */
static inline int pgd_present(pgd_t pgd) static inline int pgd_present(pgd_t pgd) { return 1; }
static inline int pgd_none(pgd_t pgd) { return 0; }
static inline int pgd_bad(pgd_t pgd) { return 0; }
static inline int pud_present(pud_t pud)
{ {
return pgd_val(pgd) & _REGION_ENTRY_ORIGIN; return pud_val(pud) & _REGION_ENTRY_ORIGIN;
} }
static inline int pgd_none(pgd_t pgd) static inline int pud_none(pud_t pud)
{ {
return pgd_val(pgd) & _REGION_ENTRY_INV; return pud_val(pud) & _REGION_ENTRY_INV;
} }
static inline int pgd_bad(pgd_t pgd) static inline int pud_bad(pud_t pud)
{ {
unsigned long mask = ~_REGION_ENTRY_ORIGIN & ~_REGION_ENTRY_INV; unsigned long mask = ~_REGION_ENTRY_ORIGIN & ~_REGION_ENTRY_INV;
return (pgd_val(pgd) & mask) != _REGION3_ENTRY; return (pud_val(pud) & mask) != _REGION3_ENTRY;
} }
#endif /* __s390x__ */ #endif /* __s390x__ */
@ -526,7 +540,8 @@ static inline int pte_young(pte_t pte)
#ifndef __s390x__ #ifndef __s390x__
static inline void pgd_clear(pgd_t * pgdp) { } #define pgd_clear(pgd) do { } while (0)
#define pud_clear(pud) do { } while (0)
static inline void pmd_clear_kernel(pmd_t * pmdp) static inline void pmd_clear_kernel(pmd_t * pmdp)
{ {
@ -538,18 +553,20 @@ static inline void pmd_clear_kernel(pmd_t * pmdp)
#else /* __s390x__ */ #else /* __s390x__ */
static inline void pgd_clear_kernel(pgd_t * pgdp) #define pgd_clear(pgd) do { } while (0)
static inline void pud_clear_kernel(pud_t *pud)
{ {
pgd_val(*pgdp) = _REGION3_ENTRY_EMPTY; pud_val(*pud) = _REGION3_ENTRY_EMPTY;
} }
static inline void pgd_clear(pgd_t * pgdp) static inline void pud_clear(pud_t * pud)
{ {
pgd_t *shadow_pgd = get_shadow_table(pgdp); pud_t *shadow = get_shadow_table(pud);
pgd_clear_kernel(pgdp); pud_clear_kernel(pud);
if (shadow_pgd) if (shadow)
pgd_clear_kernel(shadow_pgd); pud_clear_kernel(shadow);
} }
static inline void pmd_clear_kernel(pmd_t * pmdp) static inline void pmd_clear_kernel(pmd_t * pmdp)
@ -810,63 +827,48 @@ static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)
return mk_pte_phys(physpage, pgprot); return mk_pte_phys(physpage, pgprot);
} }
static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
{
unsigned long physpage = __pa((pfn) << PAGE_SHIFT);
return mk_pte_phys(physpage, pgprot);
}
#ifdef __s390x__
static inline pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot)
{
unsigned long physpage = __pa((pfn) << PAGE_SHIFT);
return __pmd(physpage + pgprot_val(pgprot));
}
#endif /* __s390x__ */
#define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)
#define pte_page(x) pfn_to_page(pte_pfn(x))
#define pmd_page_vaddr(pmd) (pmd_val(pmd) & PAGE_MASK)
#define pmd_page(pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
#define pgd_page_vaddr(pgd) (pgd_val(pgd) & PAGE_MASK)
#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
/* to find an entry in a page-table-directory */
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address)) #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
/* to find an entry in a kernel page-table-directory */ #define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
#define pgd_offset_k(address) pgd_offset(&init_mm, address) #define pgd_offset_k(address) pgd_offset(&init_mm, address)
#ifndef __s390x__ #ifndef __s390x__
/* Find an entry in the second-level page table.. */ #define pmd_deref(pmd) (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN)
static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address) #define pud_deref(pmd) ({ BUG(); 0UL; })
{ #define pgd_deref(pmd) ({ BUG(); 0UL; })
return (pmd_t *) dir;
} #define pud_offset(pgd, address) ((pud_t *) pgd)
#define pmd_offset(pud, address) ((pmd_t *) pud + pmd_index(address))
#else /* __s390x__ */ #else /* __s390x__ */
/* Find an entry in the second-level page table.. */ #define pmd_deref(pmd) (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN)
#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) #define pud_deref(pud) (pud_val(pud) & _REGION_ENTRY_ORIGIN)
#define pmd_offset(dir,addr) \ #define pgd_deref(pgd) ({ BUG(); 0UL; })
((pmd_t *) pgd_page_vaddr(*(dir)) + pmd_index(addr))
#define pud_offset(pgd, address) ((pud_t *) pgd)
static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
{
pmd_t *pmd = (pmd_t *) pud_deref(*pud);
return pmd + pmd_index(address);
}
#endif /* __s390x__ */ #endif /* __s390x__ */
/* Find an entry in the third-level page table.. */ #define pfn_pte(pfn,pgprot) mk_pte_phys(__pa((pfn) << PAGE_SHIFT),(pgprot))
#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1)) #define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)
#define pte_offset_kernel(pmd, address) \ #define pte_page(x) pfn_to_page(pte_pfn(x))
((pte_t *) pmd_page_vaddr(*(pmd)) + pte_index(address))
#define pmd_page(pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
/* Find an entry in the lowest level page table.. */
#define pte_offset(pmd, addr) ((pte_t *) pmd_deref(*(pmd)) + pte_index(addr))
#define pte_offset_kernel(pmd, address) pte_offset(pmd,address)
#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address) #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
#define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address) #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
#define pte_unmap(pte) do { } while (0) #define pte_unmap(pte) do { } while (0)
@ -959,4 +961,3 @@ extern void memmap_init(unsigned long, int, unsigned long, unsigned long);
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
#endif /* _S390_PAGE_H */ #endif /* _S390_PAGE_H */

2
include/asm-s390/tlb.h
Просмотреть файл

@ -121,6 +121,8 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
#endif #endif
} }
#define pud_free_tlb(tlb, pud) do { } while (0)
#define tlb_start_vma(tlb, vma) do { } while (0) #define tlb_start_vma(tlb, vma) do { } while (0)
#define tlb_end_vma(tlb, vma) do { } while (0) #define tlb_end_vma(tlb, vma) do { } while (0)
#define tlb_remove_tlb_entry(tlb, ptep, addr) do { } while (0) #define tlb_remove_tlb_entry(tlb, ptep, addr) do { } while (0)