Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin

into osdl.org:/home/mochel/src/kernel/linux-2.5-core

arch/i386/kernel/cpu/mcheck/k7.c

@@ -17,7 +17,7 @@
 #include "mce.h"
 
 /* Machine Check Handler For AMD Athlon/Duron */
-static void k7_machine_check(struct pt_regs * regs, long error_code)
+static asmlinkage void k7_machine_check(struct pt_regs * regs, long error_code)
 {
 	int recover=1;
 	u32 alow, ahigh, high, low;

arch/i386/kernel/cpu/mcheck/mce.c

@@ -18,18 +18,13 @@ int mce_disabled __initdata = 0;
 int nr_mce_banks;
 
 /* Handle unconfigured int18 (should never happen) */
-static void unexpected_machine_check(struct pt_regs * regs, long error_code)
+static asmlinkage void unexpected_machine_check(struct pt_regs * regs, long error_code)
 {	
 	printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
 }
 
 /* Call the installed machine check handler for this CPU setup. */
-void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
-
-asmlinkage void do_machine_check(struct pt_regs * regs, long error_code)
-{
-	machine_check_vector(regs, error_code);
-}
+void asmlinkage (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
 
 /* This has to be run for each processor */
 void __init mcheck_init(struct cpuinfo_x86 *c)

arch/i386/kernel/cpu/mcheck/mce.h

@@ -7,7 +7,7 @@ void intel_p6_mcheck_init(struct cpuinfo_x86 *c);
 void winchip_mcheck_init(struct cpuinfo_x86 *c);
 
 /* Call the installed machine check handler for this CPU setup. */
-extern void (*machine_check_vector)(struct pt_regs *, long error_code);
+extern asmlinkage void (*machine_check_vector)(struct pt_regs *, long error_code);
 
 extern int mce_disabled __initdata;
 extern int nr_mce_banks;

arch/i386/kernel/cpu/mcheck/p4.c

@@ -148,7 +148,7 @@ static inline int intel_get_extended_msrs(struct intel_mce_extended_msrs *r)
 	return mce_num_extended_msrs;
 }
 
-static void intel_machine_check(struct pt_regs * regs, long error_code)
+static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code)
 {
 	int recover=1;
 	u32 alow, ahigh, high, low;

arch/i386/kernel/cpu/mcheck/p5.c

@@ -16,7 +16,7 @@
 #include "mce.h"
 
 /* Machine check handler for Pentium class Intel */
-static void pentium_machine_check(struct pt_regs * regs, long error_code)
+static asmlinkage void pentium_machine_check(struct pt_regs * regs, long error_code)
 {
 	u32 loaddr, hi, lotype;
 	rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi);

arch/i386/kernel/cpu/mcheck/p6.c

@@ -16,7 +16,7 @@
 #include "mce.h"
 
 /* Machine Check Handler For PII/PIII */
-static void intel_machine_check(struct pt_regs * regs, long error_code)
+static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code)
 {
 	int recover=1;
 	u32 alow, ahigh, high, low;

arch/i386/kernel/cpu/mcheck/winchip.c

@@ -15,7 +15,7 @@
 #include "mce.h"
 
 /* Machine check handler for WinChip C6 */
-static void winchip_machine_check(struct pt_regs * regs, long error_code)
+static asmlinkage void winchip_machine_check(struct pt_regs * regs, long error_code)
 {
 	printk(KERN_EMERG "CPU0: Machine Check Exception.\n");
 }

arch/i386/kernel/entry.S

@@ -595,7 +595,7 @@ ENTRY(page_fault)
 #ifdef CONFIG_X86_MCE
 ENTRY(machine_check)
 	pushl $0
-	pushl $do_machine_check
+	pushl machine_check_vector
 	jmp error_code
 #endif
 

drivers/isdn/hardware/eicon/debuglib.h

@@ -103,28 +103,28 @@
 #define DL_TO_KERNEL    0x40000000
 
 #ifdef DIVA_NO_DEBUGLIB
-#define myDbgPrint_LOG(x,...) do { } while(0);
-#define myDbgPrint_FTL(x,...) do { } while(0);
-#define myDbgPrint_ERR(x,...) do { } while(0);
-#define myDbgPrint_TRC(x,...) do { } while(0);
-#define myDbgPrint_MXLOG(x,...) do { } while(0);
-#define myDbgPrint_EVL(x,...) do { } while(0);
-#define myDbgPrint_REG(x,...) do { } while(0);
-#define myDbgPrint_MEM(x,...) do { } while(0);
-#define myDbgPrint_SPL(x,...) do { } while(0);
-#define myDbgPrint_IRP(x,...) do { } while(0);
-#define myDbgPrint_TIM(x,...) do { } while(0);
-#define myDbgPrint_BLK(x,...) do { } while(0);
-#define myDbgPrint_TAPI(x,...) do { } while(0);
-#define myDbgPrint_NDIS(x,...) do { } while(0);
-#define myDbgPrint_CONN(x,...) do { } while(0);
-#define myDbgPrint_STAT(x,...) do { } while(0);
-#define myDbgPrint_SEND(x,...) do { } while(0);
-#define myDbgPrint_RECV(x,...) do { } while(0);
-#define myDbgPrint_PRV0(x,...) do { } while(0);
-#define myDbgPrint_PRV1(x,...) do { } while(0);
-#define myDbgPrint_PRV2(x,...) do { } while(0);
-#define myDbgPrint_PRV3(x,...) do { } while(0);
+#define myDbgPrint_LOG(x...) do { } while(0);
+#define myDbgPrint_FTL(x...) do { } while(0);
+#define myDbgPrint_ERR(x...) do { } while(0);
+#define myDbgPrint_TRC(x...) do { } while(0);
+#define myDbgPrint_MXLOG(x...) do { } while(0);
+#define myDbgPrint_EVL(x...) do { } while(0);
+#define myDbgPrint_REG(x...) do { } while(0);
+#define myDbgPrint_MEM(x...) do { } while(0);
+#define myDbgPrint_SPL(x...) do { } while(0);
+#define myDbgPrint_IRP(x...) do { } while(0);
+#define myDbgPrint_TIM(x...) do { } while(0);
+#define myDbgPrint_BLK(x...) do { } while(0);
+#define myDbgPrint_TAPI(x...) do { } while(0);
+#define myDbgPrint_NDIS(x...) do { } while(0);
+#define myDbgPrint_CONN(x...) do { } while(0);
+#define myDbgPrint_STAT(x...) do { } while(0);
+#define myDbgPrint_SEND(x...) do { } while(0);
+#define myDbgPrint_RECV(x...) do { } while(0);
+#define myDbgPrint_PRV0(x...) do { } while(0);
+#define myDbgPrint_PRV1(x...) do { } while(0);
+#define myDbgPrint_PRV2(x...) do { } while(0);
+#define myDbgPrint_PRV3(x...) do { } while(0);
 #define DBG_TEST(func,args) do { } while(0);
 #define DBG_EVL_ID(args) do { } while(0);
 

drivers/isdn/hardware/eicon/divamnt.c

-/* $Id: divamnt.c,v 1.27 2003/09/09 06:46:29 schindler Exp $
+/* $Id: divamnt.c,v 1.28 2003/09/18 06:57:18 schindler Exp $
  *
  * Driver for Eicon DIVA Server ISDN cards.
  * Maint module
@@ -24,10 +24,9 @@
 #include "platform.h"
 #include "di_defs.h"
 #include "divasync.h"
-#include "di_defs.h"
 #include "debug_if.h"
 
-static char *main_revision = "$Revision: 1.27 $";
+static char *main_revision = "$Revision: 1.28 $";
 
 static int major;
 

drivers/isdn/hardware/eicon/divasmain.c

-/* $Id: divasmain.c,v 1.40 2003/09/10 08:02:33 schindler Exp $
+/* $Id: divasmain.c,v 1.43 2003/09/22 08:57:31 schindler Exp $
  *
  * Low level driver for Eicon DIVA Server ISDN cards.
  *
@@ -9,13 +9,11 @@
  * of the GNU General Public License, incorporated herein by reference.
  */
 
-#define __KERNEL_SYSCALLS__
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/unistd.h>
 #include <linux/devfs_fs_kernel.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -43,7 +41,7 @@
 #include "diva_dma.h"
 #include "diva_pci.h"
 
-static char *main_revision = "$Revision: 1.40 $";
+static char *main_revision = "$Revision: 1.43 $";
 
 static int major;
 

drivers/isdn/hardware/eicon/dqueue.c

-/* $Id: dqueue.c,v 1.1.2.2 2001/02/11 14:40:41 armin Exp $
+/* $Id: dqueue.c,v 1.5 2003/04/12 21:40:49 schindler Exp $
  *
  * Driver for Eicon DIVA Server ISDN cards.
  * User Mode IDI Interface
  *
- * Copyright 2000,2001 by Armin Schindler (mac@melware.de)
- * Copyright 2000,2001 Cytronics & Melware (info@melware.de)
+ * Copyright 2000-2003 by Armin Schindler (mac@melware.de)
+ * Copyright 2000-2003 Cytronics & Melware (info@melware.de)
  *
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.

drivers/isdn/hardware/eicon/mntfunc.c

-/* $Id: mntfunc.c,v 1.15 2003/08/25 14:49:53 schindler Exp $
+/* $Id: mntfunc.c,v 1.16 2003/09/18 06:57:17 schindler Exp $
  *
  * Driver for Eicon DIVA Server ISDN cards.
  * Maint module
@@ -14,7 +14,6 @@
 #include "platform.h"
 #include "di_defs.h"
 #include "divasync.h"
-#include "di_defs.h"
 #include "debug_if.h"
 
 extern char *DRIVERRELEASE_MNT;

drivers/isdn/hardware/eicon/os_capi.h

-/* $Id: os_capi.h,v 1.1.2.2 2002/10/02 14:38:38 armin Exp $
+/* $Id: os_capi.h,v 1.7 2003/04/12 21:40:49 schindler Exp $
  *
  * ISDN interface module for Eicon active cards DIVA.
  * CAPI Interface OS include files 
  * 
- * Copyright 2000-2002 by Armin Schindler (mac@melware.de) 
- * Copyright 2000-2002 Cytronics & Melware (info@melware.de)
+ * Copyright 2000-2003 by Armin Schindler (mac@melware.de) 
+ * Copyright 2000-2003 Cytronics & Melware (info@melware.de)
  * 
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.

drivers/isdn/hardware/eicon/platform.h

-/* $Id: platform.h,v 1.31 2003/09/08 15:15:22 schindler Exp $
+/* $Id: platform.h,v 1.32 2003/09/18 06:59:59 schindler Exp $
  *
  * platform.h
  * 
@@ -19,7 +19,6 @@
 #endif
 
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>