diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-22 22:56:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-22 22:56:09 +0100 |
| commit | b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f (patch) | |
| tree | 8832cbb308daf982830ddcbfd87644ae985d4151 /arch/arm/include | |
| parent | 00b7dede8bc3881b29f2efbcae1355fc769252ab (diff) | |
| parent | 8e7fc18b5eacc37b6e6fcf486ec4eafbfef91738 (diff) | |
Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/flat.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/uaccess.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h index 59426a4595c..e847d23351e 100644 --- a/arch/arm/include/asm/flat.h +++ b/arch/arm/include/asm/flat.h @@ -8,7 +8,7 @@ #define flat_argvp_envp_on_stack() 1 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) -#define flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp) +#define flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)persistent,get_unaligned(rp)) #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) #define flat_get_relocate_addr(rel) (rel) #define flat_set_persistent(relval, p) 0 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 77bd79f2ffd..7e1f76027f6 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -200,8 +200,8 @@ extern int __put_user_8(void *, unsigned long long); #define USER_DS KERNEL_DS #define segment_eq(a,b) (1) -#define __addr_ok(addr) (1) -#define __range_ok(addr,size) (0) +#define __addr_ok(addr) ((void)(addr),1) +#define __range_ok(addr,size) ((void)(addr),0) #define get_fs() (KERNEL_DS) static inline void set_fs(mm_segment_t fs) |