diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 16:34:46 (GMT) |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 16:34:46 (GMT) |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /arch/parisc/include/asm/traps.h | |
| parent | e363bbac316ffb5daaf45d855f82680148cafe20 (diff) | |
| parent | 355e62f5ad12b005c862838156262eb2df2f8dff (diff) | |
| download | linux-fsl-qoriq-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.xz | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'arch/parisc/include/asm/traps.h')
| -rw-r--r-- | arch/parisc/include/asm/traps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h index 1945f99..4736020 100644 --- a/arch/parisc/include/asm/traps.h +++ b/arch/parisc/include/asm/traps.h @@ -6,7 +6,7 @@ struct pt_regs; /* traps.c */ void parisc_terminate(char *msg, struct pt_regs *regs, - int code, unsigned long offset); + int code, unsigned long offset) __noreturn __cold; /* mm/fault.c */ void do_page_fault(struct pt_regs *regs, unsigned long code, |