diff options
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/futex.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/pgtable.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-m68k/futex.h b/include/asm-m68k/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/include/asm-m68k/futex.h +++ b/include/asm-m68k/futex.h | |||
@@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) | |||
14 | int cmp = (encoded_op >> 24) & 15; | 14 | int cmp = (encoded_op >> 24) & 15; |
15 | int oparg = (encoded_op << 8) >> 20; | 15 | int oparg = (encoded_op << 8) >> 20; |
16 | int cmparg = (encoded_op << 20) >> 20; | 16 | int cmparg = (encoded_op << 20) >> 20; |
17 | int oldval = 0, ret, tem; | 17 | int oldval = 0, ret; |
18 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) | 18 | if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) |
19 | oparg = 1 << oparg; | 19 | oparg = 1 << oparg; |
20 | 20 | ||
diff --git a/include/asm-m68k/pgtable.h b/include/asm-m68k/pgtable.h index 0c87fc84f7a4..add129e93fd7 100644 --- a/include/asm-m68k/pgtable.h +++ b/include/asm-m68k/pgtable.h | |||
@@ -141,9 +141,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, | |||
141 | 141 | ||
142 | #define kern_addr_valid(addr) (1) | 142 | #define kern_addr_valid(addr) (1) |
143 | 143 | ||
144 | #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ | ||
145 | remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) | ||
146 | |||
147 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 144 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
148 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 145 | remap_pfn_range(vma, vaddr, pfn, size, prot) |
149 | 146 | ||