diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 02:39:29 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 02:39:29 +0100 |
| commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
| tree | c08504e4d2fa51ac91cef544f336d0169806c49f /arch/x86/kernel/dumpstack_64.c | |
| parent | Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | copy_from_iter_nocache() (diff) | |
| download | linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'arch/x86/kernel/dumpstack_64.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 1abcb50b48ae..ff86f19b5758 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -24,7 +24,6 @@ static char x86_stack_ids[][8] = { [ DEBUG_STACK-1 ] = "#DB", [ NMI_STACK-1 ] = "NMI", [ DOUBLEFAULT_STACK-1 ] = "#DF", - [ STACKFAULT_STACK-1 ] = "#SS", [ MCE_STACK-1 ] = "#MC", #if DEBUG_STKSZ > EXCEPTION_STKSZ [ N_EXCEPTION_STACKS ... |