diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:05:49 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:15:01 +0100 |
| commit | c75361bddb21761cabddde95dcae2059b021ea5d (patch) | |
| tree | 453e39364d41ef6f5281e6e8384da8077331bc26 /arch/um | |
| parent | 62982ad6b013a35c2e49caab2b90855d3ad4531d (diff) | |
| download | kernel_samsung_smdk4412-c75361bddb21761cabddde95dcae2059b021ea5d.zip kernel_samsung_smdk4412-c75361bddb21761cabddde95dcae2059b021ea5d.tar.gz kernel_samsung_smdk4412-c75361bddb21761cabddde95dcae2059b021ea5d.tar.bz2 | |
um: merge skas_ptrace.h 32/64bit variants
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/sys-x86/shared/sysdep/skas_ptrace.h | 25 | ||||
| -rw-r--r-- | arch/um/sys-x86/shared/sysdep/skas_ptrace_32.h | 22 | ||||
| -rw-r--r-- | arch/um/sys-x86/shared/sysdep/skas_ptrace_64.h | 22 |
3 files changed, 21 insertions, 48 deletions
diff --git a/arch/um/sys-x86/shared/sysdep/skas_ptrace.h b/arch/um/sys-x86/shared/sysdep/skas_ptrace.h index e63b575..453febe 100644 --- a/arch/um/sys-x86/shared/sysdep/skas_ptrace.h +++ b/arch/um/sys-x86/shared/sysdep/skas_ptrace.h @@ -1,5 +1,22 @@ -#ifdef __i386__ -#include "skas_ptrace_32.h" -#else -#include "skas_ptrace_64.h" +/* + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) + * Licensed under the GPL + */ + +#ifndef __SYSDEP_X86_SKAS_PTRACE_H +#define __SYSDEP_X86_SKAS_PTRACE_H + +struct ptrace_faultinfo { + int is_write; + unsigned long addr; +}; + +struct ptrace_ldt { + int func; + void *ptr; + unsigned long bytecount; +}; + +#define PTRACE_LDT 54 + #endif diff --git a/arch/um/sys-x86/shared/sysdep/skas_ptrace_32.h b/arch/um/sys-x86/shared/sysdep/skas_ptrace_32.h deleted file mode 100644 index e27b8a7..0000000 --- a/arch/um/sys-x86/shared/sysdep/skas_ptrace_32.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef __SYSDEP_I386_SKAS_PTRACE_H -#define __SYSDEP_I386_SKAS_PTRACE_H - -struct ptrace_faultinfo { - int is_write; - unsigned long addr; -}; - -struct ptrace_ldt { - int func; - void *ptr; - unsigned long bytecount; -}; - -#define PTRACE_LDT 54 - -#endif diff --git a/arch/um/sys-x86/shared/sysdep/skas_ptrace_64.h b/arch/um/sys-x86/shared/sysdep/skas_ptrace_64.h deleted file mode 100644 index 95db4be7..0000000 --- a/arch/um/sys-x86/shared/sysdep/skas_ptrace_64.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef __SYSDEP_X86_64_SKAS_PTRACE_H -#define __SYSDEP_X86_64_SKAS_PTRACE_H - -struct ptrace_faultinfo { - int is_write; - unsigned long addr; -}; - -struct ptrace_ldt { - int func; - void *ptr; - unsigned long bytecount; -}; - -#define PTRACE_LDT 54 - -#endif |