Commit 48380368 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Luis Chamberlain
Browse files

Change DEFINE_SEMAPHORE() to take a number argument 



Fundamentally semaphores are a counted primitive, but
DEFINE_SEMAPHORE() does not expose this and explicitly creates a
binary semaphore.

Change DEFINE_SEMAPHORE() to take a number argument and use that in the
few places that open-coded it using __SEMAPHORE_INITIALIZER().

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
[mcgrof: add some tribal knowledge about why some folks prefer
 binary sempahores over mutexes]
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 430bb0d1

arch/mips/cavium-octeon/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ extern void pci_console_init(const char *arg); 
static unsigned long long max_memory = ULLONG_MAX;

static unsigned long long reserve_low_mem;



DEFINE_SEMAPHORE(octeon_bootbus_sem);

DEFINE_SEMAPHORE(octeon_bootbus_sem, 1);

EXPORT_SYMBOL(octeon_bootbus_sem);



static struct octeon_boot_descriptor *octeon_boot_desc_ptr;

arch/x86/kernel/cpu/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ static const struct { 
static struct ratelimit_state bld_ratelimit;



static unsigned int sysctl_sld_mitigate = 1;

static DEFINE_SEMAPHORE(buslock_sem);

static DEFINE_SEMAPHORE(buslock_sem, 1);



#ifdef CONFIG_PROC_SYSCTL

static struct ctl_table sld_sysctls[] = {

drivers/firmware/efi/runtime-wrappers.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void efi_call_virt_check_flags(unsigned long flags, const char *call) 
 * none of the remaining functions are actually ever called at runtime.

 * So let's just use a single lock to serialize all Runtime Services calls.

 */

static DEFINE_SEMAPHORE(efi_runtime_lock);

static DEFINE_SEMAPHORE(efi_runtime_lock, 1);



/*

 * Expose the EFI runtime lock to the UV platform

drivers/firmware/efi/vars.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
/* Private pointer to registered efivars */

static struct efivars *__efivars;



static DEFINE_SEMAPHORE(efivars_lock);

static DEFINE_SEMAPHORE(efivars_lock, 1);



static efi_status_t check_var_size(bool nonblocking, u32 attributes,

				   unsigned long size)

drivers/macintosh/adb.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct adb_driver *adb_controller; 
BLOCKING_NOTIFIER_HEAD(adb_client_list);

static int adb_got_sleep;

static int adb_inited;

static DEFINE_SEMAPHORE(adb_probe_mutex);

static DEFINE_SEMAPHORE(adb_probe_mutex, 1);

static int sleepy_trackpad;

static int autopoll_devs;

int __adb_probe_sync;