projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpi-scan' and 'acpi-prm'
[linux-2.6-microblaze.git]
/
mm
/
ksm.c
diff --git
a/mm/ksm.c
b/mm/ksm.c
index
3fa9bc8
..
0253381
100644
(file)
--- a/
mm/ksm.c
+++ b/
mm/ksm.c
@@
-259,7
+259,7
@@
static unsigned long ksm_stable_node_chains;
static unsigned long ksm_stable_node_dups;
/* Delay in pruning stale stable_node_dups in the stable_node_chains */
static unsigned long ksm_stable_node_dups;
/* Delay in pruning stale stable_node_dups in the stable_node_chains */
-static int ksm_stable_node_chains_prune_millisecs = 2000;
+static
unsigned
int ksm_stable_node_chains_prune_millisecs = 2000;
/* Maximum number of page slots sharing a stable node */
static int ksm_max_page_sharing = 256;
/* Maximum number of page slots sharing a stable node */
static int ksm_max_page_sharing = 256;
@@
-3105,11
+3105,11
@@
stable_node_chains_prune_millisecs_store(struct kobject *kobj,
struct kobj_attribute *attr,
const char *buf, size_t count)
{
struct kobj_attribute *attr,
const char *buf, size_t count)
{
- unsigned
long
msecs;
+ unsigned
int
msecs;
int err;
int err;
- err = kstrtou
l
(buf, 10, &msecs);
- if (err
|| msecs > UINT_MAX
)
+ err = kstrtou
int
(buf, 10, &msecs);
+ if (err)
return -EINVAL;
ksm_stable_node_chains_prune_millisecs = msecs;
return -EINVAL;
ksm_stable_node_chains_prune_millisecs = msecs;