From 176f349eaa1d0b2d2fbe68c6dc757cc53a2c3bc1 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 24 Jul 2023 03:13:42 +0000 Subject: 注释掉 uintr_event_rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arch/x86/include/asm/uintr.h | 4 ++-- arch/x86/kernel/uintr_core.c | 24 ++++++++++++------------ fs/eventpoll.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/uintr.h b/arch/x86/include/asm/uintr.h index 024a4e1d1da1..caa762d4791a 100644 --- a/arch/x86/include/asm/uintr.h +++ b/arch/x86/include/asm/uintr.h @@ -66,7 +66,7 @@ void uintr_wake_up_process(void); int do_uintr_event_init(int flag); void uintr_event_write(void); -void uintr_event_rst(void); +// void uintr_event_rst(void); #else /* !CONFIG_X86_USER_INTERRUPTS */ @@ -75,7 +75,7 @@ static inline void switch_uintr_prepare(struct task_struct *prev) {} static inline void switch_uintr_return(void) {} static inline void uintr_wake_up_process(void) {} static inline void uintr_event_write(void) {} -static inline void uintr_event_rst(void) {} +// static inline void uintr_event_rst(void) {} #endif /* CONFIG_X86_USER_INTERRUPTS */ diff --git a/arch/x86/kernel/uintr_core.c b/arch/x86/kernel/uintr_core.c index 02e487520973..1357cdcfe8fc 100644 --- a/arch/x86/kernel/uintr_core.c +++ b/arch/x86/kernel/uintr_core.c @@ -541,18 +541,18 @@ int do_uintr_event_init(int fd){ return 0; } -void uintr_event_rst(){ - struct task_struct *tsk = current; - struct uintr_upid_ctx *upid_ctx; - - if (is_uintr_receiver(tsk)){ - upid_ctx = tsk->thread.ui_recv->upid_ctx; - upid_ctx->upid->nc.nv = UINTR_EVENT_VECTOR; - clear_bit(UPID_SN, (unsigned long *)&upid_ctx->upid->nc.status); - clear_bit(UPID_ON, (unsigned long *)&upid_ctx->upid->nc.status); - printk("uintr_event_rst uvect=%d\n", upid_ctx->upid->nc.nv); - } -} +// void uintr_event_rst(){ +// struct task_struct *tsk = current; +// struct uintr_upid_ctx *upid_ctx; + +// if (is_uintr_receiver(tsk)){ +// upid_ctx = tsk->thread.ui_recv->upid_ctx; +// upid_ctx->upid->nc.nv = UINTR_EVENT_VECTOR; +// clear_bit(UPID_SN, (unsigned long *)&upid_ctx->upid->nc.status); +// clear_bit(UPID_ON, (unsigned long *)&upid_ctx->upid->nc.status); +// printk("uintr_event_rst uvect=%d\n", upid_ctx->upid->nc.nv); +// } +// } void destroy_uintr_event(void){ unsigned long flags; diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 9b56aae55b3e..82fc1ea8b677 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -2237,7 +2237,7 @@ SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events, { struct timespec64 to; - uintr_event_rst(); //清除 uint_event 状态 + // uintr_event_rst(); //清除 uint_event 状态 return do_epoll_wait(epfd, events, maxevents, ep_timeout_to_timespec(&to, timeout)); -- cgit v1.2.3