Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / include / asm-generic / cmpxchg-local.h

diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h
index d8d4c898c1bbabbaa1a13387d9818a2331b0ee85..70bef78912b796171fb03cc00fe912ded7da1785 100644 (file)
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
@@ -4,7 +4,8 @@
 #include <linux/types.h>
 #include <linux/irqflags.h>
 
-extern unsigned long wrong_size_cmpxchg(volatile void *ptr);
+extern unsigned long wrong_size_cmpxchg(volatile void *ptr)
+       __noreturn;
 
 /*
  * Generic version of __cmpxchg_local (disables interrupts). Takes an unsigned