git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
ibmebus.c
diff --git
a/arch/powerpc/kernel/ibmebus.c
b/arch/powerpc/kernel/ibmebus.c
index
e47d40a
..
68e5ab0
100644
(file)
--- a/
arch/powerpc/kernel/ibmebus.c
+++ b/
arch/powerpc/kernel/ibmebus.c
@@
-323,13
+323,11
@@
int ibmebus_request_irq(struct ibmebus_dev *dev,
unsigned long irq_flags, const char * devname,
void *dev_id)
{
unsigned long irq_flags, const char * devname,
void *dev_id)
{
- unsigned int irq =
virt_irq_create_mapping(
ist);
+ unsigned int irq =
irq_create_mapping(NULL,
ist);
if (irq == NO_IRQ)
return -EINVAL;
if (irq == NO_IRQ)
return -EINVAL;
- irq = irq_offset_up(irq);
-
return request_irq(irq, handler,
irq_flags, devname, dev_id);
}
return request_irq(irq, handler,
irq_flags, devname, dev_id);
}
@@
-337,12
+335,9
@@
EXPORT_SYMBOL(ibmebus_request_irq);
void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)
{
void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)
{
- unsigned int irq =
virt_irq_create_mapping(
ist);
+ unsigned int irq =
irq_find_mapping(NULL,
ist);
- irq = irq_offset_up(irq);
free_irq(irq, dev_id);
free_irq(irq, dev_id);
-
- return;
}
EXPORT_SYMBOL(ibmebus_free_irq);
}
EXPORT_SYMBOL(ibmebus_free_irq);