The patch titled
sem2mutex: drivers/acpi/
has been removed from the -mm tree. Its filename is
sem2mutex-drivers-acpi.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: "Brown, Len" <len.brown@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/acpi/processor_perflib.c | 27 ++++++++++++++-------------
drivers/acpi/scan.c | 3 ++-
2 files changed, 16 insertions(+), 14 deletions(-)
diff -puN drivers/acpi/processor_perflib.c~sem2mutex-drivers-acpi drivers/acpi/processor_perflib.c
--- devel/drivers/acpi/processor_perflib.c~sem2mutex-drivers-acpi 2006-05-11 14:28:18.000000000 -0700
+++ devel-akpm/drivers/acpi/processor_perflib.c 2006-05-11 14:29:55.000000000 -0700
@@ -34,6 +34,7 @@
#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+#include <linux/mutex.h>
#include <asm/uaccess.h>
#endif
@@ -48,7 +49,7 @@
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("acpi_processor")
-static DECLARE_MUTEX(performance_sem);
+static DEFINE_MUTEX(performance_mutex);
/*
* _PPC support is implemented as a CPUfreq policy notifier:
@@ -72,7 +73,7 @@ static int acpi_processor_ppc_notifier(s
struct acpi_processor *pr;
unsigned int ppc = 0;
- down(&performance_sem);
+ mutex_lock(&performance_mutex);
if (event != CPUFREQ_INCOMPATIBLE)
goto out;
@@ -93,7 +94,7 @@ static int acpi_processor_ppc_notifier(s
core_frequency * 1000);
out:
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return 0;
}
@@ -596,7 +597,7 @@ int acpi_processor_preregister_performan
struct acpi_processor *match_pr;
struct acpi_psd_package *match_pdomain;
- down(&performance_sem);
+ mutex_lock(&performance_mutex);
retval = 0;
@@ -744,7 +745,7 @@ err_ret:
pr->performance = NULL; /* Will be set for real in register */
}
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return retval;
}
EXPORT_SYMBOL(acpi_processor_preregister_performance);
@@ -759,16 +760,16 @@ acpi_processor_register_performance(stru
if (!(acpi_processor_ppc_status & PPC_REGISTERED))
return -EINVAL;
- down(&performance_sem);
+ mutex_lock(&performance_mutex);
pr = processors[cpu];
if (!pr) {
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return -ENODEV;
}
if (pr->performance) {
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return -EBUSY;
}
@@ -776,13 +777,13 @@ acpi_processor_register_performance(stru
if (acpi_processor_get_performance_info(pr)) {
pr->performance = NULL;
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return -EIO;
}
acpi_cpufreq_add_file(pr);
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return 0;
}
@@ -794,11 +795,11 @@ acpi_processor_unregister_performance(st
{
struct acpi_processor *pr;
- down(&performance_sem);
+ mutex_lock(&performance_mutex);
pr = processors[cpu];
if (!pr) {
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
return;
}
@@ -807,7 +808,7 @@ acpi_processor_unregister_performance(st
acpi_cpufreq_remove_file(pr);
- up(&performance_sem);
+ mutex_unlock(&performance_mutex);
}
diff -puN drivers/acpi/scan.c~sem2mutex-drivers-acpi drivers/acpi/scan.c
--- devel/drivers/acpi/scan.c~sem2mutex-drivers-acpi 2006-05-11 14:28:18.000000000 -0700
+++ devel-akpm/drivers/acpi/scan.c 2006-05-11 14:28:18.000000000 -0700
@@ -5,6 +5,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/acpi.h>
+#include <linux/mutex.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */
@@ -453,7 +454,7 @@ static int acpi_bus_get_perf_flags(struc
-------------------------------------------------------------------------- */
static LIST_HEAD(acpi_bus_drivers);
-static DECLARE_MUTEX(acpi_bus_drivers_lock);
+static DEFINE_MUTEX(acpi_bus_drivers_lock);
/**
* acpi_bus_match - match device IDs to driver's supported IDs
_
Patches currently in -mm which might be from arjan@xxxxxxxxxxxxx are
origin.patch
git-acpi.patch
git-ieee1394.patch
git-mtd.patch
qla2xxx-lock-ordering-fix.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
reiser4.patch
debug-shared-irqs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
