The patch titled
maximum-latency-tracking-infrastructure-tidy
has been removed from the -mm tree. Its filename is
maximum-latency-tracking-infrastructure-tidy.patch
This patch was dropped because it was folded into maximum-latency-tracking-infrastructure.patch
------------------------------------------------------
Subject: maximum-latency-tracking-infrastructure-tidy
From: Andrew Morton <akpm@xxxxxxxx>
- Coding style cleanups
- Fix bug in modify_acceptable_latency()
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Jesse Barnes <jesse.barnes@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/acpi/processor_idle.c | 12 +++++++-----
kernel/latency.c | 8 ++++----
2 files changed, 11 insertions(+), 9 deletions(-)
diff -puN drivers/acpi/processor_idle.c~maximum-latency-tracking-infrastructure-tidy drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_idle.c~maximum-latency-tracking-infrastructure-tidy
+++ a/drivers/acpi/processor_idle.c
@@ -455,7 +455,7 @@ static void acpi_processor_idle(void)
if (cx->promotion.state &&
((cx->promotion.state - pr->power.states) <= max_cstate)) {
if (sleep_ticks > cx->promotion.threshold.ticks &&
- cx->promotion.state->latency <= system_latency_constraint()) {
+ cx->promotion.state->latency <= system_latency_constraint()) {
cx->promotion.count++;
cx->demotion.count = 0;
if (cx->promotion.count >=
@@ -1016,7 +1016,8 @@ static int acpi_processor_power_seq_show
"bus master activity: %08x\n"
"maximum allowed latency: %d usec\n",
pr->power.state ? pr->power.state - pr->power.states : 0,
- max_cstate, (unsigned)pr->power.bm_activity, system_latency_constraint());
+ max_cstate, (unsigned)pr->power.bm_activity,
+ system_latency_constraint());
seq_puts(seq, "states:\n");
@@ -1088,9 +1089,10 @@ static void smp_callback(void *v)
}
/*
- * This function gets called when a part of the kernel has a new latency requirement.
- * This means we need to get all processors out of their C-state, and then recalculate
- * a new suitable C-state. Just do a cross-cpu IPI; that wakes them all right up.
+ * This function gets called when a part of the kernel has a new latency
+ * requirement. This means we need to get all processors out of their C-state,
+ * and then recalculate a new suitable C-state. Just do a cross-cpu IPI; that
+ * wakes them all right up.
*/
static int acpi_processor_latency_notify(struct notifier_block *b,
unsigned long l, void *v)
diff -puN kernel/latency.c~maximum-latency-tracking-infrastructure-tidy kernel/latency.c
--- a/kernel/latency.c~maximum-latency-tracking-infrastructure-tidy
+++ a/kernel/latency.c
@@ -155,9 +155,10 @@ void modify_acceptable_latency(char *ide
spin_lock_irqsave(&latency_lock, flags);
list_for_each_entry(iter, &latency_list, list) {
- if (strcmp(iter->identifier, identifier)==0)
+ if (strcmp(iter->identifier, identifier) == 0) {
iter->usecs = usecs;
- break;
+ break;
+ }
}
if (usecs < atomic_read(¤t_max_latency))
atomic_set(¤t_max_latency, usecs);
@@ -176,7 +177,6 @@ EXPORT_SYMBOL_GPL(modify_acceptable_late
* This function does not sleep and can be called in any context.
* Trying to use a non-existing identifier silently gets ignored.
*/
-
void remove_acceptable_latency(char *identifier)
{
unsigned long flags;
@@ -186,7 +186,7 @@ void remove_acceptable_latency(char *ide
spin_lock_irqsave(&latency_lock, flags);
list_for_each_entry_safe(iter, temp, &latency_list, list) {
- if (strcmp(iter->identifier, identifier)==0) {
+ if (strcmp(iter->identifier, identifier) == 0) {
list_del(&iter->list);
newmax = iter->usecs;
kfree(iter->identifier);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list_del-debug-fix.patch
arch-i386-pci-mmconfigc-tlb-flush-fix-tweaks.patch
maximum-latency-tracking-infrastructure.patch
maximum-latency-tracking-infrastructure-tidy.patch
submit-checklist-mention-headers_check.patch
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
reiserfs-on-demand-bitmap-loading.patch
add-vector-aio-support-fix.patch
csa-basic-accounting-over-taskstats-fix.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
generic-ioremap_page_range-x86_64-conversion-fix.patch
some-cleanup-in-the-pipe-code-tidy.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.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
