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 tag 'for-5.12/libata-2021-02-17' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
mm
/
swap_slots.c
diff --git
a/mm/swap_slots.c
b/mm/swap_slots.c
index
3e64535
..
0357fbe
100644
(file)
--- a/
mm/swap_slots.c
+++ b/
mm/swap_slots.c
@@
-237,7
+237,7
@@
static int free_slot_cache(unsigned int cpu)
return 0;
}
return 0;
}
-
int
enable_swap_slots_cache(void)
+
void
enable_swap_slots_cache(void)
{
mutex_lock(&swap_slots_cache_enable_mutex);
if (!swap_slot_cache_initialized) {
{
mutex_lock(&swap_slots_cache_enable_mutex);
if (!swap_slot_cache_initialized) {
@@
-255,7
+255,6
@@
int enable_swap_slots_cache(void)
__reenable_swap_slots_cache();
out_unlock:
mutex_unlock(&swap_slots_cache_enable_mutex);
__reenable_swap_slots_cache();
out_unlock:
mutex_unlock(&swap_slots_cache_enable_mutex);
- return 0;
}
/* called with swap slot cache's alloc lock held */
}
/* called with swap slot cache's alloc lock held */