diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2014-07-08 14:40:42 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2014-07-08 14:54:45 +0200 |
| commit | d7789ba79b1d081932a2da6d05f78320a002505a (patch) | |
| tree | 1462027856037610434f3911017a1d22113bf771 /arch/tile | |
| parent | 83f12c5cb20669c30ac711f28f09d7f464124d00 (diff) | |
| parent | bbae7add628cfe96a1facd578dd1eddcd1030de7 (diff) | |
Merge tag 'v3.14.10' into v3.14-rt
This is the 3.14.10 stable release
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
include/linux/irqdesc.h
include/linux/thread_info.h
kernel/irq/manage.c
kernel/locking/rtmutex.c
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/mm/hugetlbpage.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c index 0cb3bbaa580c..e514899e1100 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c @@ -166,11 +166,6 @@ int pud_huge(pud_t pud) return !!(pud_val(pud) & _PAGE_HUGE_PAGE); } -int pmd_huge_support(void) -{ - return 1; -} - struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write) { |