projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugfix into test branch
[powerpc.git]
/
fs
/
proc
/
vmcore.c
diff --git
a/fs/proc/vmcore.c
b/fs/proc/vmcore.c
index
5378d7c
..
d960507
100644
(file)
--- a/
fs/proc/vmcore.c
+++ b/
fs/proc/vmcore.c
@@
-7,14
+7,12
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/elf.h>
#include <linux/elfcore.h>
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/elf.h>
#include <linux/elfcore.h>
-#include <linux/proc_fs.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>
@@
-42,7
+40,7
@@
struct proc_dir_entry *proc_vmcore = NULL;
/* Reads a page from the oldmem device from given offset. */
static ssize_t read_from_oldmem(char *buf, size_t count,
/* Reads a page from the oldmem device from given offset. */
static ssize_t read_from_oldmem(char *buf, size_t count,
-
loff_t
*ppos, int userbuf)
+
u64
*ppos, int userbuf)
{
unsigned long pfn, offset;
size_t nr_bytes;
{
unsigned long pfn, offset;
size_t nr_bytes;
@@
-104,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)
@@
-173,7
+171,7
@@
static int open_vmcore(struct inode *inode, struct file *filp)
return 0;
}
return 0;
}
-struct file_operations proc_vmcore_operations = {
+
const
struct file_operations proc_vmcore_operations = {
.read = read_vmcore,
.open = open_vmcore,
};
.read = read_vmcore,
.open = open_vmcore,
};