Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31751
b: refs/heads/master
c: c32928c
h: refs/heads/master
i:
  31749: b3586d9
  31747: 892ac94
  31743: 8db48ef
v: v3
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Jul 3, 2006
1 parent 8ae4c8a commit 7ccc06e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c61a8416ed3db84481651270032696a4781cac17
refs/heads/master: c32928c579d88acd43981b59e86900da65f40762
11 changes: 8 additions & 3 deletions trunk/drivers/pnp/pnpacpi/rsparser.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)

static void
pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,
int triggering, int polarity)
int triggering, int polarity, int shareable)
{
int i = 0;
int irq;
Expand All @@ -95,6 +95,9 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,
return;
}

if (shareable)
res->irq_resource[i].flags |= IORESOURCE_IRQ_SHAREABLE;

res->irq_resource[i].start = irq;
res->irq_resource[i].end = irq;
pcibios_penalize_isa_irq(irq, 1);
Expand Down Expand Up @@ -194,7 +197,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
pnpacpi_parse_allocated_irqresource(res_table,
res->data.irq.interrupts[i],
res->data.irq.triggering,
res->data.irq.polarity);
res->data.irq.polarity,
res->data.irq.sharable);
}
break;

Expand Down Expand Up @@ -255,7 +259,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
pnpacpi_parse_allocated_irqresource(res_table,
res->data.extended_irq.interrupts[i],
res->data.extended_irq.triggering,
res->data.extended_irq.polarity);
res->data.extended_irq.polarity,
res->data.extended_irq.sharable);
}
break;

Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/ioport.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ struct resource_list {
#define IORESOURCE_IRQ_LOWEDGE (1<<1)
#define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
#define IORESOURCE_IRQ_LOWLEVEL (1<<3)
#define IORESOURCE_IRQ_SHAREABLE (1<<4)

/* ISA PnP DMA specific bits (IORESOURCE_BITS) */
#define IORESOURCE_DMA_TYPE_MASK (3<<0)
Expand Down

0 comments on commit 7ccc06e

Please sign in to comment.