Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 107855 Details for
Bug 163366
net-dialup/fritzcapi-2.6.43 does not compile on >=linux-2.6.19
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
2.6.43-linux-2.6.19-irq_handler.patch
2.6.43-linux-2.6.19-irq_handler.patch (text/plain), 6.32 KB, created by
Martin von Gagern
on 2007-01-22 23:33:14 UTC
(
hide
)
Description:
2.6.43-linux-2.6.19-irq_handler.patch
Filename:
MIME Type:
Creator:
Martin von Gagern
Created:
2007-01-22 23:33:14 UTC
Size:
6.32 KB
patch
obsolete
>irq_handler_t has changed type in 2.6.19 due to commit >7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells, >for details see git diff at http://tinyurl.com/2xpdy7 > >As the third argument was never used by the drivers, I simply wrapped every >occurrence of it in a condition for kernel version prior to 2.6.19. >2007-01-13 Martin von Gagern <Martin.vGagern@gmx.net> > >diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c >--- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c 2007-01-22 23:36:39.000000000 +0100 >+++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c 2007-01-23 00:04:30.000000000 +0100 >@@ -107,7 +107,11 @@ > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ > static void scheduler (unsigned long data); >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ); > > static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); > >@@ -805,11 +809,17 @@ > > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ) { > int res = IRQ_NONE; > > UNUSED_ARG (irq); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) > UNUSED_ARG (regs); >+#endif > if (args != NULL) { > assert (capi_lib->cm_handle_events != NULL); > if (atomic_read (&scheduler_id) == smp_processor_id ()) { >diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c >--- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-22 23:36:39.000000000 +0100 >+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c 2007-01-23 00:07:18.000000000 +0100 >@@ -107,7 +107,11 @@ > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ > static void scheduler (unsigned long data); >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ); > > static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); > >@@ -836,11 +840,17 @@ > > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ) { > int res = IRQ_NONE; > > UNUSED_ARG (irq); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) > UNUSED_ARG (regs); >+#endif > if (args != NULL) { > assert (capi_lib->cm_handle_events != NULL); > if (atomic_read (&scheduler_id) == smp_processor_id ()) { >diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c >--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-22 23:36:39.000000000 +0100 >+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c 2007-01-23 00:07:18.000000000 +0100 >@@ -107,7 +107,11 @@ > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ > static void scheduler (unsigned long data); >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ); > > static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); > >@@ -836,11 +840,17 @@ > > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ) { > int res = IRQ_NONE; > > UNUSED_ARG (irq); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) > UNUSED_ARG (regs); >+#endif > if (args != NULL) { > assert (capi_lib->cm_handle_events != NULL); > if (atomic_read (&scheduler_id) == smp_processor_id ()) { >diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c >--- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c 2007-01-22 23:36:39.000000000 +0100 >+++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c 2007-01-23 00:04:52.000000000 +0100 >@@ -107,7 +107,11 @@ > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ > static void scheduler (unsigned long data); >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs); >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ); > > static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0); > >@@ -805,11 +809,17 @@ > > /*---------------------------------------------------------------------------*\ > \*---------------------------------------------------------------------------*/ >-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) { >+static irqreturn_t irq_handler (int irq, void * args >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) >+ , struct pt_regs * regs >+#endif >+ ) { > int res = IRQ_NONE; > > UNUSED_ARG (irq); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) > UNUSED_ARG (regs); >+#endif > if (args != NULL) { > assert (capi_lib->cm_handle_events != NULL); > if (atomic_read (&scheduler_id) == smp_processor_id ()) {
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=107855">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 163366
:
107853
| 107855 |
109271
|
109279
|
110155
|
110267
|
110268
|
110270
|
110271
|
110273
