From 7019fd6b8f582546c4e077bbb8e95cd0282f2662 Mon Sep 17 00:00:00 2001 From: Deng-Cheng Zhu Date: Wed, 9 Jun 2010 12:35:25 +0800 Subject: [PATCH] --- yaml --- r: 211288 b: refs/heads/master c: 2b78920d19870561a8b7503b8e869a6da5f07d3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/Kconfig | 1 + trunk/arch/mips/include/asm/atomic.h | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f4ca48257080..8609805c7ca8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 543001f8d8a878c3babe4525cb16d83d25c16762 +refs/heads/master: 2b78920d19870561a8b7503b8e869a6da5f07d3f diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index 3ad59dde4852..ec410009e8f0 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -13,6 +13,7 @@ config MIPS select HAVE_KPROBES select HAVE_KRETPROBES select RTC_LIB if !MACH_LOONGSON + select GENERIC_ATOMIC64 if !64BIT mainmenu "Linux/MIPS Kernel Configuration" diff --git a/trunk/arch/mips/include/asm/atomic.h b/trunk/arch/mips/include/asm/atomic.h index c63c56bfd184..47d87da379f9 100644 --- a/trunk/arch/mips/include/asm/atomic.h +++ b/trunk/arch/mips/include/asm/atomic.h @@ -782,6 +782,10 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) */ #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0) +#else /* !CONFIG_64BIT */ + +#include + #endif /* CONFIG_64BIT */ /*