Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 0a7840ae..3b67d89 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -521,6 +521,32 @@
}
EXPORT_SYMBOL(irq_set_irq_wake);
+/**
+ * irq_read_line - read the value on an irq line
+ * @irq: Interrupt number representing a hardware line
+ *
+ * This function is meant to be called from within the irq handler.
+ * Slowbus irq controllers might sleep, but it is assumed that the irq
+ * handler for slowbus interrupts will execute in thread context, so
+ * sleeping is okay.
+ */
+int irq_read_line(unsigned int irq)
+{
+ struct irq_desc *desc = irq_to_desc(irq);
+ int val;
+
+ if (!desc || !desc->irq_data.chip->irq_read_line)
+ return -EINVAL;
+
+ chip_bus_lock(desc);
+ raw_spin_lock(&desc->lock);
+ val = desc->irq_data.chip->irq_read_line(&desc->irq_data);
+ raw_spin_unlock(&desc->lock);
+ chip_bus_sync_unlock(desc);
+ return val;
+}
+EXPORT_SYMBOL_GPL(irq_read_line);
+
/*
* Internal function that tells the architecture code whether a
* particular irq has been exclusively allocated or is available
@@ -1400,3 +1426,16 @@
return !ret ? IRQC_IS_HARDIRQ : ret;
}
EXPORT_SYMBOL_GPL(request_any_context_irq);
+
+void irq_set_pending(unsigned int irq)
+{
+ struct irq_desc *desc = irq_to_desc(irq);
+ unsigned long flags;
+
+ if (desc) {
+ raw_spin_lock_irqsave(&desc->lock, flags);
+ desc->istate |= IRQS_PENDING;
+ raw_spin_unlock_irqrestore(&desc->lock, flags);
+ }
+}
+EXPORT_SYMBOL_GPL(irq_set_pending);
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index f323a4c..0e5ab4d 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -50,7 +50,7 @@
struct irq_desc *desc;
int irq;
- for_each_irq_desc(irq, desc) {
+ for_each_irq_desc_reverse(irq, desc) {
unsigned long flags;
raw_spin_lock_irqsave(&desc->lock, flags);