adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

/dev/mem: remove redundant parameter from do_write_kmem()

Browse source 
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Avi Kivity <avi@qumranet.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Wu Fengguang 2009-12-14 17:58:10 -08:00 committed by Linus Torvalds
parent 80ad89a0ce
commit ee32398fda
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/char/mem.c
View file

@ -461,7 +461,7 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
static inline ssize_t static inline ssize_t
do_write_kmem(void *p, unsigned long realp, const char __user * buf, do_write_kmem(unsigned long p, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
ssize_t written, sz; ssize_t written, sz;
@ -470,12 +470,11 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
written = 0; written = 0;
#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
/* we don't have page 0 mapped on sparc and m68k.. */ /* we don't have page 0 mapped on sparc and m68k.. */
if (realp < PAGE_SIZE) { if (p < PAGE_SIZE) {
sz = size_inside_page(realp, count); sz = size_inside_page(p, count);
/* Hmm. Do something? */ /* Hmm. Do something? */
buf += sz; buf += sz;
p += sz; p += sz;
realp += sz;
count -= sz; count -= sz;
written += sz; written += sz;
} }
@ -484,14 +483,14 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
while (count > 0) { while (count > 0) {
char *ptr; char *ptr;
sz = size_inside_page(realp, count); sz = size_inside_page(p, count);
/* /*
* On ia64 if a page has been mapped somewhere as * On ia64 if a page has been mapped somewhere as
* uncached, then it must also be accessed uncached * uncached, then it must also be accessed uncached
* by the kernel or data corruption may occur * by the kernel or data corruption may occur
*/ */
ptr = xlate_dev_kmem_ptr(p); ptr = xlate_dev_kmem_ptr((char *)p);
copied = copy_from_user(ptr, buf, sz); copied = copy_from_user(ptr, buf, sz);
if (copied) { if (copied) {
@ -502,7 +501,6 @@ do_write_kmem(void *p, unsigned long realp, const char __user * buf,
} }
buf += sz; buf += sz;
p += sz; p += sz;
realp += sz;
count -= sz; count -= sz;
written += sz; written += sz;
} }
@ -526,7 +524,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
if (p < (unsigned long) high_memory) { if (p < (unsigned long) high_memory) {
unsigned long to_write = min_t(unsigned long, count, unsigned long to_write = min_t(unsigned long, count,
(unsigned long)high_memory - p); (unsigned long)high_memory - p);
wrote = do_write_kmem((void *)p, p, buf, to_write, ppos); wrote = do_write_kmem(p, buf, to_write, ppos);
if (wrote != to_write) if (wrote != to_write)
return wrote; return wrote;
p += wrote; p += wrote;