diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 14:52:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 14:52:07 +1100 |
| commit | abf3208a5392a47a17711cd8b4502d5c9b07c64f (patch) | |
| tree | 26022f578ed63ab05f8e3f639309888008558441 /arch/sparc/mm/init_64.c | |
| parent | a1cfa885bb22689f348185f5944ebe8ba0348bf8 (diff) | |
| parent | 379c80d931fec0edccb6ee39d8122b53ebb5c602 (diff) | |
| download | linux-next-abf3208a5392a47a17711cd8b4502d5c9b07c64f.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/sparc/mm/init_64.c')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 3c8aac21f426..b4221d3727d0 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2925,8 +2925,7 @@ void __flush_tlb_all(void) : : "r" (pstate)); } -pte_t *pte_alloc_one_kernel(struct mm_struct *mm, - unsigned long address) +pte_t *pte_alloc_one_kernel(struct mm_struct *mm) { struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO); pte_t *pte = NULL; @@ -2937,8 +2936,7 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm, return pte; } -pgtable_t pte_alloc_one(struct mm_struct *mm, - unsigned long address) +pgtable_t pte_alloc_one(struct mm_struct *mm) { struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO); if (!page) |