diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-25 06:12:01 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-25 06:12:01 -0500 |
| commit | 26925c5910ab77fc95b4d8bb6d98780b50ab1e5a (patch) | |
| tree | 7d7506b3aedeea4db8b8659f046850db97503a89 /include/asm-powerpc | |
| parent | 55bb239e5464ecde046af3e45052ef06efda6444 (diff) | |
| parent | cd0cca7bf5e201dcea5632f78ad9b37cb419a5df (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/page_64.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/page_64.h b/include/asm-powerpc/page_64.h index 1e6e7846824f..58a3dd9a79ec 100644 --- a/include/asm-powerpc/page_64.h +++ b/include/asm-powerpc/page_64.h | |||
| @@ -135,9 +135,9 @@ extern unsigned int HPAGE_SHIFT; | |||
| 135 | 135 | ||
| 136 | #define in_hugepage_area(context, addr) \ | 136 | #define in_hugepage_area(context, addr) \ |
| 137 | (cpu_has_feature(CPU_FTR_16M_PAGE) && \ | 137 | (cpu_has_feature(CPU_FTR_16M_PAGE) && \ |
| 138 | ( ((1 << GET_HTLB_AREA(addr)) & (context).high_htlb_areas) || \ | 138 | ( ( (addr) >= 0x100000000UL) \ |
| 139 | ( ((addr) < 0x100000000L) && \ | 139 | ? ((1 << GET_HTLB_AREA(addr)) & (context).high_htlb_areas) \ |
| 140 | ((1 << GET_ESID(addr)) & (context).low_htlb_areas) ) ) ) | 140 | : ((1 << GET_ESID(addr)) & (context).low_htlb_areas) ) ) |
| 141 | 141 | ||
| 142 | #else /* !CONFIG_HUGETLB_PAGE */ | 142 | #else /* !CONFIG_HUGETLB_PAGE */ |
| 143 | 143 | ||