diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | linux/pcmcia-cs/modules/cs_internal.h | 2 | ||||
| -rw-r--r-- | linux/pcmcia-cs/modules/i82365.c | 2 | ||||
| -rw-r--r-- | linux/pcmcia-cs/modules/rsrc_mgr.c | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -24,6 +24,10 @@ * linux/dev/include/asm-i386/smp.h: New file. * linux/dev/init/main.c [__SMP__ && __i386] (smp_loops_per_tick): Restore variable. + * linux/pcmcia-cs/modules/cs_internal.h: Use __SMP__ instead of + USE_SPIN_LOCKS. + * linux/pcmcia-cs/modules/i82365.c: Likewise. + * linux/pcmcia-cs/modules/rsrc_mgr.c: Likewise. 2007-07-08 Samuel Thibault <samuel.thibault@ens-lyon.org> diff --git a/linux/pcmcia-cs/modules/cs_internal.h b/linux/pcmcia-cs/modules/cs_internal.h index c4d4d45..c9f98f8 100644 --- a/linux/pcmcia-cs/modules/cs_internal.h +++ b/linux/pcmcia-cs/modules/cs_internal.h @@ -131,7 +131,7 @@ typedef struct config_t { #define MAX_CIS_DATA 512 typedef struct socket_info_t { -#ifdef USE_SPIN_LOCKS +#ifdef __SMP__ spinlock_t lock; #endif ss_entry_t ss_entry; diff --git a/linux/pcmcia-cs/modules/i82365.c b/linux/pcmcia-cs/modules/i82365.c index 9aaf540..17ddf66 100644 --- a/linux/pcmcia-cs/modules/i82365.c +++ b/linux/pcmcia-cs/modules/i82365.c @@ -184,7 +184,7 @@ static socket_info_t socket[8] = { #ifdef CONFIG_ISA static int grab_irq; -#ifdef USE_SPIN_LOCKS +#ifdef __SMP__ static spinlock_t isa_lock = SPIN_LOCK_UNLOCKED; #endif #define ISA_LOCK(s, f) \ diff --git a/linux/pcmcia-cs/modules/rsrc_mgr.c b/linux/pcmcia-cs/modules/rsrc_mgr.c index 2becb2f..a94926a 100644 --- a/linux/pcmcia-cs/modules/rsrc_mgr.c +++ b/linux/pcmcia-cs/modules/rsrc_mgr.c @@ -109,7 +109,7 @@ static irq_info_t irq_table[16] = { { 0, 0, 0 }, /* etc */ }; #if defined(CONFIG_PNP_BIOS) || !defined(HAVE_MEMRESERVE) -#ifdef USE_SPIN_LOCKS +#ifdef __SMP__ static spinlock_t rsrc_lock = SPIN_LOCK_UNLOCKED; #endif |