summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-12-15 16:30:41 +0000
committerjhb <jhb@FreeBSD.org>2005-12-15 16:30:41 +0000
commitfeebef55c2317813d83aad8ae1afc57eabf9e66c (patch)
tree9ff4a437747bbe0b48bd25f41d4235f7b041fd28
parent3abe21faf25d6ec4ac2be98d89714858d87f7203 (diff)
downloadFreeBSD-src-feebef55c2317813d83aad8ae1afc57eabf9e66c.zip
FreeBSD-src-feebef55c2317813d83aad8ae1afc57eabf9e66c.tar.gz
Remove linux_mib_destroy() (which I actually added in between 5.0 and 5.1)
which existed to cleanup the linux_osname mutex. Now that MTX_SYSINIT() has grown a SYSUNINIT to destroy mutexes on unload, the extra destroy here was redundant and resulted in panics in debug kernels. MFC after: 1 week Reported by: Goran Gajic ggajic at afrodita dot rcub dot bg dot ac dot yu
-rw-r--r--sys/alpha/linux/linux_sysvec.c1
-rw-r--r--sys/amd64/linux32/linux32_sysvec.c1
-rw-r--r--sys/compat/linux/linux_mib.c7
-rw-r--r--sys/compat/linux/linux_mib.h2
-rw-r--r--sys/i386/linux/linux_sysvec.c1
5 files changed, 0 insertions, 12 deletions
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index b6ce778..4ec2957 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -265,7 +265,6 @@ linux_elf_modevent(module_t mod, int type, void *data)
linux_ioctl_unregister_handler(*lihp);
if (bootverbose)
printf("Linux ELF exec handler removed\n");
- linux_mib_destroy();
} else
printf("Could not deinstall ELF interpreter entry\n");
break;
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index d1b1eed..c69b531 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -1083,7 +1083,6 @@ linux_elf_modevent(module_t mod, int type, void *data)
linux_ioctl_unregister_handler(*lihp);
if (bootverbose)
printf("Linux ELF exec handler removed\n");
- linux_mib_destroy();
} else
printf("Could not deinstall ELF interpreter entry\n");
break;
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 916e8ea..0721d52 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -156,13 +156,6 @@ linux_get_prison(struct thread *td)
}
void
-linux_mib_destroy(void)
-{
-
- mtx_destroy(&osname_lock);
-}
-
-void
linux_get_osname(struct thread *td, char *dst)
{
register struct prison *pr;
diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h
index b68e57f..42d9d89 100644
--- a/sys/compat/linux/linux_mib.h
+++ b/sys/compat/linux/linux_mib.h
@@ -31,8 +31,6 @@
#ifndef _LINUX_MIB_H_
#define _LINUX_MIB_H_
-void linux_mib_destroy(void);
-
void linux_get_osname(struct thread *td, char *dst);
int linux_set_osname(struct thread *td, char *osname);
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index e2df7f6..f28371d 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -925,7 +925,6 @@ linux_elf_modevent(module_t mod, int type, void *data)
linux_ioctl_unregister_handler(*lihp);
if (bootverbose)
printf("Linux ELF exec handler removed\n");
- linux_mib_destroy();
} else
printf("Could not deinstall ELF interpreter entry\n");
break;
OpenPOWER on IntegriCloud