From 6304ba4616cdf0c169c71d7f20dbae95d28b10a0 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 27 Sep 2021 13:34:02 +0800 Subject: [PATCH] backout syscall patch --- kernel/src/syscall.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index 2e4b557bf..0646183a3 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -631,10 +631,6 @@ pub fn handle_inner(pid: PID, tid: TID, in_irq: bool, call: SysCall) -> SysCallR let virt_ptr = virt .map(|x| x.get() as *mut u8) .unwrap_or(core::ptr::null_mut()); - let mut req_flags = req_flags; - if phys.is_none() { - req_flags |= xous_kernel::MemoryFlags::X; - } // Don't let the address exceed the user area (unless it's PID 1) if pid.get() != 1 @@ -725,7 +721,7 @@ pub fn handle_inner(pid: PID, tid: TID, in_irq: bool, call: SysCall) -> SysCallR }; MemoryManager::with_mut(|mm| { Ok(xous_kernel::Result::MemoryRange( - mm.reserve_range(start, delta, flags | xous_kernel::MemoryFlags::X)?, + mm.reserve_range(start, delta, flags)?, )) }) }