git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
char
/
crash.c
diff --git
a/drivers/char/crash.c
b/drivers/char/crash.c
index
43cc96f
..
04de081
100644
(file)
--- a/
drivers/char/crash.c
+++ b/
drivers/char/crash.c
@@
-43,16
+43,16
@@
static loff_t
crash_llseek(struct file * file, loff_t offset, int orig)
{
static loff_t
crash_llseek(struct file * file, loff_t offset, int orig)
{
-
switch (orig) {
-
case 0:
-
file->f_pos = offset;
-
return file->f_pos;
-
case 1:
-
file->f_pos += offset;
-
return file->f_pos;
-
default:
-
return -EINVAL;
-
}
+ switch (orig) {
+ case 0:
+ file->f_pos = offset;
+ return file->f_pos;
+ case 1:
+ file->f_pos += offset;
+ return file->f_pos;
+ default:
+ return -EINVAL;
+ }
}
/*
}
/*
@@
-74,23
+74,23
@@
crash_read(struct file *file, char *buf, size_t count, loff_t *poff)
vaddr = map_virtual(offset, &page);
if (!vaddr)
vaddr = map_virtual(offset, &page);
if (!vaddr)
-
return -EFAULT;
+ return -EFAULT;
-
if (copy_to_user(buf, vaddr, count)) {
+ if (copy_to_user(buf, vaddr, count)) {
unmap_virtual(page);
return -EFAULT;
}
unmap_virtual(page);
read = count;
unmap_virtual(page);
return -EFAULT;
}
unmap_virtual(page);
read = count;
-
*poff += read;
-
return read;
+ *poff += read;
+ return read;
}
static struct file_operations crash_fops = {
}
static struct file_operations crash_fops = {
-
owner:
THIS_MODULE,
-
llseek:
crash_llseek,
-
read:
crash_read,
+
.owner =
THIS_MODULE,
+
.llseek =
crash_llseek,
+
.read =
crash_read,
};
static struct miscdevice crash_dev = {
};
static struct miscdevice crash_dev = {