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 <tglx@linutronix.de>
This commit is contained in:
parent
612d26a72a
commit
35cc46119d
3 changed files with 32 additions and 63 deletions
|
@ -1,5 +1,33 @@
|
|||
#ifdef CONFIG_X86_32
|
||||
# include "kdebug_32.h"
|
||||
#else
|
||||
# include "kdebug_64.h"
|
||||
#ifndef _ASM_X86_KDEBUG_H
|
||||
#define _ASM_X86_KDEBUG_H
|
||||
|
||||
#include <linux/notifier.h>
|
||||
|
||||
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,
|
||||
DIE_PAGE_FAULT,
|
||||
};
|
||||
|
||||
extern void printk_address(unsigned long address);
|
||||
extern void die(const char *,struct pt_regs *,long);
|
||||
extern void __die(const char *,struct pt_regs *,long);
|
||||
extern void show_registers(struct pt_regs *regs);
|
||||
extern void dump_pagetable(unsigned long);
|
||||
extern unsigned long oops_begin(void);
|
||||
extern void oops_end(unsigned long);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
#ifndef _I386_KDEBUG_H
|
||||
#define _I386_KDEBUG_H 1
|
||||
|
||||
/*
|
||||
* Aug-05 2004 Ported by Prasanna S Panchamukhi <prasanna@in.ibm.com>
|
||||
* 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
|
|
@ -1,32 +0,0 @@
|
|||
#ifndef _X86_64_KDEBUG_H
|
||||
#define _X86_64_KDEBUG_H 1
|
||||
|
||||
#include <linux/compiler.h>
|
||||
|
||||
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,
|
||||
};
|
||||
|
||||
extern void printk_address(unsigned long address);
|
||||
extern void die(const char *,struct pt_regs *,long);
|
||||
extern void __die(const char *,struct pt_regs *,long);
|
||||
extern void show_registers(struct pt_regs *regs);
|
||||
extern void dump_pagetable(unsigned long);
|
||||
extern unsigned long oops_begin(void);
|
||||
extern void oops_end(unsigned long);
|
||||
|
||||
#endif
|
Loading…
Reference in a new issue