diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-07-09 08:39:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-09 08:39:51 -0400 |
| commit | 04bea4b9a4e410a540843933243be26de1592135 (patch) | |
| tree | 8731f2550254fa7e5be8eff9233a6d0a69edb44b /arch/sparc | |
| parent | e198cf1ad2f9ccedd005789a740d0eb5b3942447 (diff) | |
| parent | 8097be3bc58315b14498000585299e3c06fb13ce (diff) | |
| download | linux-rt-04bea4b9a4e410a540843933243be26de1592135.tar.gz | |
Merge tag 'v3.12.24' into v3.12-rt
This is the 3.12.24 stable release
Conflicts:
include/linux/irqdesc.h
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/mm/hugetlbpage.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index 96399646570a..d2b59441ebdd 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -234,11 +234,6 @@ int pud_huge(pud_t pud) return 0; } -int pmd_huge_support(void) -{ - return 0; -} - struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write) { |