diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -92,11 +92,8 @@ unsigned int fpu_ctx_level; }; -#define current ({ \ - struct thread *__td = curthread; \ - linux_set_current(__td); \ - ((struct task_struct *)__td->td_lkpi_task); \ -}) +struct task_struct *__lkpi_current(void); +#define current (__lkpi_current()) #define task_pid_group_leader(task) (task)->task_thread->td_proc->p_pid #define task_pid(task) ((task)->pid) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -170,6 +170,16 @@ enum system_states system_state = SYSTEM_RUNNING; +struct task_struct * +__lkpi_current(void) +{ + struct thread *td; + + td = curthread; + linux_set_current(td); + return ((struct task_struct *)td->td_lkpi_task); +} + int panic_cmp(struct rb_node *one, struct rb_node *two) {