diff options
Diffstat (limited to 'arch/s390/kernel/cache.c')
-rw-r--r-- | arch/s390/kernel/cache.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c index 64b24650e4f8..dd62071624be 100644 --- a/arch/s390/kernel/cache.c +++ b/arch/s390/kernel/cache.c | |||
@@ -173,7 +173,7 @@ error: | |||
173 | } | 173 | } |
174 | } | 174 | } |
175 | 175 | ||
176 | static struct cache_dir *__cpuinit cache_create_cache_dir(int cpu) | 176 | static struct cache_dir *cache_create_cache_dir(int cpu) |
177 | { | 177 | { |
178 | struct cache_dir *cache_dir; | 178 | struct cache_dir *cache_dir; |
179 | struct kobject *kobj = NULL; | 179 | struct kobject *kobj = NULL; |
@@ -289,9 +289,8 @@ static struct kobj_type cache_index_type = { | |||
289 | .default_attrs = cache_index_default_attrs, | 289 | .default_attrs = cache_index_default_attrs, |
290 | }; | 290 | }; |
291 | 291 | ||
292 | static int __cpuinit cache_create_index_dir(struct cache_dir *cache_dir, | 292 | static int cache_create_index_dir(struct cache_dir *cache_dir, |
293 | struct cache *cache, int index, | 293 | struct cache *cache, int index, int cpu) |
294 | int cpu) | ||
295 | { | 294 | { |
296 | struct cache_index_dir *index_dir; | 295 | struct cache_index_dir *index_dir; |
297 | int rc; | 296 | int rc; |
@@ -313,7 +312,7 @@ out: | |||
313 | return rc; | 312 | return rc; |
314 | } | 313 | } |
315 | 314 | ||
316 | static int __cpuinit cache_add_cpu(int cpu) | 315 | static int cache_add_cpu(int cpu) |
317 | { | 316 | { |
318 | struct cache_dir *cache_dir; | 317 | struct cache_dir *cache_dir; |
319 | struct cache *cache; | 318 | struct cache *cache; |
@@ -335,7 +334,7 @@ static int __cpuinit cache_add_cpu(int cpu) | |||
335 | return 0; | 334 | return 0; |
336 | } | 335 | } |
337 | 336 | ||
338 | static void __cpuinit cache_remove_cpu(int cpu) | 337 | static void cache_remove_cpu(int cpu) |
339 | { | 338 | { |
340 | struct cache_index_dir *index, *next; | 339 | struct cache_index_dir *index, *next; |
341 | struct cache_dir *cache_dir; | 340 | struct cache_dir *cache_dir; |
@@ -354,8 +353,8 @@ static void __cpuinit cache_remove_cpu(int cpu) | |||
354 | cache_dir_cpu[cpu] = NULL; | 353 | cache_dir_cpu[cpu] = NULL; |
355 | } | 354 | } |
356 | 355 | ||
357 | static int __cpuinit cache_hotplug(struct notifier_block *nfb, | 356 | static int cache_hotplug(struct notifier_block *nfb, unsigned long action, |
358 | unsigned long action, void *hcpu) | 357 | void *hcpu) |
359 | { | 358 | { |
360 | int cpu = (long)hcpu; | 359 | int cpu = (long)hcpu; |
361 | int rc = 0; | 360 | int rc = 0; |