Commit 4457e6f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e87e7be9 6a328f3f

arch/sparc/include/asm/tlbflush_64.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _SPARC64_TLBFLUSH_H

#define _SPARC64_TLBFLUSH_H



#include <linux/mm.h>

#include <asm/mmu_context.h>



/* TSB flush operations. */

arch/sparc/mm/init_64.c

+0 −2
Original line number Diff line number Diff line
@@ -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)) {