diff options
author | Ingo Molnar | 2013-04-19 13:03:08 +0200 |
---|---|---|
committer | Ingo Molnar | 2013-04-19 13:03:08 +0200 |
commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /arch/mips/include/asm/signal.h | |
parent | Merge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | amd64_edac: Add Family 16h support (diff) | |
download | kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.gz kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.xz kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/signal.h')
-rw-r--r-- | arch/mips/include/asm/signal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h index 197f6367c201..8efe5a9e2c3e 100644 --- a/arch/mips/include/asm/signal.h +++ b/arch/mips/include/asm/signal.h @@ -21,6 +21,6 @@ #include <asm/sigcontext.h> #include <asm/siginfo.h> -#define __ARCH_HAS_ODD_SIGACTION +#define __ARCH_HAS_IRIX_SIGACTION #endif /* _ASM_SIGNAL_H */ |