diff options
Diffstat (limited to 'mm/shmem.c')
-rw-r--r-- | mm/shmem.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index f514dd392cd9..d8ef7ba831a5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -1079,7 +1079,8 @@ redirty: | |||
1079 | 1079 | ||
1080 | #ifdef CONFIG_NUMA | 1080 | #ifdef CONFIG_NUMA |
1081 | #ifdef CONFIG_TMPFS | 1081 | #ifdef CONFIG_TMPFS |
1082 | static int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_nodes) | 1082 | static int shmem_parse_mpol(char *value, unsigned short *policy, |
1083 | nodemask_t *policy_nodes) | ||
1083 | { | 1084 | { |
1084 | char *nodelist = strchr(value, ':'); | 1085 | char *nodelist = strchr(value, ':'); |
1085 | int err = 1; | 1086 | int err = 1; |
@@ -1128,7 +1129,7 @@ out: | |||
1128 | return err; | 1129 | return err; |
1129 | } | 1130 | } |
1130 | 1131 | ||
1131 | static void shmem_show_mpol(struct seq_file *seq, int policy, | 1132 | static void shmem_show_mpol(struct seq_file *seq, unsigned short policy, |
1132 | const nodemask_t policy_nodes) | 1133 | const nodemask_t policy_nodes) |
1133 | { | 1134 | { |
1134 | char *policy_string; | 1135 | char *policy_string; |
@@ -1197,13 +1198,13 @@ static struct page *shmem_alloc_page(gfp_t gfp, | |||
1197 | } | 1198 | } |
1198 | #else /* !CONFIG_NUMA */ | 1199 | #else /* !CONFIG_NUMA */ |
1199 | #ifdef CONFIG_TMPFS | 1200 | #ifdef CONFIG_TMPFS |
1200 | static inline int shmem_parse_mpol(char *value, int *policy, | 1201 | static inline int shmem_parse_mpol(char *value, unsigned short *policy, |
1201 | nodemask_t *policy_nodes) | 1202 | nodemask_t *policy_nodes) |
1202 | { | 1203 | { |
1203 | return 1; | 1204 | return 1; |
1204 | } | 1205 | } |
1205 | 1206 | ||
1206 | static inline void shmem_show_mpol(struct seq_file *seq, int policy, | 1207 | static inline void shmem_show_mpol(struct seq_file *seq, unsigned short policy, |
1207 | const nodemask_t policy_nodes) | 1208 | const nodemask_t policy_nodes) |
1208 | { | 1209 | { |
1209 | } | 1210 | } |