diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /include/linux/hugetlb.h | |
| parent | 0cecdd818cd79d092e36e70dfe3a71f2878d6b96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'include/linux/hugetlb.h')
| -rw-r--r-- | include/linux/hugetlb.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 19644e0016bd..d9d6c868b86b 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
| @@ -110,11 +110,6 @@ static inline void copy_huge_page(struct page *dst, struct page *src) | |||
| 110 | 110 | ||
| 111 | #define hugetlb_change_protection(vma, address, end, newprot) | 111 | #define hugetlb_change_protection(vma, address, end, newprot) |
| 112 | 112 | ||
| 113 | #ifndef HPAGE_MASK | ||
| 114 | #define HPAGE_MASK PAGE_MASK /* Keep the compiler happy */ | ||
| 115 | #define HPAGE_SIZE PAGE_SIZE | ||
| 116 | #endif | ||
| 117 | |||
| 118 | #endif /* !CONFIG_HUGETLB_PAGE */ | 113 | #endif /* !CONFIG_HUGETLB_PAGE */ |
| 119 | 114 | ||
| 120 | #define HUGETLB_ANON_FILE "anon_hugepage" | 115 | #define HUGETLB_ANON_FILE "anon_hugepage" |