diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /include/asm-sparc64/page.h | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc64/page.h')
| -rw-r--r-- | include/asm-sparc64/page.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h index e93a482aa24a..618117def0dc 100644 --- a/include/asm-sparc64/page.h +++ b/include/asm-sparc64/page.h | |||
| @@ -39,8 +39,6 @@ | |||
| 39 | #define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT) | 39 | #define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT) |
| 40 | #define HPAGE_MASK (~(HPAGE_SIZE - 1UL)) | 40 | #define HPAGE_MASK (~(HPAGE_SIZE - 1UL)) |
| 41 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) | 41 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) |
| 42 | #define ARCH_HAS_SETCLEAR_HUGE_PTE | ||
| 43 | #define ARCH_HAS_HUGETLB_PREFAULT_HOOK | ||
| 44 | #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA | 42 | #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA |
| 45 | #endif | 43 | #endif |
| 46 | 44 | ||