Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f788435 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] frv: NULL noise removal in frv xchg() 



Clean up the FRV arch's xchg() function.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ffca1110

include/asm-frv/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig 
		break;								\

										\

	default:								\

		__xg_orig = 0;							\

		__xg_orig = (__typeof__(__xg_orig))0;				\

		asm volatile("break");						\

		break;								\

	}									\
@@ -247,7 +247,7 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); 
	switch (sizeof(__xg_orig)) {								\

	case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr);	break;	\

	default:										\

		__xg_orig = 0;									\

		__xg_orig = (__typeof__(__xg_orig))0;									\

		asm volatile("break");								\

		break;										\

	}											\