diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 03:50:03 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 03:50:03 +0400 |
| commit | 4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7 (patch) | |
| tree | 394733989d9f68e8380ace4948976a92336e6b16 | |
| parent | e87e7be92979480ee5a2d4a746dc88f2eeca79ca (diff) | |
| parent | 6a328f3fe042396c6525d7bf84cfd941440cc045 (diff) | |
| download | linux-4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7.tar.xz | |
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
| -rw-r--r-- | arch/sparc/include/asm/tlbflush_64.h | 1 | ||||
| -rw-r--r-- | arch/sparc/mm/init_64.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h index f0d6a9700f4c..3c3c89f52643 100644 --- a/arch/sparc/include/asm/tlbflush_64.h +++ b/arch/sparc/include/asm/tlbflush_64.h @@ -1,7 +1,6 @@ #ifndef _SPARC64_TLBFLUSH_H #define _SPARC64_TLBFLUSH_H -#include <linux/mm.h> #include <asm/mmu_context.h> /* TSB flush operations. */ diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 6b643790e4fe..5322e530d09c 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2565,8 +2565,6 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, { struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO); - pte_t *pte = NULL; - if (!page) return NULL; if (!pgtable_page_ctor(page)) { |