projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
fs
/
proc
/
vmcore.c
diff --git
a/fs/proc/vmcore.c
b/fs/proc/vmcore.c
index
7efa73d
..
d960507
100644
(file)
--- a/
fs/proc/vmcore.c
+++ b/
fs/proc/vmcore.c
@@
-7,7
+7,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/user.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/user.h>
@@
-103,8
+102,8
@@
static ssize_t read_vmcore(struct file *file, char __user *buffer,
size_t buflen, loff_t *fpos)
{
ssize_t acc = 0, tmp;
size_t buflen, loff_t *fpos)
{
ssize_t acc = 0, tmp;
- size_t tsz
, nr_bytes
;
- u64 start;
+ size_t tsz;
+ u64 start
, nr_bytes
;
struct vmcore *curr_m = NULL;
if (buflen == 0 || *fpos >= vmcore_size)
struct vmcore *curr_m = NULL;
if (buflen == 0 || *fpos >= vmcore_size)