[PATCH 9/22] ia64: Introducing asm/syscalls.h

[PATCH 9/22] ia64: Introducing asm/syscalls.h

[Jaswinder Singh]

Declaring arch-dependent syscalls for ia64 architecture

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
---
 arch/ia64/kernel/process.c  |    1 +
 arch/ia64/kernel/signal.c   |    1 +
 include/asm-ia64/syscalls.h |   38 ++++++++++++++++++++++++++++++++++++++
 include/asm-ia64/unistd.h   |   14 +-------------
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 3ab8373..3b668a9 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/kdebug.h>
 #include <linux/utsname.h>
+#include <linux/syscalls.h>
 
 #include <asm/cpu.h>
 #include <asm/delay.h>
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 19c5a78..7b249da 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -19,6 +19,7 @@
 #include <linux/binfmts.h>
 #include <linux/unistd.h>
 #include <linux/wait.h>
+#include <linux/syscalls.h>
 
 #include <asm/ia32.h>
 #include <asm/intrinsics.h>
diff --git a/include/asm-ia64/syscalls.h b/include/asm-ia64/syscalls.h
index e69de29..71af530 100644
--- a/include/asm-ia64/syscalls.h
+++ b/include/asm-ia64/syscalls.h
@@ -0,0 +1,38 @@
+/*
+ * syscalls.h - Linux syscall interfaces (arch-specific)
+ *
+ * Copyright (c) 2008 Jaswinder Singh
+ *
+ * This file is released under the GPLv2.
+ * See the file COPYING for more details.
+ *
+ * Please do not call me directly, include linux/syscalls.h
+ */
+
+#ifndef _ASM_IA64_SYSCALLS_H
+#define _ASM_IA64_SYSCALLS_H
+
+/* kernel/process.c */
+long sys_execve(char __user *, char __user * __user *,
+		 char __user * __user *, struct pt_regs *);
+
+/* kernel/signal.c */
+asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *,
+				long, long, long, long, long, long,
+				struct pt_regs);
+
+/* kernel/sys_ia64.c */
+asmlinkage unsigned long sys_getpagesize(void);
+asmlinkage long sys_pipe(void);
+asmlinkage unsigned long sys_mmap2(unsigned long, unsigned long,
+				   int, int, int, long);
+asmlinkage unsigned long sys_mmap(unsigned long, unsigned long,
+				  int, int, int, long);
+#ifndef CONFIG_PCI
+asmlinkage long sys_pciconfig_read(unsigned long, unsigned long,
+				   unsigned long, unsigned long, void *);
+asmlinkage long sys_pciconfig_write(unsigned long, unsigned long,
+				    unsigned long, unsigned long, void *);
+#endif /* CONFIG_PCI */
+
+#endif /* _ASM_IA64_SYSCALLS_H */
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index e603147..6b0e8c6 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -342,22 +342,10 @@
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include <linux/compiler.h>
+#include <linux/syscalls.h>
 
 extern long __ia64_syscall (long a0, long a1, long a2, long a3, long a4, long nr);
 
-asmlinkage unsigned long sys_mmap(
-				unsigned long addr, unsigned long len,
-				int prot, int flags,
-				int fd, long off);
-asmlinkage unsigned long sys_mmap2(
-				unsigned long addr, unsigned long len,
-				int prot, int flags,
-				int fd, long pgoff);
-struct pt_regs;
-struct sigaction;
-long sys_execve(char __user *filename, char __user * __user *argv,
-			   char __user * __user *envp, struct pt_regs *regs);
-asmlinkage long sys_pipe(void);
 asmlinkage long sys_rt_sigaction(int sig,
 				 const struct sigaction __user *act,
 				 struct sigaction __user *oact,
-- 
1.5.5.1

Re: [PATCH 9/22] ia64: Introducing asm/syscalls.h

[Matthew Wilcox]

On Mon, Jul 21, 2008 at 05:03:55AM +0530, Jaswinder Singh wrote:
> Declaring arch-dependent syscalls for ia64 architecture
> +#ifndef CONFIG_PCI
> +asmlinkage long sys_pciconfig_read(unsigned long, unsigned long,
> +				   unsigned long, unsigned long, void *);
> +asmlinkage long sys_pciconfig_write(unsigned long, unsigned long,
> +				    unsigned long, unsigned long, void *);
> +#endif /* CONFIG_PCI */

These are already declared in linux/syscalls.h

And frankly, we should just make these return -ENOSYS always.  Any
software that uses them is stuffed on machines with multiple domains.

-- 
Intel are signing my paycheques ... these opinions are still mine
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Re: [PATCH 9/22] ia64: Introducing asm/syscalls.h

[Jaswinder Singh]

Hello Matthew,

On Sun, 2008-07-20 at 18:19 -0600, Matthew Wilcox wrote:
> On Mon, Jul 21, 2008 at 05:03:55AM +0530, Jaswinder Singh wrote:
> > Declaring arch-dependent syscalls for ia64 architecture
> > +#ifndef CONFIG_PCI
> > +asmlinkage long sys_pciconfig_read(unsigned long, unsigned long,
> > +				   unsigned long, unsigned long, void *);
> > +asmlinkage long sys_pciconfig_write(unsigned long, unsigned long,
> > +				    unsigned long, unsigned long, void *);
> > +#endif /* CONFIG_PCI */
> 
> These are already declared in linux/syscalls.h
> 
> And frankly, we should just make these return -ENOSYS always.  Any
> software that uses them is stuffed on machines with multiple domains.
> 

diff --git a/include/asm-ia64/syscalls.h b/include/asm-ia64/syscalls.h
index 71af530..8799e14 100644
--- a/include/asm-ia64/syscalls.h
+++ b/include/asm-ia64/syscalls.h
@@ -28,11 +28,5 @@ asmlinkage unsigned long sys_mmap2(unsigned long, unsigned long,
 				   int, int, int, long);
 asmlinkage unsigned long sys_mmap(unsigned long, unsigned long,
 				  int, int, int, long);
-#ifndef CONFIG_PCI
-asmlinkage long sys_pciconfig_read(unsigned long, unsigned long,
-				   unsigned long, unsigned long, void *);
-asmlinkage long sys_pciconfig_write(unsigned long, unsigned long,
-				    unsigned long, unsigned long, void *);
-#endif /* CONFIG_PCI */
 
 #endif /* _ASM_IA64_SYSCALLS_H */

Thank you,

Jaswinder Singh.