diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-22 09:22:49 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-22 09:22:49 -0400 |
| commit | be4f53876d5191af4dd340cdccf8bc4ddf1db337 (patch) | |
| tree | e863bbb4a1a63ef884600c13f8ec0e7756e28267 | |
| parent | 1fc74af81b556d0582fd8aed1cef4a039b7b5051 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| download | origen-be4f53876d5191af4dd340cdccf8bc4ddf1db337.tar.gz | |
Merge commit 'v3.0' into linaro-3.0
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/ptrace.h | 1 | ||||
| -rw-r--r-- | fs/cifs/file.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc7 +EXTRAVERSION = NAME = Sneaky Weasel # *DOCUMENTATION* diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h index c7ad3fe2b25..b928b31424b 100644 --- a/arch/sparc/include/asm/ptrace.h +++ b/arch/sparc/include/asm/ptrace.h @@ -205,6 +205,7 @@ do { current_thread_info()->syscall_noerror = 1; \ } while (0) #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV)) #define instruction_pointer(regs) ((regs)->tpc) +#define instruction_pointer_set(regs, val) ((regs)->tpc = (val)) #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP]) #define regs_return_value(regs) ((regs)->u_regs[UREG_I0]) #ifdef CONFIG_SMP diff --git a/fs/cifs/file.c b/fs/cifs/file.c index bb71471a4d9..a9b4a24f2a1 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1737,7 +1737,7 @@ cifs_iovec_read(struct file *file, const struct iovec *iov, io_parms.pid = pid; io_parms.tcon = pTcon; io_parms.offset = *poffset; - io_parms.length = len; + io_parms.length = cur_len; rc = CIFSSMBRead(xid, &io_parms, &bytes_read, &read_data, &buf_type); pSMBr = (struct smb_com_read_rsp *)read_data; |