hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "Two merge window fallout build fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: merge fix
  sparc64: fix build regession
This commit is contained in:
Linus Torvalds 2013-11-19 15:50:03 -08:00
parent e87e7be929 6a328f3fe0
commit 4457e6f6c9
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sparc/include/asm/tlbflush_64.h
View File

@ -1,7 +1,6 @@
#ifndef _SPARC64_TLBFLUSH_H #ifndef _SPARC64_TLBFLUSH_H
#define _SPARC64_TLBFLUSH_H #define _SPARC64_TLBFLUSH_H
#include <linux/mm.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
/* TSB flush operations. */ /* TSB flush operations. */

2
arch/sparc/mm/init_64.c
View File

@ -2565,8 +2565,6 @@ pgtable_t pte_alloc_one(struct mm_struct *mm,
{ {
struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK | struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
__GFP_REPEAT | __GFP_ZERO); __GFP_REPEAT | __GFP_ZERO);
pte_t *pte = NULL;
if (!page) if (!page)
return NULL; return NULL;
if (!pgtable_page_ctor(page)) { if (!pgtable_page_ctor(page)) {