From 3f0bde835364fd503ac836ebb7d6cac7352a1f30 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 15 Oct 2007 23:28:21 +0200 Subject: x86: unify include/asm/unwind_32/64.h 32bit has an extra UNW_FP define, which does not hurt. Signed-off-by: Thomas Gleixner --- include/asm-x86/unwind.h | 18 +++++++++++++----- include/asm-x86/unwind_32.h | 13 ------------- include/asm-x86/unwind_64.h | 12 ------------ 3 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 include/asm-x86/unwind_32.h delete mode 100644 include/asm-x86/unwind_64.h (limited to 'include') diff --git a/include/asm-x86/unwind.h b/include/asm-x86/unwind.h index 7e4d7ad5520..8b064bd9c55 100644 --- a/include/asm-x86/unwind.h +++ b/include/asm-x86/unwind.h @@ -1,5 +1,13 @@ -#ifdef CONFIG_X86_32 -# include "unwind_32.h" -#else -# include "unwind_64.h" -#endif +#ifndef _ASM_X86_UNWIND_H +#define _ASM_X86_UNWIND_H + +#define UNW_PC(frame) ((void)(frame), 0UL) +#define UNW_SP(frame) ((void)(frame), 0UL) +#define UNW_FP(frame) ((void)(frame), 0UL) + +static inline int arch_unw_user_mode(const void *info) +{ + return 0; +} + +#endif /* _ASM_X86_UNWIND_H */ diff --git a/include/asm-x86/unwind_32.h b/include/asm-x86/unwind_32.h deleted file mode 100644 index 43c70c3de2f..00000000000 --- a/include/asm-x86/unwind_32.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _ASM_I386_UNWIND_H -#define _ASM_I386_UNWIND_H - -#define UNW_PC(frame) ((void)(frame), 0) -#define UNW_SP(frame) ((void)(frame), 0) -#define UNW_FP(frame) ((void)(frame), 0) - -static inline int arch_unw_user_mode(const void *info) -{ - return 0; -} - -#endif /* _ASM_I386_UNWIND_H */ diff --git a/include/asm-x86/unwind_64.h b/include/asm-x86/unwind_64.h deleted file mode 100644 index 02710f6a456..00000000000 --- a/include/asm-x86/unwind_64.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _ASM_X86_64_UNWIND_H -#define _ASM_X86_64_UNWIND_H - -#define UNW_PC(frame) ((void)(frame), 0UL) -#define UNW_SP(frame) ((void)(frame), 0UL) - -static inline int arch_unw_user_mode(const void *info) -{ - return 0; -} - -#endif /* _ASM_X86_64_UNWIND_H */ -- cgit v1.2.3