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

Commit 9de79c50 authored by Jim Quinlan's avatar Jim Quinlan Committed by Ralf Baechle
Browse files

MIPS: bitops.h: Change use of 'unsigned short' to 'int' 



[ralf@linux-mips.org: No functional change but it's consistent with how
use types elsewhere in the code.]

Signed-off-by: default avatarJim Quinlan <jim2101024@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: Kevin Cernekee cernekee@gmail.com
Cc: Jim Quinlan <jim2101024@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/4319/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 34d875d7

arch/mips/include/asm/bitops.h

+7 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
static inline void set_bit(unsigned long nr, volatile unsigned long *addr)

{

	unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;

	unsigned long temp;



	if (kernel_uses_llsc && R10000_LLSC_WAR) {
@@ -118,7 +118,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) 
static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)

{

	unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;

	unsigned long temp;



	if (kernel_uses_llsc && R10000_LLSC_WAR) {
@@ -191,7 +191,7 @@ static inline void clear_bit_unlock(unsigned long nr, volatile unsigned long *ad 
 */

static inline void change_bit(unsigned long nr, volatile unsigned long *addr)

{

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;



	if (kernel_uses_llsc && R10000_LLSC_WAR) {

		unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
@@ -244,7 +244,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) 
static inline int test_and_set_bit(unsigned long nr,

	volatile unsigned long *addr)

{

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;

	unsigned long res;



	smp_mb__before_llsc();
@@ -310,7 +310,7 @@ static inline int test_and_set_bit(unsigned long nr, 
static inline int test_and_set_bit_lock(unsigned long nr,

	volatile unsigned long *addr)

{

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;

	unsigned long res;



	if (kernel_uses_llsc && R10000_LLSC_WAR) {
@@ -373,7 +373,7 @@ static inline int test_and_set_bit_lock(unsigned long nr, 
static inline int test_and_clear_bit(unsigned long nr,

	volatile unsigned long *addr)

{

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;

	unsigned long res;



	smp_mb__before_llsc();
@@ -457,7 +457,7 @@ static inline int test_and_clear_bit(unsigned long nr, 
static inline int test_and_change_bit(unsigned long nr,

	volatile unsigned long *addr)

{

	unsigned short bit = nr & SZLONG_MASK;

	int bit = nr & SZLONG_MASK;

	unsigned long res;



	smp_mb__before_llsc();