diff options
author | Jesper Nilsson <jespern@axis.com> | 2014-10-27 09:11:31 +0100 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2014-12-20 00:06:04 +0100 |
commit | a3199ad90ac33c1afae0fa3dbf2e0fe4ee827fa7 (patch) | |
tree | e3f1feb76da1db3d59351ed2c19707bed2855882 /arch/cris/include/arch-v32/mach-fs/mach | |
parent | 9f1ad51b32173a2da3c4fab58bc4f87d6094868f (diff) | |
download | linux-stable-a3199ad90ac33c1afae0fa3dbf2e0fe4ee827fa7.tar.gz linux-stable-a3199ad90ac33c1afae0fa3dbf2e0fe4ee827fa7.tar.bz2 linux-stable-a3199ad90ac33c1afae0fa3dbf2e0fe4ee827fa7.zip |
CRISv32: ETRAXFS: Fix recursive spinlock
Move pinmux alloc/dealloc code into functions that don't take
the spinlock so we can use from code that has the spinlock already.
CRISv32 has no working SMP, so spinlocks becomes a NOP,
so deadlock was never seen.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/include/arch-v32/mach-fs/mach')
-rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h b/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h index c2b3036779df..09bf0c90d2d3 100644 --- a/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h +++ b/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h @@ -28,11 +28,9 @@ enum fixed_function { pinmux_timer }; -int crisv32_pinmux_init(void); int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode); int crisv32_pinmux_alloc_fixed(enum fixed_function function); int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin); int crisv32_pinmux_dealloc_fixed(enum fixed_function function); -void crisv32_pinmux_dump(void); #endif |