diff options
| author | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /include/linux/hugetlb.h | |
| parent | fc8517bf627c9b834f80274a1bc9ecd39b27231b (diff) | |
| parent | 2973633e9f09311e849f975d969737af81a521ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'include/linux/hugetlb.h')
| -rw-r--r-- | include/linux/hugetlb.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index fbf5b31d47ee..82a25880714a 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
| @@ -239,14 +239,6 @@ static inline int pgd_write(pgd_t pgd) | |||
| 239 | } | 239 | } |
| 240 | #endif | 240 | #endif |
| 241 | 241 | ||
| 242 | #ifndef pud_write | ||
| 243 | static inline int pud_write(pud_t pud) | ||
| 244 | { | ||
| 245 | BUG(); | ||
| 246 | return 0; | ||
| 247 | } | ||
| 248 | #endif | ||
| 249 | |||
| 250 | #define HUGETLB_ANON_FILE "anon_hugepage" | 242 | #define HUGETLB_ANON_FILE "anon_hugepage" |
| 251 | 243 | ||
| 252 | enum { | 244 | enum { |