Page MenuHomeFreeBSD
Files F136613140

D19257.id54151.diff
No OneTemporary
Actions

D19257.id54151.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/compat.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/compat.h
+++ sys/compat/linuxkpi/common/include/linux/compat.h
@@ -46,8 +46,6 @@
static inline void
linux_set_current(struct thread *td)
{
- if (__predict_false(lkpi_alloc_current == NULL))
- return;
if (__predict_false(td->td_lkpi_task == NULL))
lkpi_alloc_current(td, M_WAITOK);
}
@@ -55,8 +53,6 @@
static inline int
linux_set_current_flags(struct thread *td, int flags)
{
- if (__predict_false(lkpi_alloc_current == NULL))
- return (0);
if (__predict_false(td->td_lkpi_task == NULL))
return (lkpi_alloc_current(td, flags));
return (0);
Index: sys/compat/linuxkpi/common/src/linux_current.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_current.c
+++ sys/compat/linuxkpi/common/src/linux_current.c
@@ -218,9 +218,9 @@
static void
linux_current_init(void *arg __unused)
{
+ lkpi_alloc_current = linux_alloc_current;
linuxkpi_thread_dtor_tag = EVENTHANDLER_REGISTER(thread_dtor,
linuxkpi_thread_dtor, NULL, EVENTHANDLER_PRI_ANY);
- lkpi_alloc_current = linux_alloc_current;
}
SYSINIT(linux_current, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, linux_current_init, NULL);
@@ -243,7 +243,7 @@
PROC_UNLOCK(p);
}
sx_sunlock(&allproc_lock);
- lkpi_alloc_current = NULL;
EVENTHANDLER_DEREGISTER(thread_dtor, linuxkpi_thread_dtor_tag);
+ lkpi_alloc_current = linux_alloc_current_noop;
}
SYSUNINIT(linux_current, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, linux_current_uninit, NULL);
Index: sys/kern/init_main.c
===================================================================
--- sys/kern/init_main.c
+++ sys/kern/init_main.c
@@ -106,7 +106,14 @@
struct thread0_storage thread0_st __aligned(32);
struct vmspace vmspace0;
struct proc *initproc;
-int (*lkpi_alloc_current)(struct thread *, int);
+
+int
+linux_alloc_current_noop(struct thread *td __unused, int flags __unused)
+{
+ return (0);
+}
+int (*lkpi_alloc_current)(struct thread *, int) = linux_alloc_current_noop;
+
#ifndef BOOTHOWTO
#define BOOTHOWTO 0
@@ -455,7 +462,7 @@
GIANT_REQUIRED;
p = &proc0;
td = &thread0;
-
+
/*
* Initialize magic number and osrel.
*/
Index: sys/sys/systm.h
===================================================================
--- sys/sys/systm.h
+++ sys/sys/systm.h
@@ -237,6 +237,13 @@
void init_static_kenv(char *, size_t);
void tablefull(const char *);
+/*
+ * Allocate per-thread "current" state in the linuxkpi
+ */
+extern int (*lkpi_alloc_current)(struct thread *, int);
+int linux_alloc_current_noop(struct thread *, int);
+
+
#if defined(KLD_MODULE) || defined(KTR_CRITICAL) || !defined(_KERNEL) || defined(GENOFFSET)
#define critical_enter() critical_enter_KBI()
#define critical_exit() critical_exit_KBI()

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 2:19 PM (10 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25641399
Default Alt Text
D19257.id54151.diff (2 KB)

Event Timeline