[PATCH] Fix missing includes for isdn diversion

[PATCH] Fix missing includes for isdn diversion

[Jan Engelhardt]

# File:  isdn_divert.diff
# Class: missing prototype addition
#
# Adds #include <linux/interrupt.h> to resolve missing calls to cli(),
# sti() and restore_flags().



Signed-off by: Jan Engelhardt <jengelh@linux01.gwdg.de>


diff -dpru linux-2.6.4-52/drivers/isdn/divert/divert_init.c linux-2.6.4-HX/drivers/isdn/divert/divert_init.c
--- linux-2.6.4-52/drivers/isdn/divert/divert_init.c	2004-05-26 17:35:48.000000000 +0200
+++ linux-2.6.4-HX/drivers/isdn/divert/divert_init.c	2004-05-27 21:19:38.000000000 +0200
@@ -13,6 +13,7 @@
 #include <linux/version.h>
 #include <linux/init.h>
 #include "isdn_divert.h"
+#include <linux/interrupt.h>

 MODULE_DESCRIPTION("ISDN4Linux: Call diversion support");
 MODULE_AUTHOR("Werner Cornelius");
diff -dpru linux-2.6.4-52/drivers/isdn/divert/divert_procfs.c linux-2.6.4-HX/drivers/isdn/divert/divert_procfs.c
--- linux-2.6.4-52/drivers/isdn/divert/divert_procfs.c	2004-05-26 17:35:48.000000000 +0200
+++ linux-2.6.4-HX/drivers/isdn/divert/divert_procfs.c	2004-05-27 21:20:46.000000000 +0200
@@ -21,6 +21,7 @@
 #endif
 #include <linux/isdnif.h>
 #include "isdn_divert.h"
+#include <linux/interrupt.h>

 /*********************************/
 /* Variables for interface queue */
diff -dpru linux-2.6.4-52/drivers/isdn/divert/isdn_divert.c linux-2.6.4-HX/drivers/isdn/divert/isdn_divert.c
--- linux-2.6.4-52/drivers/isdn/divert/isdn_divert.c	2004-05-26 17:35:48.000000000 +0200
+++ linux-2.6.4-HX/drivers/isdn/divert/isdn_divert.c	2004-05-27 21:19:08.000000000 +0200
@@ -12,6 +12,7 @@
 #include <linux/version.h>
 #include <linux/proc_fs.h>
 #include "isdn_divert.h"
+#include <linux/interrupt.h>

 /**********************************/
 /* structure keeping calling info */

##eof



Jan Engelhardt
-- 
Gesellschaft für Wissenschaftliche Datenverarbeitung
Am Fassberg, 37077 Göttingen, www.gwdg.de

Re: [PATCH] Fix missing includes for isdn diversion

[Andrew Morton]

Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>
> # File:  isdn_divert.diff
> # Class: missing prototype addition
> #
> # Adds #include <linux/interrupt.h> to resolve missing calls to cli(),
> # sti() and restore_flags().
> 
> 
> 
> Signed-off by: Jan Engelhardt <jengelh@linux01.gwdg.de>
> 
> 
> diff -dpru linux-2.6.4-52/drivers/isdn/divert/divert_init.c

This appears to be against a 2.6.4 kernel, yes?

The problem might have been fixed in the intervening months.  Please
confirm that the bug still exists in 2.6.10-rc1 and if so, send an updated
patch.

Thanks.

Re: [PATCH] Fix missing includes for isdn diversion

[Jan Engelhardt]

Andrew Morton wrote:

>> # File:  isdn_divert.diff
>> # Class: missing prototype addition
>> #
>> # Adds #include <linux/interrupt.h> to resolve missing calls to cli(),
>> # sti() and restore_flags().
>>
>> Signed-off by: Jan Engelhardt <jengelh@linux01.gwdg.de>
>>
>> diff -dpru linux-2.6.4-52/drivers/isdn/divert/divert_init.c
>
>This appears to be against a 2.6.4 kernel, yes?

Yes, but I would not have posted it if it was not applicable to <current>.

>The problem might have been fixed in the intervening months.  Please
>confirm that the bug still exists in 2.6.10-rc1 and if so, send an updated
>patch.
>
>Thanks.

Anyway, for bulletproofness, I've taken a 2.6.10-rc2 try and tried a --dry-run.
The patch utility ran fine, so it's now confirmed that it applies to
2.6.10-rc2 too.

Maybe this is in relation to the other thread "[PATCH] dss1_divert ISDN module
compile fix for kernel" ?




Jan Engelhardt
-- 
Gesellschaft für Wissenschaftliche Datenverarbeitung
Am Fassberg, 37077 Göttingen, www.gwdg.de