-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MIPS: Remove irqflags.h dependency from bitops.h
The "else clause" of most functions in bitops.h invoked
raw_local_irq_{save,restore}() and in doing so had a dependency on
irqflags.h. This fix moves said code to bitops.c, removing the
dependency.
Signed-off-by: Jim 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/4320/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>- Loading branch information
Jim Quinlan
authored and
Ralf Baechle
committed
Nov 9, 2012
1 parent
9de79c5
commit 92d1159
Showing
5 changed files
with
214 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| /* | ||
| * This file is subject to the terms and conditions of the GNU General Public | ||
| * License. See the file "COPYING" in the main directory of this archive | ||
| * for more details. | ||
| * | ||
| * Copyright (c) 1994-1997, 99, 2000, 06, 07 Ralf Baechle (ralf@linux-mips.org) | ||
| * Copyright (c) 1999, 2000 Silicon Graphics, Inc. | ||
| */ | ||
| #include <linux/bitops.h> | ||
| #include <linux/irqflags.h> | ||
| #include <linux/export.h> | ||
|
|
||
|
|
||
| /** | ||
| * __mips_set_bit - Atomically set a bit in memory. This is called by | ||
| * set_bit() if it cannot find a faster solution. | ||
| * @nr: the bit to set | ||
| * @addr: the address to start counting from | ||
| */ | ||
| void __mips_set_bit(unsigned long nr, volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| *a |= mask; | ||
| raw_local_irq_restore(flags); | ||
| } | ||
| EXPORT_SYMBOL(__mips_set_bit); | ||
|
|
||
|
|
||
| /** | ||
| * __mips_clear_bit - Clears a bit in memory. This is called by clear_bit() if | ||
| * it cannot find a faster solution. | ||
| * @nr: Bit to clear | ||
| * @addr: Address to start counting from | ||
| */ | ||
| void __mips_clear_bit(unsigned long nr, volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| *a &= ~mask; | ||
| raw_local_irq_restore(flags); | ||
| } | ||
| EXPORT_SYMBOL(__mips_clear_bit); | ||
|
|
||
|
|
||
| /** | ||
| * __mips_change_bit - Toggle a bit in memory. This is called by change_bit() | ||
| * if it cannot find a faster solution. | ||
| * @nr: Bit to change | ||
| * @addr: Address to start counting from | ||
| */ | ||
| void __mips_change_bit(unsigned long nr, volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| *a ^= mask; | ||
| raw_local_irq_restore(flags); | ||
| } | ||
| EXPORT_SYMBOL(__mips_change_bit); | ||
|
|
||
|
|
||
| /** | ||
| * __mips_test_and_set_bit - Set a bit and return its old value. This is | ||
| * called by test_and_set_bit() if it cannot find a faster solution. | ||
| * @nr: Bit to set | ||
| * @addr: Address to count from | ||
| */ | ||
| int __mips_test_and_set_bit(unsigned long nr, | ||
| volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
| unsigned long res; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| res = (mask & *a); | ||
| *a |= mask; | ||
| raw_local_irq_restore(flags); | ||
| return res; | ||
| } | ||
| EXPORT_SYMBOL(__mips_test_and_set_bit); | ||
|
|
||
|
|
||
| /** | ||
| * __mips_test_and_set_bit_lock - Set a bit and return its old value. This is | ||
| * called by test_and_set_bit_lock() if it cannot find a faster solution. | ||
| * @nr: Bit to set | ||
| * @addr: Address to count from | ||
| */ | ||
| int __mips_test_and_set_bit_lock(unsigned long nr, | ||
| volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
| unsigned long res; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| res = (mask & *a); | ||
| *a |= mask; | ||
| raw_local_irq_restore(flags); | ||
| return res; | ||
| } | ||
| EXPORT_SYMBOL(__mips_test_and_set_bit_lock); | ||
|
|
||
|
|
||
| /** | ||
| * __mips_test_and_clear_bit - Clear a bit and return its old value. This is | ||
| * called by test_and_clear_bit() if it cannot find a faster solution. | ||
| * @nr: Bit to clear | ||
| * @addr: Address to count from | ||
| */ | ||
| int __mips_test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
| unsigned long res; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| res = (mask & *a); | ||
| *a &= ~mask; | ||
| raw_local_irq_restore(flags); | ||
| return res; | ||
| } | ||
| EXPORT_SYMBOL(__mips_test_and_clear_bit); | ||
|
|
||
|
|
||
| /** | ||
| * __mips_test_and_change_bit - Change a bit and return its old value. This is | ||
| * called by test_and_change_bit() if it cannot find a faster solution. | ||
| * @nr: Bit to change | ||
| * @addr: Address to count from | ||
| */ | ||
| int __mips_test_and_change_bit(unsigned long nr, volatile unsigned long *addr) | ||
| { | ||
| volatile unsigned long *a = addr; | ||
| unsigned bit = nr & SZLONG_MASK; | ||
| unsigned long mask; | ||
| unsigned long flags; | ||
| unsigned long res; | ||
|
|
||
| a += nr >> SZLONG_LOG; | ||
| mask = 1UL << bit; | ||
| raw_local_irq_save(flags); | ||
| res = (mask & *a); | ||
| *a ^= mask; | ||
| raw_local_irq_restore(flags); | ||
| return res; | ||
| } | ||
| EXPORT_SYMBOL(__mips_test_and_change_bit); |