diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /include/asm-x86_64/pgtable.h | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86_64/pgtable.h')
| -rw-r--r-- | include/asm-x86_64/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h index 2cb483516459..dd8711ecaf2f 100644 --- a/include/asm-x86_64/pgtable.h +++ b/include/asm-x86_64/pgtable.h | |||
| @@ -384,7 +384,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | |||
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | #define pte_index(address) \ | 386 | #define pte_index(address) \ |
| 387 | ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | 387 | (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) |
| 388 | #define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \ | 388 | #define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \ |
| 389 | pte_index(address)) | 389 | pte_index(address)) |
| 390 | 390 | ||