diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:27:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:27:51 -0700 |
| commit | 141dc40ee343ab532717b235dd645e2d25ae3092 (patch) | |
| tree | 2289e5d1ec20df5e465b9b629e291877f4d70485 /arch/microblaze/include/asm/uaccess.h | |
| parent | 1c83d94ff646001f9ee83f0330a3933b55660927 (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
| download | talos-op-linux-141dc40ee343ab532717b235dd645e2d25ae3092.tar.gz talos-op-linux-141dc40ee343ab532717b235dd645e2d25ae3092.zip | |
Merge 3.10-rc5 into usb-next
We need the changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/microblaze/include/asm/uaccess.h')
| -rw-r--r-- | arch/microblaze/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h index efe59d881789..04e49553bdf9 100644 --- a/arch/microblaze/include/asm/uaccess.h +++ b/arch/microblaze/include/asm/uaccess.h @@ -99,13 +99,13 @@ static inline int access_ok(int type, const void __user *addr, if ((get_fs().seg < ((unsigned long)addr)) || (get_fs().seg < ((unsigned long)addr + size - 1))) { pr_debug("ACCESS fail: %s at 0x%08x (size 0x%x), seg 0x%08x\n", - type ? "WRITE" : "READ ", (u32)addr, (u32)size, + type ? "WRITE" : "READ ", (__force u32)addr, (u32)size, (u32)get_fs().seg); return 0; } ok: pr_debug("ACCESS OK: %s at 0x%08x (size 0x%x), seg 0x%08x\n", - type ? "WRITE" : "READ ", (u32)addr, (u32)size, + type ? "WRITE" : "READ ", (__force u32)addr, (u32)size, (u32)get_fs().seg); return 1; } |
