Merge with Linu 2.4.0-test6-pre6.

6 files changed, 14 insertions, 483 deletions

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 1f59c2926..9a2f2cbe6 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -25,7 +25,7 @@ extern inline unsigned int nr_free_highpages(void) { return 0; }
 #define replace_with_highmem(page) page
 
 static __inline__ unsigned long kmap(struct page * page) {
-	return page_address(page);
+	return (unsigned long) page_address(page);
 }
 
 #define kunmap(page) do { } while (0)
diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h
index 98cf96ff4..b3433a3d6 100644
--- a/include/linux/irq_cpustat.h
+++ b/include/linux/irq_cpustat.h
@@ -9,6 +9,8 @@
  * Keith Owens <kaos@ocs.com.au> July 2000.
  */
 
+#include <linux/config.h>
+
 /*
  * Simple wrappers reducing source bloat.  Define all irq_stat fields
  * here, even ones that are arch dependent.  That way we get common
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 909ce0683..427e6c8ac 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -1,5 +1,5 @@
-/* $Id: isdn.h,v 1.101 2000/03/20 22:37:47 detabc Exp $
- *
+/* $Id: isdn.h,v 1.105 2000/05/18 23:14:19 keil Exp $
+
  * Main header for the Linux ISDN subsystem (linklevel).
  *
  * Copyright 1994,95,96 by Fritz Elfert (fritz@isdn4linux.de)
@@ -20,364 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * $Log: isdn.h,v $
- * Revision 1.101  2000/03/20 22:37:47  detabc
- * modify abc-extension to work together with the new LL.
- * remove abc frame-counter (is obsolete now).
- * use the new lp->super_tx_queue for internal queueing (bsd-rawip-compress).
- * modify isdn_net_xmit() and isdn_net_write_super().
- * -- Kai, please have a look to this two function's. Thank's.
- *
- * Revision 1.100  2000/03/19 15:27:53  kai
- * no known bugs left...
- *
- * Revision 1.99  2000/03/18 16:20:26  kai
- * cosmetics / renaming
- *
- * Revision 1.98  2000/03/17 18:20:47  kai
- * moved to frame_cnt based flow control
- * some races still need to be fixed
- *
- * Revision 1.97  2000/03/17 16:22:55  kai
- * we keep track of outstanding packets (given to HL, but not confirmed yet)
- * now, but we don't use it for flow control yet.
- *
- * Revision 1.96  2000/03/17 12:49:42  kai
- * calling statcallb with ISDN_STAT_BSENT in hard-IRQ context is now
- * officially allowed. writebuf_skb() will never be called in hard-IRQ context
- * anymore.
- *
- * Revision 1.95  2000/03/04 16:20:42  detabc
- * copy frames before rewriting frame's saddr
- *
- * Revision 1.94  2000/02/26 00:29:40  keil
- * more softnet changes
- *
- * Revision 1.93  2000/02/25 11:29:17  paul
- * changed chargetime to ulong from int (after about 20 days the "chargetime of
- * ipppX is now 1234" message displays a negative number on alpha).
- *
- * Revision 1.92  2000/02/17 13:15:56  keil
- * fix backward compatibility for 2.2
- *
- * Revision 1.91  2000/02/16 14:56:27  paul
- * translated ISDN_MODEM_ANZREG to ISDN_MODEM_NUMREG for english speakers
- *
- * Revision 1.90  2000/02/06 21:50:00  detabc
- * add rewriting of socket's and frame's saddr for udp-ipv4 dynip-connections.
- * Include checksum-recompute of ip- and udp-header's.
- *
- * Revision 1.89  2000/02/05 22:11:33  detabc
- * Add rewriting of socket's and frame's saddr adressfield for
- * dynip-connections.  Only for tcp/ipv4 and switchable per interface.
- * Include checksum-recompute of ip- and tcp-header's.
- *
- * Revision 1.88  2000/01/20 19:59:43  keil
- * Add FAX Class 1 support
- *
- * Revision 1.87  2000/01/09 20:43:15  detabc
- * exand logical bind-group's for both call's (in and out).
- * add first part of kernel-config-help for abc-extension.
- *
- * Revision 1.86  1999/12/05 16:06:09  detabc
- * add resethandling for rawip-compression.
- * at now all B2-Protocols are usable with rawip-compression
- *
- * Revision 1.85  1999/11/30 11:29:06  detabc
- * add a on the fly frame-counter and limit
- *
- * Revision 1.84  1999/11/28 14:49:08  detabc
- * In case of rawip-compress adjust dev[x]->ibytes/obytes to reflect the
- * uncompressed size.
- *
- * Revision 1.83  1999/11/26 15:54:59  detabc
- * added compression (isdn_bsdcompress) for rawip interfaces with x75i B2-protocol.
- *
- * Revision 1.82  1999/11/20 22:14:14  detabc
- * added channel dial-skip in case of external use
- * (isdn phone or another isdn device) on the same NTBA.
- * usefull with two or more card's connected the different NTBA's.
- * global switchable in kernel-config and also per netinterface.
- *
- * add auto disable of netinterface's in case of:
- * 	to many connection's in short time.
- * 	config mistakes (wrong encapsulation, B2-protokoll or so on) on local
- * 	or remote side.
- * 	wrong password's or something else to a ISP (syncppp).
- *
- * possible encapsulations for this future are:
- * ISDN_NET_ENCAP_SYNCPPP, ISDN_NET_ENCAP_UIHDLC, ISDN_NET_ENCAP_RAWIP,
- * and ISDN_NET_ENCAP_CISCOHDLCK.
- *
- * Revision 1.81  1999/10/27 21:21:18  detabc
- * Added support for building logically-bind-group's per interface.
- * usefull for outgoing call's with more then one isdn-card.
- *
- * Switchable support to dont reset the hangup-timeout for
- * receive frames. Most part's of the timru-rules for receiving frames
- * are now obsolete. If the input- or forwarding-firewall deny
- * the frame, the line will be not hold open.
- *
- * Revision 1.80  1999/10/26 21:09:29  armin
- * New bufferlen for phonenumber only with kernel 2.3.x
- *
- * Revision 1.79  1999/10/16 17:52:38  keil
- * Changing the MSN length need new data versions
- *
- * Revision 1.78  1999/10/08 18:59:33  armin
- * Bugfix of too small MSN buffer and checking phone number
- * in isdn_tty_getdial()
- *
- * Revision 1.77  1999/09/23 22:22:42  detabc
- * added tcp-keepalive-detect with local response (ipv4 only)
- * added host-only-interface support
- * (source ipaddr == interface ipaddr) (ipv4 only)
- * ok with kernel 2.3.18 and 2.2.12
- *
- * Revision 1.76  1999/09/14 10:16:21  keil
- * change ABC include
- *
- * Revision 1.75  1999/09/13 23:25:17  he
- * serialized xmitting frames from isdn_ppp and BSENT statcallb
- *
- * Revision 1.74  1999/09/12 16:19:39  detabc
- * added abc features
- * low cost routing for net-interfaces (only the HL side).
- * need more implementation in the isdnlog-utility
- * udp info support (first part).
- * different EAZ on outgoing call's.
- * more checks on D-Channel callbacks (double use of channels).
- * tested and running with kernel 2.3.17
- *
- * Revision 1.73  1999/09/06 07:29:36  fritz
- * Changed my mail-address.
- *
- * Revision 1.72  1999/09/04 22:20:19  detabc
- *
- * Revision 1.71  1999/08/23 15:54:22  keil
- * more backported changes from kernel 2.3.14
- *
- * Revision 1.70  1999/07/31 12:59:58  armin
- * Added tty fax capabilities.
- *
- * Revision 1.69  1999/07/13 20:47:53  werner
- * added channel bit ISDN_USAGE_DISABLED for limiting b-channel access.
- *
- * Revision 1.68  1999/07/11 17:07:37  armin
- * Added tty modem register S23.
- * Added new layer 2 and 3 protocols for Fax and DSP functions.
- *
- * Revision 1.67  1999/07/07 10:17:24  detabc
- * remove unused messages
- *
- * Revision 1.66  1999/07/01 08:35:37  keil
- * compatibility to 2.3
- *
- * Revision 1.65  1999/06/10 11:51:27  paul
- * fixed comment for NET_DV
- *
- * Revision 1.64  1999/04/18 14:57:14  fritz
- * Removed TIMRU stuff
- *
- * Revision 1.63  1999/04/18 14:07:18  fritz
- * Removed TIMRU stuff.
- *
- * Revision 1.62  1999/04/12 13:16:54  fritz
- * Changes from 2.0 tree.
- *
- * Revision 1.61  1999/03/02 11:43:21  armin
- * Added variable to store connect-message of Modem.
- * Added Timer-define for RegS7 (Wait for Carrier).
- *
- * Revision 1.60  1998/10/25 14:50:29  fritz
- * Backported from MIPS (Cobalt).
- *
- * Revision 1.59  1998/10/23 10:18:55  paul
- * Implementation of "dialmode" (successor of "status")
- * You also need current isdnctrl for this!
- *
- * Revision 1.58  1998/10/23 10:10:06  fritz
- * Test-Checkin
- *
- * Revision 1.57  1998/08/31 21:10:01  he
- * new ioctl IIOCNETGPN for /dev/isdninfo (get network interface'
- *     peer phone number)
- *
- * Revision 1.56  1998/07/26 18:46:52  armin
- * Added silence detection in voice receive mode.
- *
- * Revision 1.55  1998/06/26 15:13:17  fritz
- * Added handling of STAT_ICALL with incomplete CPN.
- * Added AT&L for ttyI emulator.
- * Added more locking stuff in tty_write.
- *
- * Revision 1.54  1998/06/18 23:32:01  fritz
- * Replaced cli()/restore_flags() in isdn_tty_write() by locking.
- * Removed direct-senddown feature in isdn_tty_write because it will
- * never succeed with locking and is useless anyway.
- *
- * Revision 1.53  1998/06/17 19:51:51  he
- * merged with 2.1.10[34] (cosmetics and udelay() -> mdelay())
- * brute force fix to avoid Ugh's in isdn_tty_write()
- * cleaned up some dead code
- *
- * Revision 1.46  1998/04/14 16:28:59  he
- * Fixed user space access with interrupts off and remaining
- * copy_{to,from}_user() -> -EFAULT return codes
- *
- * Revision 1.45  1998/03/24 16:33:12  hipp
- * More CCP changes. BSD compression now "works" on a local loopback link.
- * Moved some isdn_ppp stuff from isdn.h to isdn_ppp.h
- *
- * Revision 1.44  1998/03/22 18:50:56  hipp
- * Added BSD Compression for syncPPP .. UNTESTED at the moment
- *
- * Revision 1.43  1998/03/09 17:46:44  he
- * merged in 2.1.89 changes
- *
- *
- * Revision 1.40  1998/03/08 01:08:29  fritz
- * Increased NET_DV because of TIMRU
- *
- * Revision 1.39  1998/03/07 22:42:49  fritz
- * Starting generic module support (Nothing usable yet).
- *
- * Revision 1.38  1998/03/07 18:21:29  cal
- * Dynamic Timeout-Rule-Handling vs. 971110 included
- *
- * Revision 1.37  1998/02/22 19:45:24  fritz
- * Some changes regarding V.110
- *
- * Revision 1.36  1998/02/20 17:35:55  fritz
- * Added V.110 stuff.
- *
- * Revision 1.35  1998/01/31 22:14:14  keil
- * changes for 2.1.82
- *
- * Revision 1.34  1997/10/09 21:28:11  fritz
- * New HL<->LL interface:
- *   New BSENT callback with nr. of bytes included.
- *   Sending without ACK.
- *   New L1 error status (not yet in use).
- *   Cleaned up obsolete structures.
- * Implemented Cisco-SLARP.
- * Changed local net-interface data to be dynamically allocated.
- * Removed old 2.0 compatibility stuff.
- *
- * Revision 1.33  1997/08/21 14:44:22  fritz
- * Moved triggercps to end of struct for backwards-compatibility.
- *
- * Revision 1.32  1997/08/21 09:49:46  fritz
- * Increased NET_DV
- *
- * Revision 1.31  1997/06/22 11:57:07  fritz
- * Added ability to adjust slave triggerlevel.
- *
- * Revision 1.30  1997/06/17 13:07:23  hipp
- * compression changes , MP changes
- *
- * Revision 1.29  1997/05/27 15:18:02  fritz
- * Added changes for recent 2.1.x kernels:
- *   changed return type of isdn_close
- *   queue_task_* -> queue_task
- *   clear/set_bit -> test_and_... where apropriate.
- *   changed type of hard_header_cache parameter.
- *
- * Revision 1.28  1997/03/07 01:33:01  fritz
- * Added proper ifdef's for CONFIG_ISDN_AUDIO
- *
- * Revision 1.27  1997/03/05 21:11:49  fritz
- * Minor fixes.
- *
- * Revision 1.26  1997/02/28 02:37:53  fritz
- * Added some comments.
- *
- * Revision 1.25  1997/02/23 16:54:23  hipp
- * some initial changes for future PPP compresion
- *
- * Revision 1.24  1997/02/18 09:42:45  fritz
- * Bugfix: Increased ISDN_MODEM_ANZREG.
- * Increased TTY_DV.
- *
- * Revision 1.23  1997/02/10 22:07:13  fritz
- * Added 2 modem registers for numbering plan and screening info.
- *
- * Revision 1.22  1997/02/03 23:42:08  fritz
- * Added ISDN_TIMER_RINGING
- * Misc. changes for Kernel 2.1.X compatibility
- *
- * Revision 1.21  1997/01/17 01:19:10  fritz
- * Applied chargeint patch.
- *
- * Revision 1.20  1997/01/17 00:41:19  fritz
- * Increased TTY_DV.
- *
- * Revision 1.19  1997/01/14 01:41:07  fritz
- * Added ATI2 related variables.
- * Added variables for audio support in skbuffs.
- *
- * Revision 1.18  1996/11/06 17:37:50  keil
- * more changes for 2.1.X
- *
- * Revision 1.17  1996/09/07 12:53:57  hipp
- * moved a few isdn_ppp.c specific defines to drives/isdn/isdn_ppp.h
- *
- * Revision 1.16  1996/08/12 16:20:56  hipp
- * renamed ppp_minor to ppp_slot
- *
- * Revision 1.15  1996/06/15 14:56:57  fritz
- * Added version signatures for data structures used
- * by userlevel programs.
- *
- * Revision 1.14  1996/06/06 21:24:23  fritz
- * Started adding support for suspend/resume.
- *
- * Revision 1.13  1996/06/05 02:18:20  fritz
- * Added DTMF decoding stuff.
- *
- * Revision 1.12  1996/06/03 19:55:08  fritz
- * Fixed typos.
- *
- * Revision 1.11  1996/05/31 01:37:47  fritz
- * Minor changes, due to changes in isdn_tty.c
- *
- * Revision 1.10  1996/05/18 01:37:18  fritz
- * Added spelling corrections and some minor changes
- * to stay in sync with kernel.
- *
- * Revision 1.9  1996/05/17 03:58:20  fritz
- * Added flags for DLE handling.
- *
- * Revision 1.8  1996/05/11 21:49:55  fritz
- * Removed queue management variables.
- * Changed queue management to use sk_buffs.
- *
- * Revision 1.7  1996/05/07 09:10:06  fritz
- * Reorganized tty-related structs.
- *
- * Revision 1.6  1996/05/06 11:38:27  hipp
- * minor change in ippp struct
- *
- * Revision 1.5  1996/04/30 11:03:16  fritz
- * Added Michael's ippp-bind patch.
- *
- * Revision 1.4  1996/04/29 23:00:02  fritz
- * Added variables for voice-support.
- *
- * Revision 1.3  1996/04/20 16:54:58  fritz
- * Increased maximum number of channels.
- * Added some flags for isdn_net to handle callback more reliable.
- * Fixed delay-definitions to be more accurate.
- * Misc. typos
- *
- * Revision 1.2  1996/02/11 02:10:02  fritz
- * Changed IOCTL-names
- * Added rx_netdev, st_netdev, first_skb, org_hcb, and org_hcu to
- * Netdevice-local struct.
- *
- * Revision 1.1  1996/01/10 20:55:07  fritz
- * Initial revision
- *
  */
 
 #ifndef isdn_h
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index 209cd9d81..8677f36c7 100644
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -21,126 +21,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * $Log: isdnif.h,v $
- * Revision 1.33  2000/01/20 19:59:43  keil
- * Add FAX Class 1 support
- *
- * Revision 1.32  1999/10/11 22:03:00  keil
- * COMPAT_NEED_UACCESS (no include in isdn_compat.h)
- *
- * Revision 1.31  1999/09/06 07:29:36  fritz
- * Changed my mail-address.
- *
- * Revision 1.30  1999/08/23 15:54:29  keil
- * more backported changes from kernel 2.3.14
- *
- * Revision 1.29  1999/07/31 13:00:02  armin
- * Added tty fax capabilities.
- *
- * Revision 1.28  1999/07/13 20:57:48  werner
- * added callback ISDN_STAT_DISCH for limiting b-channel resources.
- *
- * Revision 1.27  1999/07/11 17:07:39  armin
- * Added tty modem register S23.
- * Added new layer 2 and 3 protocols for Fax and DSP functions.
- *
- * Revision 1.26  1999/07/01 08:35:44  keil
- * compatibility to 2.3
- *
- * Revision 1.25  1998/06/17 19:51:55  he
- * merged with 2.1.10[34] (cosmetics and udelay() -> mdelay())
- * brute force fix to avoid Ugh's in isdn_tty_write()
- * cleaned up some dead code
- *
- * Revision 1.24  1998/03/19 13:18:57  keil
- * Start of a CAPI like interface for supplementary Service
- * first service: SUSPEND
- *
- * Revision 1.23  1998/02/20 17:36:52  fritz
- * Added L2-protocols for V.110, changed FEATURE-Flag-constants.
- *
- * Revision 1.22  1998/01/31 22:14:12  keil
- * changes for 2.1.82
- *
- * Revision 1.21  1997/10/09 21:28:13  fritz
- * New HL<->LL interface:
- *   New BSENT callback with nr. of bytes included.
- *   Sending without ACK.
- *   New L1 error status (not yet in use).
- *   Cleaned up obsolete structures.
- * Implemented Cisco-SLARP.
- * Changed local net-interface data to be dynamically allocated.
- * Removed old 2.0 compatibility stuff.
- *
- * Revision 1.20  1997/05/27 15:18:06  fritz
- * Added changes for recent 2.1.x kernels:
- *   changed return type of isdn_close
- *   queue_task_* -> queue_task
- *   clear/set_bit -> test_and_... where apropriate.
- *   changed type of hard_header_cache parameter.
- *
- * Revision 1.19  1997/03/25 23:13:56  keil
- * NI-1 US protocol
- *
- * Revision 1.18  1997/03/04 22:09:18  calle
- * Change macros copy_from_user and copy_to_user in inline function.
- * These are now correct replacements of the functions for 2.1.xx
- *
- * Revision 1.17  1997/02/10 21:12:53  fritz
- * More setup-interface changes.
- *
- * Revision 1.16  1997/02/10 19:42:57  fritz
- * New interface for reporting incoming calls.
- *
- * Revision 1.15  1997/02/09 00:18:42  keil
- * leased line support
- *
- * Revision 1.14  1997/02/03 23:43:00  fritz
- * Misc changes for Kernel 2.1.X compatibility.
- *
- * Revision 1.13  1996/11/13 02:39:59  fritz
- * More compatibility changes.
- *
- * Revision 1.12  1996/11/06 17:38:48  keil
- * more changes for 2.1.X
- *
- * Revision 1.11  1996/10/23 11:59:42  fritz
- * More compatibility changes.
- *
- * Revision 1.10  1996/10/22 23:14:19  fritz
- * Changes for compatibility to 2.0.X and 2.1.X kernels.
- *
- * Revision 1.9  1996/06/06 21:24:24  fritz
- * Started adding support for suspend/resume.
- *
- * Revision 1.8  1996/05/18 01:45:37  fritz
- * More spelling corrections.
- *
- * Revision 1.7  1996/05/18 01:37:19  fritz
- * Added spelling corrections and some minor changes
- * to stay in sync with kernel.
- *
- * Revision 1.6  1996/05/17 03:59:28  fritz
- * Marked rcvcallb and writebuf obsolete.
- *
- * Revision 1.5  1996/05/01 11:43:54  fritz
- * Removed STANDALONE
- *
- * Revision 1.4  1996/05/01 11:38:40  fritz
- * Added ISDN_FEATURE_L2_TRANS
- *
- * Revision 1.3  1996/04/29 22:57:54  fritz
- * Added driverId and channel parameters to
- * writecmd() and readstat().
- * Added constant for voice-support.
- *
- * Revision 1.2  1996/04/20 17:02:40  fritz
- * Changes to support skbuffs for Lowlevel-Drivers.
- * Misc. typos
- *
- * Revision 1.1  1996/01/09 05:50:51  fritz
- * Initial revision
- *
  */
 
 #ifndef isdnif_h
diff --git a/include/linux/mm.h b/include/linux/mm.h
index b8f6a4964..a248e939f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -151,7 +151,7 @@ typedef struct page {
 	wait_queue_head_t wait;
 	struct page **pprev_hash;
 	struct buffer_head * buffers;
-	unsigned long virtual; /* nonzero if kmapped */
+	void *virtual; /* non-NULL if kmapped */
 	struct zone_struct *zone;
 } mem_map_t;
 
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 9b255c3cd..10da433df 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -45,7 +45,6 @@ typedef struct kmem_cache_s kmem_cache_t;
 /* prototypes */
 extern void kmem_cache_init(void);
 extern void kmem_cache_sizes_init(void);
-extern void kmem_cpucache_init(void);
 
 extern kmem_cache_t *kmem_find_general_cachep(size_t, int gfpflags);
 extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long,
@@ -74,6 +73,14 @@ extern kmem_cache_t	*filp_cachep;
 extern kmem_cache_t	*dquot_cachep;
 extern kmem_cache_t	*bh_cachep;
 
+#ifdef CONFIG_SMP
+extern unsigned long slab_cache_drain_mask;
+extern void slab_drain_local_cache(void);
+#else
+#define slab_cache_drain_mask 0
+#define slab_drain_local_cache()	do { } while (0)
+#endif
+
 #endif	/* __KERNEL__ */
 
 #endif	/* _LINUX_SLAB_H */