Page MenuHomeFreeBSD
Files F151705971

D32168.id.diff
No OneTemporary
Actions

D32168.id.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h
--- a/sys/compat/linuxkpi/common/include/linux/interrupt.h
+++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h
@@ -44,11 +44,6 @@
#define IRQF_SHARED RF_SHAREABLE
-struct irq_ent;
-
-void linux_irq_handler(void *);
-void lkpi_devm_irq_release(struct device *, void *);
-void lkpi_irq_release(struct device *, struct irq_ent *);
int lkpi_request_irq(struct device *, unsigned int, irq_handler_t,
irq_handler_t, unsigned long, const char *, void *);
int lkpi_enable_irq(unsigned int);
diff --git a/sys/compat/linuxkpi/common/src/linux_interrupt.c b/sys/compat/linuxkpi/common/src/linux_interrupt.c
--- a/sys/compat/linuxkpi/common/src/linux_interrupt.c
+++ b/sys/compat/linuxkpi/common/src/linux_interrupt.c
@@ -71,8 +71,8 @@
return (NULL);
}
-void
-linux_irq_handler(void *ent)
+static void
+lkpi_irq_handler(void *ent)
{
struct irq_ent *irqe;
@@ -88,7 +88,7 @@
}
}
-void
+static inline void
lkpi_irq_release(struct device *dev, struct irq_ent *irqe)
{
if (irqe->tag != NULL)
@@ -99,7 +99,7 @@
list_del(&irqe->links);
}
-void
+static void
lkpi_devm_irq_release(struct device *dev, void *p)
{
struct irq_ent *irqe;
@@ -145,7 +145,7 @@
irqe->irq = irq;
error = bus_setup_intr(dev->bsddev, res, INTR_TYPE_NET | INTR_MPSAFE,
- NULL, linux_irq_handler, irqe, &irqe->tag);
+ NULL, lkpi_irq_handler, irqe, &irqe->tag);
if (error)
goto errout;
list_add(&irqe->links, &dev->irqents);
@@ -176,7 +176,7 @@
if (irqe == NULL || irqe->tag != NULL)
return -EINVAL;
return -bus_setup_intr(dev->bsddev, irqe->res, INTR_TYPE_NET | INTR_MPSAFE,
- NULL, linux_irq_handler, irqe, &irqe->tag);
+ NULL, lkpi_irq_handler, irqe, &irqe->tag);
}
void

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 4:07 AM (5 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31266328
Default Alt Text
D32168.id.diff (1 KB)

Event Timeline