projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[linux-2.6-block.git]
/
fs
/
proc
/
vmcore.c
diff --git
a/fs/proc/vmcore.c
b/fs/proc/vmcore.c
index 0872afa58d3987682bbdb4afdfdf5e24a95669f7..91c817ff02c3847a874e1e99f7638b1148869a77 100644
(file)
--- a/
fs/proc/vmcore.c
+++ b/
fs/proc/vmcore.c
@@
-12,6
+12,7
@@
#include <linux/user.h>
#include <linux/elf.h>
#include <linux/elfcore.h>
#include <linux/user.h>
#include <linux/elf.h>
#include <linux/elfcore.h>
+#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/bootmem.h>
#include <linux/init.h>
#include <linux/highmem.h>
#include <linux/bootmem.h>
#include <linux/init.h>
@@
-162,6
+163,7
@@
static ssize_t read_vmcore(struct file *file, char __user *buffer,
static const struct file_operations proc_vmcore_operations = {
.read = read_vmcore,
static const struct file_operations proc_vmcore_operations = {
.read = read_vmcore,
+ .llseek = generic_file_llseek,
};
static struct vmcore* __init get_new_element(void)
};
static struct vmcore* __init get_new_element(void)