projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-5653 into release branch
[powerpc.git]
/
arch
/
s390
/
mm
/
cmm.c
diff --git
a/arch/s390/mm/cmm.c
b/arch/s390/mm/cmm.c
index
2d5cb13
..
51596f4
100644
(file)
--- a/
arch/s390/mm/cmm.c
+++ b/
arch/s390/mm/cmm.c
@@
-42,8
+42,8
@@
static volatile long cmm_timed_pages_target = 0;
static long cmm_timeout_pages = 0;
static long cmm_timeout_seconds = 0;
static long cmm_timeout_pages = 0;
static long cmm_timeout_seconds = 0;
-static struct cmm_page_array *cmm_page_list =
0
;
-static struct cmm_page_array *cmm_timed_page_list =
0
;
+static struct cmm_page_array *cmm_page_list =
NULL
;
+static struct cmm_page_array *cmm_timed_page_list =
NULL
;
static unsigned long cmm_thread_active = 0;
static struct work_struct cmm_thread_starter;
static unsigned long cmm_thread_active = 0;
static struct work_struct cmm_thread_starter;
@@
-259,7
+259,7
@@
static struct ctl_table cmm_table[];
static int
cmm_pages_handler(ctl_table *ctl, int write, struct file *filp,
static int
cmm_pages_handler(ctl_table *ctl, int write, struct file *filp,
- void *buffer, size_t *lenp, loff_t *ppos)
+ void
__user
*buffer, size_t *lenp, loff_t *ppos)
{
char buf[16], *p;
long pages;
{
char buf[16], *p;
long pages;
@@
-300,7
+300,7
@@
cmm_pages_handler(ctl_table *ctl, int write, struct file *filp,
static int
cmm_timeout_handler(ctl_table *ctl, int write, struct file *filp,
static int
cmm_timeout_handler(ctl_table *ctl, int write, struct file *filp,
- void *buffer, size_t *lenp, loff_t *ppos)
+ void
__user
*buffer, size_t *lenp, loff_t *ppos)
{
char buf[64], *p;
long pages, seconds;
{
char buf[64], *p;
long pages, seconds;
@@
-339,19
+339,19
@@
static struct ctl_table cmm_table[] = {
{
.ctl_name = VM_CMM_PAGES,
.procname = "cmm_pages",
{
.ctl_name = VM_CMM_PAGES,
.procname = "cmm_pages",
- .mode = 06
00
,
+ .mode = 06
44
,
.proc_handler = &cmm_pages_handler,
},
{
.ctl_name = VM_CMM_TIMED_PAGES,
.procname = "cmm_timed_pages",
.proc_handler = &cmm_pages_handler,
},
{
.ctl_name = VM_CMM_TIMED_PAGES,
.procname = "cmm_timed_pages",
- .mode = 06
00
,
+ .mode = 06
44
,
.proc_handler = &cmm_pages_handler,
},
{
.ctl_name = VM_CMM_TIMEOUT,
.procname = "cmm_timeout",
.proc_handler = &cmm_pages_handler,
},
{
.ctl_name = VM_CMM_TIMEOUT,
.procname = "cmm_timeout",
- .mode = 06
00
,
+ .mode = 06
44
,
.proc_handler = &cmm_timeout_handler,
},
{ .ctl_name = 0 }
.proc_handler = &cmm_timeout_handler,
},
{ .ctl_name = 0 }
@@
-419,7
+419,7
@@
cmm_init (void)
#ifdef CONFIG_CMM_IUCV
smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);
#endif
#ifdef CONFIG_CMM_IUCV
smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);
#endif
- INIT_WORK(&cmm_thread_starter, (void *) cmm_start_thread,
0
);
+ INIT_WORK(&cmm_thread_starter, (void *) cmm_start_thread,
NULL
);
init_waitqueue_head(&cmm_thread_wait);
init_timer(&cmm_timer);
return 0;
init_waitqueue_head(&cmm_thread_wait);
init_timer(&cmm_timer);
return 0;