diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 13:34:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 13:34:20 -0700 |
| commit | 711f77f53c5ff6aa61dbe8e5f518e50d6306e89d (patch) | |
| tree | 93bc99051b26586916a628b1a276543085f80ff2 /drivers | |
| parent | 024a6b95181f2df6090975c8a293499d24bf8b28 (diff) | |
| parent | 273fca0ecad9305247043815e185d1bfd04047d4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Define ARCH_SLAB_MINALIGN
drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
sparc64: Fix stack dumping and tracing when function graph is enabled.
sparc64: Show stack backtrace from show_regs() just like other platforms.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sbus/char/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 19f255b97c8..d3b62eb0fba 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -105,9 +105,9 @@ static ssize_t flash_read(struct file * file, char __user * buf, size_t count, loff_t *ppos) { - unsigned long p = file->f_pos; + loff_t p = *ppos; int i; - + if (count > flash.read_size - p) count = flash.read_size - p; @@ -118,7 +118,7 @@ flash_read(struct file * file, char __user * buf, buf++; } - file->f_pos += count; + *ppos += count; return count; } |