projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipmi: add new IPMI nmi watchdog handling
[powerpc.git]
/
drivers
/
s390
/
block
/
dasd_proc.c
diff --git
a/drivers/s390/block/dasd_proc.c
b/drivers/s390/block/dasd_proc.c
index
ad23aed
..
8b3b0f4
100644
(file)
--- a/
drivers/s390/block/dasd_proc.c
+++ b/
drivers/s390/block/dasd_proc.c
@@
-11,7
+11,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/ctype.h>
#include <linux/seq_file.h>
#include <linux/vmalloc.h>
#include <linux/ctype.h>
#include <linux/seq_file.h>
#include <linux/vmalloc.h>
@@
-29,7
+28,7
@@
static struct proc_dir_entry *dasd_proc_root_entry = NULL;
static struct proc_dir_entry *dasd_devices_entry = NULL;
static struct proc_dir_entry *dasd_statistics_entry = NULL;
static struct proc_dir_entry *dasd_devices_entry = NULL;
static struct proc_dir_entry *dasd_statistics_entry = NULL;
-static
inline
char *
+static char *
dasd_get_user_string(const char __user *user_buf, size_t user_len)
{
char *buffer;
dasd_get_user_string(const char __user *user_buf, size_t user_len)
{
char *buffer;
@@
-148,14
+147,14
@@
static int dasd_devices_open(struct inode *inode, struct file *file)
return seq_open(file, &dasd_devices_seq_ops);
}
return seq_open(file, &dasd_devices_seq_ops);
}
-static struct file_operations dasd_devices_file_ops = {
+static
const
struct file_operations dasd_devices_file_ops = {
.open = dasd_devices_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
.open = dasd_devices_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
-static in
line in
t
+static int
dasd_calc_metrics(char *page, char **start, off_t off,
int count, int *eof, int len)
{
dasd_calc_metrics(char *page, char **start, off_t off,
int count, int *eof, int len)
{
@@
-168,8
+167,8
@@
dasd_calc_metrics(char *page, char **start, off_t off,
return len;
}
return len;
}
-static
inline
char *
-dasd_statistics_array(char *str, int *array, int shift)
+static char *
+dasd_statistics_array(char *str,
unsigned
int *array, int shift)
{
int i;
{
int i;