summaryrefslogtreecommitdiffstats
path: root/arch/unicore32
diff options
context:
space:
mode:
authorGuan Xuetao <gxt@mprc.pku.edu.cn>2012-06-14 15:39:48 +0800
committerGuan Xuetao <gxt@mprc.pku.edu.cn>2012-11-09 17:30:09 +0800
commit195d4577d1d7ab1f0398b3190547c116b56f435f (patch)
tree338acc4628ed9c1c660bdc75763c090687f3a404 /arch/unicore32
parent446d141e1c84d34c70592b53443b06533703c324 (diff)
downloadlinux-195d4577d1d7ab1f0398b3190547c116b56f435f.tar.gz
linux-195d4577d1d7ab1f0398b3190547c116b56f435f.tar.bz2
linux-195d4577d1d7ab1f0398b3190547c116b56f435f.zip
UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
When disintegrate system.h, I left an error in asm/cmpxchg.h, which will result in following error: arch/unicore32/include/asm/cmpxchg.h: In function '__xchg': arch/unicore32/include/asm/cmpxchg.h:38: error: void value not ignored as it ought to be Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Diffstat (limited to 'arch/unicore32')
-rw-r--r--arch/unicore32/include/asm/cmpxchg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h
index df4d5acfd19f..8e797ad4fa24 100644
--- a/arch/unicore32/include/asm/cmpxchg.h
+++ b/arch/unicore32/include/asm/cmpxchg.h
@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
: "memory", "cc");
break;
default:
- ret = __xchg_bad_pointer();
+ __xchg_bad_pointer();
}
return ret;