From 35cc46119d256364f179d7b3554f06ba468af3f7 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 15 Oct 2007 23:28:20 +0200 Subject: [PATCH] x86: unify include/asm/kdebug_32/64.h The 64 bit variant has additional function prototypes which do no harm for 32 bit. Signed-off-by: Thomas Gleixner --- include/asm-x86/{kdebug_64.h => kdebug.h} | 7 ++++--- include/asm-x86/kdebug_32.h | 27 --------------------------- 2 files changed, 4 insertions(+), 30 deletions(-) rename include/asm-x86/{kdebug_64.h => kdebug.h} (85%) delete mode 100644 include/asm-x86/kdebug_32.h diff --git a/include/asm-x86/kdebug_64.h b/include/asm-x86/kdebug.h similarity index 85% rename from include/asm-x86/kdebug_64.h rename to include/asm-x86/kdebug.h index df413e05375..e2f9b62e535 100644 --- a/include/asm-x86/kdebug_64.h +++ b/include/asm-x86/kdebug.h @@ -1,7 +1,7 @@ -#ifndef _X86_64_KDEBUG_H -#define _X86_64_KDEBUG_H 1 +#ifndef _ASM_X86_KDEBUG_H +#define _ASM_X86_KDEBUG_H -#include +#include struct pt_regs; @@ -19,6 +19,7 @@ enum die_val { DIE_GPF, DIE_CALL, DIE_NMI_IPI, + DIE_PAGE_FAULT, }; extern void printk_address(unsigned long address); diff --git a/include/asm-x86/kdebug_32.h b/include/asm-x86/kdebug_32.h deleted file mode 100644 index 181d437eef4..00000000000 --- a/include/asm-x86/kdebug_32.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _I386_KDEBUG_H -#define _I386_KDEBUG_H 1 - -/* - * Aug-05 2004 Ported by Prasanna S Panchamukhi - * from x86_64 architecture. - */ - -struct pt_regs; - -/* Grossly misnamed. */ -enum die_val { - DIE_OOPS = 1, - DIE_INT3, - DIE_DEBUG, - DIE_PANIC, - DIE_NMI, - DIE_DIE, - DIE_NMIWATCHDOG, - DIE_KERNELDEBUG, - DIE_TRAP, - DIE_GPF, - DIE_CALL, - DIE_NMI_IPI, -}; - -#endif -- 2.11.4.GIT