hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[S390] Convert extmem spin_lock into a mutex. 

There's no need to have a spin_lock here, but need sleepable context
for vmem_map. Therefore convert the spin_lock into a mutex.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2006-12-04 15:40:51 +01:00 committed by Martin Schwidefsky
parent 1681cedaee
commit 09252e77ed
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/s390/mm/extmem.c
View File

@ -78,7 +78,7 @@ struct dcss_segment {
int segcnt; int segcnt;
}; };
static DEFINE_SPINLOCK(dcss_lock); static DEFINE_MUTEX(dcss_lock);
static struct list_head dcss_list = LIST_HEAD_INIT(dcss_list); static struct list_head dcss_list = LIST_HEAD_INIT(dcss_list);
static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC", static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC",
"EW/EN-MIXED" }; "EW/EN-MIXED" };
@ -114,7 +114,7 @@ segment_by_name (char *name)
struct list_head *l; struct list_head *l;
struct dcss_segment *tmp, *retval = NULL; struct dcss_segment *tmp, *retval = NULL;
assert_spin_locked(&dcss_lock); BUG_ON(!mutex_is_locked(&dcss_lock));
dcss_mkname (name, dcss_name); dcss_mkname (name, dcss_name);
list_for_each (l, &dcss_list) { list_for_each (l, &dcss_list) {
tmp = list_entry (l, struct dcss_segment, list); tmp = list_entry (l, struct dcss_segment, list);
@ -269,7 +269,7 @@ segment_overlaps_others (struct dcss_segment *seg)
struct list_head *l; struct list_head *l;
struct dcss_segment *tmp; struct dcss_segment *tmp;
assert_spin_locked(&dcss_lock); BUG_ON(!mutex_is_locked(&dcss_lock));
list_for_each(l, &dcss_list) { list_for_each(l, &dcss_list) {
tmp = list_entry(l, struct dcss_segment, list); tmp = list_entry(l, struct dcss_segment, list);
if ((tmp->start_addr >> 20) > (seg->end >> 20)) if ((tmp->start_addr >> 20) > (seg->end >> 20))
@ -426,7 +426,7 @@ segment_load (char *name, int do_nonshared, unsigned long *addr,
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
return -ENOSYS; return -ENOSYS;
spin_lock (&dcss_lock); mutex_lock(&dcss_lock);
seg = segment_by_name (name); seg = segment_by_name (name);
if (seg == NULL) if (seg == NULL)
rc = __segment_load (name, do_nonshared, addr, end); rc = __segment_load (name, do_nonshared, addr, end);
@ -441,7 +441,7 @@ segment_load (char *name, int do_nonshared, unsigned long *addr,
rc = -EPERM; rc = -EPERM;
} }
} }
spin_unlock (&dcss_lock); mutex_unlock(&dcss_lock);
return rc; return rc;
} }
@ -464,7 +464,7 @@ segment_modify_shared (char *name, int do_nonshared)
unsigned long dummy; unsigned long dummy;
int dcss_command, rc, diag_cc; int dcss_command, rc, diag_cc;
spin_lock (&dcss_lock); mutex_lock(&dcss_lock);
seg = segment_by_name (name); seg = segment_by_name (name);
if (seg == NULL) { if (seg == NULL) {
rc = -EINVAL; rc = -EINVAL;
@ -505,7 +505,7 @@ segment_modify_shared (char *name, int do_nonshared)
&dummy, &dummy); &dummy, &dummy);
kfree(seg); kfree(seg);
out_unlock: out_unlock:
spin_unlock(&dcss_lock); mutex_unlock(&dcss_lock);
return rc; return rc;
} }
@ -523,7 +523,7 @@ segment_unload(char *name)
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
return; return;
spin_lock(&dcss_lock); mutex_lock(&dcss_lock);
seg = segment_by_name (name); seg = segment_by_name (name);
if (seg == NULL) { if (seg == NULL) {
PRINT_ERR ("could not find segment %s in segment_unload, " PRINT_ERR ("could not find segment %s in segment_unload, "
@ -537,7 +537,7 @@ segment_unload(char *name)
kfree(seg); kfree(seg);
} }
out_unlock: out_unlock:
spin_unlock(&dcss_lock); mutex_unlock(&dcss_lock);
} }
/* /*
@ -556,7 +556,7 @@ segment_save(char *name)
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
return; return;
spin_lock(&dcss_lock); mutex_lock(&dcss_lock);
seg = segment_by_name (name); seg = segment_by_name (name);
if (seg == NULL) { if (seg == NULL) {
@ -589,7 +589,7 @@ segment_save(char *name)
goto out; goto out;
} }
out: out:
spin_unlock(&dcss_lock); mutex_unlock(&dcss_lock);
} }
EXPORT_SYMBOL(segment_load); EXPORT_SYMBOL(segment_load);