um: nommu: add ifdefs for nommu

Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
thehajime · Sep 10, 2024 · 3c387ac · 3c387ac
1 parent e762cd7
commit 3c387ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
@@ -35,6 +35,7 @@ void ptrace_disable(struct task_struct *child)
 	user_disable_single_step(child);
 }
 
+#ifdef CONFIG_MMU
 long arch_ptrace(struct task_struct *child, long request,
 		 unsigned long addr, unsigned long data)
 {
@@ -150,3 +151,17 @@ void syscall_trace_leave(struct pt_regs *regs)
 	if (ptraced & PT_PTRACED)
 		set_thread_flag(TIF_SIGPENDING);
 }
+#else
+long arch_ptrace(struct task_struct *child, long request,
+		 unsigned long addr, unsigned long data)
+{
+	return -EINVAL;
+}
+
+const struct user_regset_view *task_user_regset_view(struct task_struct *);
+const struct user_regset_view *task_user_regset_view(struct task_struct *task)
+{
+	BUG();
+	return 0;
+}
+#endif
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
@@ -24,6 +24,7 @@
 int handle_page_fault(unsigned long address, unsigned long ip,
 		      int is_write, int is_user, int *code_out)
 {
+#ifdef CONFIG_MMU
 	struct mm_struct *mm = current->mm;
 	struct vm_area_struct *vma;
 	pmd_t *pmd;
@@ -128,6 +129,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
 	if (!is_user)
 		goto out_nosemaphore;
 	pagefault_out_of_memory();
+#endif
 	return 0;
 }