projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
dumpstack_64.c
diff --git
a/arch/x86/kernel/dumpstack_64.c
b/arch/x86/kernel/dumpstack_64.c
index
460ae7f
..
4a94d38
100644
(file)
--- a/
arch/x86/kernel/dumpstack_64.c
+++ b/
arch/x86/kernel/dumpstack_64.c
@@
-22,15
+22,13
@@
static const char * const exception_stack_names[] = {
[ ESTACK_DF ] = "#DF",
[ ESTACK_NMI ] = "NMI",
static const char * const exception_stack_names[] = {
[ ESTACK_DF ] = "#DF",
[ ESTACK_NMI ] = "NMI",
- [ ESTACK_DB2 ] = "#DB2",
- [ ESTACK_DB1 ] = "#DB1",
[ ESTACK_DB ] = "#DB",
[ ESTACK_MCE ] = "#MC",
};
const char *stack_type_name(enum stack_type type)
{
[ ESTACK_DB ] = "#DB",
[ ESTACK_MCE ] = "#MC",
};
const char *stack_type_name(enum stack_type type)
{
- BUILD_BUG_ON(N_EXCEPTION_STACKS !=
6
);
+ BUILD_BUG_ON(N_EXCEPTION_STACKS !=
4
);
if (type == STACK_TYPE_IRQ)
return "IRQ";
if (type == STACK_TYPE_IRQ)
return "IRQ";
@@
-79,7
+77,6
@@
static const
struct estack_pages estack_pages[CEA_ESTACK_PAGES] ____cacheline_aligned = {
EPAGERANGE(DF),
EPAGERANGE(NMI),
struct estack_pages estack_pages[CEA_ESTACK_PAGES] ____cacheline_aligned = {
EPAGERANGE(DF),
EPAGERANGE(NMI),
- EPAGERANGE(DB1),
EPAGERANGE(DB),
EPAGERANGE(MCE),
};
EPAGERANGE(DB),
EPAGERANGE(MCE),
};
@@
-91,7
+88,7
@@
static bool in_exception_stack(unsigned long *stack, struct stack_info *info)
struct pt_regs *regs;
unsigned int k;
struct pt_regs *regs;
unsigned int k;
- BUILD_BUG_ON(N_EXCEPTION_STACKS !=
6
);
+ BUILD_BUG_ON(N_EXCEPTION_STACKS !=
4
);
begin = (unsigned long)__this_cpu_read(cea_exception_stacks);
/*
begin = (unsigned long)__this_cpu_read(cea_exception_stacks);
/*