* [PATCH 02/15] um: move amd64 variant of mmap(2) to arch/x86/um/syscalls_64.c
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 03/15] logic_io instance of iounmap() needs volatile on argument Al Viro
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/kernel/Makefile | 2 +-
arch/um/kernel/syscall.c | 28 ----------------------------
arch/x86/um/shared/sysdep/syscalls_64.h | 3 ---
arch/x86/um/sys_call_table_64.c | 3 ---
arch/x86/um/syscalls_64.c | 10 ++++++++++
5 files changed, 11 insertions(+), 35 deletions(-)
delete mode 100644 arch/um/kernel/syscall.c
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index 1d18e4e469895..7ab6d40558b61 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -16,7 +16,7 @@ extra-y := vmlinux.lds
obj-y = config.o exec.o exitcode.o irq.o ksyms.o mem.o \
physmem.o process.o ptrace.o reboot.o sigio.o \
- signal.o syscall.o sysrq.o time.o tlb.o trap.o \
+ signal.o sysrq.o time.o tlb.o trap.o \
um_arch.o umid.o maccess.o kmsg_dump.o capflags.o skas/
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
deleted file mode 100644
index eed54c53fbbb9..0000000000000
--- a/arch/um/kernel/syscall.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- */
-
-#include <linux/file.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/utsname.h>
-#include <linux/syscalls.h>
-#include <asm/current.h>
-#include <asm/mman.h>
-#include <linux/uaccess.h>
-#include <asm/unistd.h>
-
-long old_mmap(unsigned long addr, unsigned long len,
- unsigned long prot, unsigned long flags,
- unsigned long fd, unsigned long offset)
-{
- long err = -EINVAL;
- if (offset & ~PAGE_MASK)
- goto out;
-
- err = ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
- out:
- return err;
-}
diff --git a/arch/x86/um/shared/sysdep/syscalls_64.h b/arch/x86/um/shared/sysdep/syscalls_64.h
index 8a7d5e1da98e5..48d6cd12f8a5e 100644
--- a/arch/x86/um/shared/sysdep/syscalls_64.h
+++ b/arch/x86/um/shared/sysdep/syscalls_64.h
@@ -23,9 +23,6 @@ extern syscall_handler_t *sys_call_table[];
UPT_SYSCALL_ARG5(®s->regs), \
UPT_SYSCALL_ARG6(®s->regs)))
-extern long old_mmap(unsigned long addr, unsigned long len,
- unsigned long prot, unsigned long flags,
- unsigned long fd, unsigned long pgoff);
extern syscall_handler_t sys_modify_ldt;
extern syscall_handler_t sys_arch_prctl;
diff --git a/arch/x86/um/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c
index 82b695ed23c41..b0b4cfd2308c8 100644
--- a/arch/x86/um/sys_call_table_64.c
+++ b/arch/x86/um/sys_call_table_64.c
@@ -18,9 +18,6 @@
#define sys_iopl sys_ni_syscall
#define sys_ioperm sys_ni_syscall
-/* On UML we call it this way ("old" means it's not mmap2) */
-#define sys_mmap old_mmap
-
#define __SYSCALL(nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
#include <asm/syscalls_64.h>
diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c
index 58f51667e2e4b..ad974f8ddf11b 100644
--- a/arch/x86/um/syscalls_64.c
+++ b/arch/x86/um/syscalls_64.c
@@ -87,3 +87,13 @@ void arch_switch_to(struct task_struct *to)
arch_prctl(to, ARCH_SET_FS, (void __user *) to->thread.arch.fs);
}
+
+SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
+ unsigned long, prot, unsigned long, flags,
+ unsigned long, fd, unsigned long, off)
+{
+ if (off & ~PAGE_MASK)
+ return -EINVAL;
+
+ return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
+}
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 03/15] logic_io instance of iounmap() needs volatile on argument
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
2021-09-20 21:32 ` [PATCH 02/15] um: move amd64 variant of mmap(2) to arch/x86/um/syscalls_64.c Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 04/15] um: stop polluting the namespace with registers.h contents Al Viro
` (11 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
... same as the rest of implementations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
include/asm-generic/logic_io.h | 2 +-
lib/logic_iomem.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/asm-generic/logic_io.h b/include/asm-generic/logic_io.h
index a53116b8c57ef..8a59b6e567df7 100644
--- a/include/asm-generic/logic_io.h
+++ b/include/asm-generic/logic_io.h
@@ -34,7 +34,7 @@
void __iomem *ioremap(phys_addr_t offset, size_t size);
#define iounmap iounmap
-void iounmap(void __iomem *addr);
+void iounmap(void volatile __iomem *addr);
#define __raw_readb __raw_readb
u8 __raw_readb(const volatile void __iomem *addr);
diff --git a/lib/logic_iomem.c b/lib/logic_iomem.c
index 9bdfde0c0f86d..bfb8053205b17 100644
--- a/lib/logic_iomem.c
+++ b/lib/logic_iomem.c
@@ -76,7 +76,7 @@ static void __iomem *real_ioremap(phys_addr_t offset, size_t size)
return NULL;
}
-static void real_iounmap(void __iomem *addr)
+static void real_iounmap(volatile void __iomem *addr)
{
WARN(1, "invalid iounmap for addr 0x%llx\n",
(unsigned long long __force)addr);
@@ -149,7 +149,7 @@ get_area(const volatile void __iomem *addr)
return NULL;
}
-void iounmap(void __iomem *addr)
+void iounmap(volatile void __iomem *addr)
{
struct logic_iomem_area *area = get_area(addr);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/15] um: stop polluting the namespace with registers.h contents
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
2021-09-20 21:32 ` [PATCH 02/15] um: move amd64 variant of mmap(2) to arch/x86/um/syscalls_64.c Al Viro
2021-09-20 21:32 ` [PATCH 03/15] logic_io instance of iounmap() needs volatile on argument Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 05/15] uml/i386: missing include in barrier.h Al Viro
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
Only one extern in there is needed in processor-generic.h, and it's
not needed anywhere else. So move it over there and get rid of
the include in processor-generic.h, adding includes of registers.h
to the few files that need the declarations in it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/asm/processor-generic.h | 2 +-
arch/um/include/shared/registers.h | 2 --
arch/um/kernel/exec.c | 1 +
arch/um/kernel/process.c | 1 +
arch/x86/um/os-Linux/registers.c | 1 +
arch/x86/um/ptrace_32.c | 1 +
arch/x86/um/ptrace_64.c | 1 +
arch/x86/um/signal.c | 1 +
arch/x86/um/syscalls_64.c | 1 +
9 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index b5cf0ed116d9e..5e809b5beffdd 100644
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -11,7 +11,6 @@ struct pt_regs;
struct task_struct;
#include <asm/ptrace.h>
-#include <registers.h>
#include <sysdep/archsetjmp.h>
#include <linux/prefetch.h>
@@ -105,6 +104,7 @@ extern struct cpuinfo_um boot_cpu_data;
#define current_cpu_data boot_cpu_data
#define cache_line_size() (boot_cpu_data.cache_alignment)
+extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
#define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
extern unsigned long get_wchan(struct task_struct *p);
diff --git a/arch/um/include/shared/registers.h b/arch/um/include/shared/registers.h
index 0c50fa6e8a55b..1e434f0e9477a 100644
--- a/arch/um/include/shared/registers.h
+++ b/arch/um/include/shared/registers.h
@@ -7,7 +7,6 @@
#define __REGISTERS_H
#include <sysdep/ptrace.h>
-#include <sysdep/archsetjmp.h>
extern int save_i387_registers(int pid, unsigned long *fp_regs);
extern int restore_i387_registers(int pid, unsigned long *fp_regs);
@@ -19,7 +18,6 @@ extern int save_registers(int pid, struct uml_pt_regs *regs);
extern int restore_registers(int pid, struct uml_pt_regs *regs);
extern int init_registers(int pid);
extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs);
-extern unsigned long get_thread_reg(int reg, jmp_buf *buf);
extern int get_fp_registers(int pid, unsigned long *regs);
extern int put_fp_registers(int pid, unsigned long *regs);
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 4d84981003419..c85e40c72779f 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -16,6 +16,7 @@
#include <linux/uaccess.h>
#include <as-layout.h>
#include <mem_user.h>
+#include <registers.h>
#include <skas.h>
#include <os.h>
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 457a38db368b7..a5a430c637ba1 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -31,6 +31,7 @@
#include <kern_util.h>
#include <os.h>
#include <skas.h>
+#include <registers.h>
#include <linux/time-internal.h>
/*
diff --git a/arch/x86/um/os-Linux/registers.c b/arch/x86/um/os-Linux/registers.c
index 3c423dfcd78bf..df8f4b4bf98b9 100644
--- a/arch/x86/um/os-Linux/registers.c
+++ b/arch/x86/um/os-Linux/registers.c
@@ -15,6 +15,7 @@
#include <sys/uio.h>
#include <asm/sigcontext.h>
#include <linux/elf.h>
+#include <registers.h>
int have_xstate_support;
diff --git a/arch/x86/um/ptrace_32.c b/arch/x86/um/ptrace_32.c
index 2497bac560663..0bc4b73a9cdea 100644
--- a/arch/x86/um/ptrace_32.c
+++ b/arch/x86/um/ptrace_32.c
@@ -7,6 +7,7 @@
#include <linux/sched.h>
#include <linux/uaccess.h>
#include <asm/ptrace-abi.h>
+#include <registers.h>
#include <skas.h>
extern int arch_switch_tls(struct task_struct *to);
diff --git a/arch/x86/um/ptrace_64.c b/arch/x86/um/ptrace_64.c
index 1401899dee9b2..289d0159b041e 100644
--- a/arch/x86/um/ptrace_64.c
+++ b/arch/x86/um/ptrace_64.c
@@ -11,6 +11,7 @@
#define __FRAME_OFFSETS
#include <asm/ptrace.h>
#include <linux/uaccess.h>
+#include <registers.h>
#include <asm/ptrace-abi.h>
/*
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index 7c11c9e5d7eaa..263e1d08f2160 100644
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
@@ -12,6 +12,7 @@
#include <linux/uaccess.h>
#include <asm/ucontext.h>
#include <frame_kern.h>
+#include <registers.h>
#include <skas.h>
#ifdef CONFIG_X86_32
diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c
index ad974f8ddf11b..6a98334e0949d 100644
--- a/arch/x86/um/syscalls_64.c
+++ b/arch/x86/um/syscalls_64.c
@@ -10,6 +10,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
#include <asm/prctl.h> /* XXX This should get the constants from libc */
+#include <registers.h>
#include <os.h>
long arch_prctl(struct task_struct *task, int option,
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 05/15] uml/i386: missing include in barrier.h
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (2 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 04/15] um: stop polluting the namespace with registers.h contents Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 06/15] um: kill unused cpu() Al Viro
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
we need cpufeatures.h there
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/x86/um/asm/barrier.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h
index 165be7f9a9644..4da3369656987 100644
--- a/arch/x86/um/asm/barrier.h
+++ b/arch/x86/um/asm/barrier.h
@@ -2,6 +2,7 @@
#ifndef _ASM_UM_BARRIER_H_
#define _ASM_UM_BARRIER_H_
+#include <asm/cpufeatures.h>
#include <asm/alternative.h>
/*
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/15] um: kill unused cpu()
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (3 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 05/15] uml/i386: missing include in barrier.h Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 07/15] um: remove a dangling extern of syscall_trace() Al Viro
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/kern_util.h | 1 -
arch/um/kernel/process.c | 5 -----
2 files changed, 6 deletions(-)
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
index a2cfd42608a0c..fbfff76065c5b 100644
--- a/arch/um/include/shared/kern_util.h
+++ b/arch/um/include/shared/kern_util.h
@@ -53,7 +53,6 @@ extern void do_uml_exitcalls(void);
extern int __cant_sleep(void);
extern int get_current_pid(void);
extern int copy_from_user_proc(void *to, void *from, int size);
-extern int cpu(void);
extern char *uml_strdup(const char *string);
extern unsigned long to_irq_stack(unsigned long *mask_out);
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index a5a430c637ba1..d5079a35e48ae 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -264,11 +264,6 @@ int clear_user_proc(void __user *buf, int size)
return clear_user(buf, size);
}
-int cpu(void)
-{
- return current_thread_info()->cpu;
-}
-
static atomic_t using_sysemu = ATOMIC_INIT(0);
int sysemu_supported;
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/15] um: remove a dangling extern of syscall_trace()
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (4 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 06/15] um: kill unused cpu() Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 08/15] um: unexport handle_page_fault() Al Viro
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
the function had been gone since 2012...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/kern_util.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
index fbfff76065c5b..d8b8b4f07e429 100644
--- a/arch/um/include/shared/kern_util.h
+++ b/arch/um/include/shared/kern_util.h
@@ -58,7 +58,6 @@ extern char *uml_strdup(const char *string);
extern unsigned long to_irq_stack(unsigned long *mask_out);
extern unsigned long from_irq_stack(int nested);
-extern void syscall_trace(struct uml_pt_regs *regs, int entryexit);
extern int singlestepping(void *t);
extern void segv_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 08/15] um: unexport handle_page_fault()
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (5 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 07/15] um: remove a dangling extern of syscall_trace() Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 09/15] um, x86: bury crypto_tfm_ctx_offset Al Viro
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/kernel/trap.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 3198c47673879..92989f7831017 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -127,7 +127,6 @@ int handle_page_fault(unsigned long address, unsigned long ip,
pagefault_out_of_memory();
return 0;
}
-EXPORT_SYMBOL(handle_page_fault);
static void show_segv_info(struct uml_pt_regs *regs)
{
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 09/15] um, x86: bury crypto_tfm_ctx_offset
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (6 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 08/15] um: unexport handle_page_fault() Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 10/15] um: common-offsets.h debriding Al Viro
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
unused since 2011
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/common-offsets.h | 3 ---
arch/x86/kernel/asm-offsets.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h
index edc90ab737347..b2483104e27f0 100644
--- a/arch/um/include/shared/common-offsets.h
+++ b/arch/um/include/shared/common-offsets.h
@@ -18,9 +18,6 @@ DEFINE(UM_NR_CPUS, NR_CPUS);
DEFINE(UM_GFP_KERNEL, GFP_KERNEL);
DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC);
-/* For crypto assembler code. */
-DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-
DEFINE(UM_THREAD_SIZE, THREAD_SIZE);
DEFINE(UM_HZ, HZ);
diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index ecd3fd6993d1a..9fb0a2f8b62a2 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -38,9 +38,6 @@ static void __used common(void)
#endif
BLANK();
- OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
-
- BLANK();
OFFSET(pbe_address, pbe, address);
OFFSET(pbe_orig_address, pbe, orig_address);
OFFSET(pbe_next, pbe, next);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/15] um: common-offsets.h debriding...
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (7 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 09/15] um, x86: bury crypto_tfm_ctx_offset Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 11/15] um: header debriding - activate_ipi() Al Viro
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/common-offsets.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h
index b2483104e27f0..96195483fbd0f 100644
--- a/arch/um/include/shared/common-offsets.h
+++ b/arch/um/include/shared/common-offsets.h
@@ -9,29 +9,17 @@ DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK);
DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT);
DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
-DEFINE(UM_ELF_CLASS, ELF_CLASS);
-DEFINE(UM_ELFCLASS32, ELFCLASS32);
-DEFINE(UM_ELFCLASS64, ELFCLASS64);
-
-DEFINE(UM_NR_CPUS, NR_CPUS);
-
DEFINE(UM_GFP_KERNEL, GFP_KERNEL);
DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC);
DEFINE(UM_THREAD_SIZE, THREAD_SIZE);
-DEFINE(UM_HZ, HZ);
-
-DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC);
DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);
#ifdef CONFIG_PRINTK
DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK);
#endif
-#ifdef CONFIG_NO_HZ_COMMON
-DEFINE(UML_CONFIG_NO_HZ_COMMON, CONFIG_NO_HZ_COMMON);
-#endif
#ifdef CONFIG_UML_X86
DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86);
#endif
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 11/15] um: header debriding - activate_ipi()
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (8 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 10/15] um: common-offsets.h debriding Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 12/15] um: header debriding - mem_user.h Al Viro
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
... had been dead for 15 years.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/irq_user.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
index 86a8a573b65c6..da0f6eea30d01 100644
--- a/arch/um/include/shared/irq_user.h
+++ b/arch/um/include/shared/irq_user.h
@@ -20,6 +20,5 @@ void sigio_run_timetravel_handlers(void);
extern void free_irq_by_fd(int fd);
extern void deactivate_fd(int fd, int irqnum);
extern int deactivate_all_fds(void);
-extern int activate_ipi(int fd, int pid);
#endif
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 12/15] um: header debriding - mem_user.h
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (9 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 11/15] um: header debriding - activate_ipi() Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:32 ` [PATCH 13/15] um: header debriding - net_*.h Al Viro
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
get_vm(), add_iomem(), phys_offset() dead since 2004;
init_mem_user() and setup_memory() - since before the initial merge.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/mem_user.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/um/include/shared/mem_user.h b/arch/um/include/shared/mem_user.h
index cb84414e3e666..11a723a58545e 100644
--- a/arch/um/include/shared/mem_user.h
+++ b/arch/um/include/shared/mem_user.h
@@ -46,16 +46,11 @@ extern int iomem_size;
#define ROUND_4M(n) ((((unsigned long) (n)) + (1 << 22)) & ~((1 << 22) - 1))
-extern int init_mem_user(void);
-extern void setup_memory(void *entry);
extern unsigned long find_iomem(char *driver, unsigned long *len_out);
extern void mem_total_pages(unsigned long physmem, unsigned long iomem,
unsigned long highmem);
-extern unsigned long get_vm(unsigned long len);
extern void setup_physmem(unsigned long start, unsigned long usable,
unsigned long len, unsigned long long highmem);
-extern void add_iomem(char *name, int fd, unsigned long size);
-extern unsigned long phys_offset(unsigned long phys);
extern void map_memory(unsigned long virt, unsigned long phys,
unsigned long len, int r, int w, int x);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 13/15] um: header debriding - net_*.h
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (10 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 12/15] um: header debriding - mem_user.h Al Viro
@ 2021-09-20 21:32 ` Al Viro
2021-09-20 21:33 ` [PATCH 14/15] um: header debriding - os.h Al Viro
2021-09-20 21:33 ` [PATCH 15/15] um: header debriding - sigio.h Al Viro
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:32 UTC (permalink / raw)
To: linux-um
externs dead since before the initial merge
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/net_kern.h | 2 --
arch/um/include/shared/net_user.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/arch/um/include/shared/net_kern.h b/arch/um/include/shared/net_kern.h
index a87be13c5b877..441a8a3093294 100644
--- a/arch/um/include/shared/net_kern.h
+++ b/arch/um/include/shared/net_kern.h
@@ -59,8 +59,6 @@ struct transport {
const int setup_size;
};
-extern struct net_device *ether_init(int);
-extern unsigned short ether_protocol(struct sk_buff *);
extern int tap_setup_common(char *str, char *type, char **dev_name,
char **mac_out, char **gate_addr);
extern void register_transport(struct transport *new);
diff --git a/arch/um/include/shared/net_user.h b/arch/um/include/shared/net_user.h
index 1b0531769a5eb..ba92a4d935312 100644
--- a/arch/um/include/shared/net_user.h
+++ b/arch/um/include/shared/net_user.h
@@ -24,7 +24,6 @@ struct net_user_info {
int mtu;
};
-extern void ether_user_init(void *data, void *dev);
extern void iter_addresses(void *d, void (*cb)(unsigned char *,
unsigned char *, void *),
void *arg);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 14/15] um: header debriding - os.h
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (11 preceding siblings ...)
2021-09-20 21:32 ` [PATCH 13/15] um: header debriding - net_*.h Al Viro
@ 2021-09-20 21:33 ` Al Viro
2021-09-20 21:33 ` [PATCH 15/15] um: header debriding - sigio.h Al Viro
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:33 UTC (permalink / raw)
To: linux-um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/os.h | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index 96d400387c93e..d01304354a525 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -159,20 +159,11 @@ extern int os_create_unix_socket(const char *file, int len, int close_on_exec);
extern int os_shutdown_socket(int fd, int r, int w);
extern void os_close_file(int fd);
extern int os_rcv_fd(int fd, int *helper_pid_out);
-extern int create_unix_socket(char *file, int len, int close_on_exec);
extern int os_connect_socket(const char *name);
extern int os_file_type(char *file);
extern int os_file_mode(const char *file, struct openflags *mode_out);
extern int os_lock_file(int fd, int excl);
extern void os_flush_stdout(void);
-extern int os_stat_filesystem(char *path, long *bsize_out,
- long long *blocks_out, long long *bfree_out,
- long long *bavail_out, long long *files_out,
- long long *ffree_out, void *fsid_out,
- int fsid_size, long *namelen_out,
- long *spare_out);
-extern int os_change_dir(char *dir);
-extern int os_fchange_dir(int fd);
extern unsigned os_major(unsigned long long dev);
extern unsigned os_minor(unsigned long long dev);
extern unsigned long long os_makedev(unsigned major, unsigned minor);
@@ -232,7 +223,6 @@ extern char *get_umid(void);
/* signal.c */
extern void timer_set_signal_handler(void);
extern void set_sigstack(void *sig_stack, int size);
-extern void remove_sigstack(void);
extern void set_handler(int sig);
extern void send_sigio_to_self(void);
extern int change_sig(int signal, int on);
@@ -266,7 +256,6 @@ extern int os_timer_create(void);
extern int os_timer_set_interval(unsigned long long nsecs);
extern int os_timer_one_shot(unsigned long long nsecs);
extern void os_timer_disable(void);
-extern void uml_idle_timer(void);
extern long long os_persistent_clock_emulation(void);
extern long long os_nsecs(void);
@@ -290,8 +279,6 @@ extern int is_skas_winch(int pid, int fd, void *data);
extern int start_userspace(unsigned long stub_stack);
extern int copy_context_skas0(unsigned long stack, int pid);
extern void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs);
-extern int map_stub_pages(int fd, unsigned long code, unsigned long data,
- unsigned long stack);
extern void new_thread(void *stack, jmp_buf *buf, void (*handler)(void));
extern void switch_threads(jmp_buf *me, jmp_buf *you);
extern int start_idle_thread(void *stack, jmp_buf *switch_buf);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 15/15] um: header debriding - sigio.h
2021-09-20 21:32 ` [PATCH 01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c Al Viro
` (12 preceding siblings ...)
2021-09-20 21:33 ` [PATCH 14/15] um: header debriding - os.h Al Viro
@ 2021-09-20 21:33 ` Al Viro
13 siblings, 0 replies; 16+ messages in thread
From: Al Viro @ 2021-09-20 21:33 UTC (permalink / raw)
To: linux-um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/um/include/shared/sigio.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/um/include/shared/sigio.h b/arch/um/include/shared/sigio.h
index 8fe8f57c05de8..e60c8b2278449 100644
--- a/arch/um/include/shared/sigio.h
+++ b/arch/um/include/shared/sigio.h
@@ -7,7 +7,6 @@
#define __SIGIO_H__
extern int write_sigio_irq(int fd);
-extern int register_sigio_fd(int fd);
extern void sigio_lock(void);
extern void sigio_unlock(void);
--
2.11.0
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 16+ messages in thread