diff options
| author | Jeff Dike <jdike@jdike.wstearns.org> | 2002-12-16 15:34:58 -0500 |
|---|---|---|
| committer | Jeff Dike <jdike@jdike.wstearns.org> | 2002-12-16 15:34:58 -0500 |
| commit | efa04bfda767acb0948e0a2e02ecb6bf29a43ad5 (patch) | |
| tree | 9ca53d0490818337d0f0831b0a52601e94817739 /include | |
| parent | 91ec8aa9f5416d3474a34af9b8f197a344d0d523 (diff) | |
| parent | 0d371e5a4ab01a0cf6d3f255cfcf99fb8a683e6c (diff) | |
Merge jdike.wstearns.org:/home/jdike/linux/linus-2.5
into jdike.wstearns.org:/home/jdike/linux/updates-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-um/pgtable.h | 6 | ||||
| -rw-r--r-- | include/asm-um/uaccess.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h index a79a756c3989..8d607c87418d 100644 --- a/include/asm-um/pgtable.h +++ b/include/asm-um/pgtable.h @@ -373,15 +373,15 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address) } /* Find an entry in the third-level page table.. */ -#define __pte_offset(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) +#define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) #define pte_offset_kernel(dir, address) \ ((pte_t *) pmd_page_kernel(*(dir)) + __pte_offset(address)) #define pte_offset_map(dir, address) \ ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + __pte_offset(address)) #define pte_offset_map_nested(dir, address) \ ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + __pte_offset(address)) -#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0) -#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1) +#define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0) +#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1) #if defined(CONFIG_HIGHPTE) && defined(CONFIG_HIGHMEM4G) typedef u32 pte_addr_t; diff --git a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h index a8a7dfb7e4c8..0a24a9b5497f 100644 --- a/include/asm-um/uaccess.h +++ b/include/asm-um/uaccess.h @@ -164,7 +164,7 @@ static inline int clear_user(void *mem, int len) extern int __do_strnlen_user(const char *str, unsigned long n, void **fault_addr, void **fault_catcher); -static inline int strnlen_user(void *str, int len) +static inline int strnlen_user(const void *str, int len) { return(__do_strnlen_user(str, len, ¤t->thread.fault_addr, |