diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 22:31:26 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 22:31:26 (GMT) |
| commit | 8ec4942212a6d337982967778a3dc3b60aea782e (patch) | |
| tree | 35e58e18bb32969fbf6b7d229323fac144e1b265 /arch/sparc/include/asm/hugetlb.h | |
| parent | 79a69d342d71b2b4eafdf51e2451606cfe380a44 (diff) | |
| parent | f9fd3488f6a3c2c5cc8613e4fd7fbbaa57f6bf8f (diff) | |
| download | linux-fsl-qoriq-8ec4942212a6d337982967778a3dc3b60aea782e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
sparc32 from Sam Ravnborg."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32: refactor smp boot
sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
sparc64: Fix tsb_grow() in atomic context.
sparc64: Handle hugepage TSB being NULL.
sparc64: Fix gfp_flags setting in tsb_grow().
Diffstat (limited to 'arch/sparc/include/asm/hugetlb.h')
| -rw-r--r-- | arch/sparc/include/asm/hugetlb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h index 9661e9b..7eb57d2 100644 --- a/arch/sparc/include/asm/hugetlb.h +++ b/arch/sparc/include/asm/hugetlb.h @@ -12,7 +12,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { - hugetlb_setup(mm); } static inline int is_hugepage_only_range(struct mm_struct *mm, |