diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 03:14:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 03:14:49 +0200 |
commit | 03b979dd0323ace8e29a0561cd5232f73a060c09 (patch) | |
tree | 2e9c9fde9c221dc56850e835aeee3f219317ab01 /arch/ia64/kernel/traps.c | |
parent | Merge tag 'docs-for-linus' of git://git.lwn.net/linux (diff) | |
parent | ia64/unaligned: Silence another GCC warning about an uninitialised variable (diff) | |
download | linux-03b979dd0323ace8e29a0561cd5232f73a060c09.tar.xz linux-03b979dd0323ace8e29a0561cd5232f73a060c09.zip |
Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 updates from Tony Luck:
"A bunch of cleanups from Matt and some dead code removal from
Anna-Maria"
* tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64/unaligned: Silence another GCC warning about an uninitialised variable
ia64/traps: Silence GCC warning about uninitialised variable
ia64: Reduce stack usage by iterating over nodemask
ia64/PCI: Remove unused 'addr' and fix build warning
ia64/PCI: Fix incorrect PCI resource end address
ia64: Remove superfluous SMP function call
Diffstat (limited to 'arch/ia64/kernel/traps.c')
-rw-r--r-- | arch/ia64/kernel/traps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 6f7d4a4dcf24..77edd68c5161 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c @@ -548,6 +548,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa, return; } switch (vector) { + default: case 29: siginfo.si_code = TRAP_HWBKPT; #ifdef CONFIG_ITANIUM |