diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:19:29 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:19:29 +0800 |
commit | ada3625ee9203002b2cac60be802dae952ae3e22 (patch) | |
tree | 29138b4b34e143f202e8f1d2b9ebfe1a2b7d348f /include | |
parent | b41e65f55a30b53bfaf609ed4f794428ae532db2 (diff) | |
parent | 6b12ebc0ecce75d7bd3660cd85f8b47a615c2071 (diff) |
Merge tag 'v3.18.33' into linux-linaro-lsk-v3.18
This is the 3.18.33 stable release
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm_cache.h | 2 | ||||
-rw-r--r-- | include/linux/hugetlb.h | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h index 461a0558bca4..cebecff536a3 100644 --- a/include/drm/drm_cache.h +++ b/include/drm/drm_cache.h @@ -39,6 +39,8 @@ static inline bool drm_arch_can_wc_memory(void) { #if defined(CONFIG_PPC) && !defined(CONFIG_NOT_COHERENT_CACHE) return false; +#elif defined(CONFIG_MIPS) && defined(CONFIG_CPU_LOONGSON3) + return false; #else return true; #endif diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 14020c7796af..e6192934cdfa 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -415,15 +415,14 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h, return &mm->page_table_lock; } -static inline bool hugepages_supported(void) -{ - /* - * Some platform decide whether they support huge pages at boot - * time. On these, such as powerpc, HPAGE_SHIFT is set to 0 when - * there is no such support - */ - return HPAGE_SHIFT != 0; -} +#ifndef hugepages_supported +/* + * Some platform decide whether they support huge pages at boot + * time. Some of them, such as powerpc, set HPAGE_SHIFT to 0 + * when there is no such support + */ +#define hugepages_supported() (HPAGE_SHIFT != 0) +#endif #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; |