patch-2.4.9 linux/net/wanrouter/wanmain.c
Next file: linux/net/wanrouter/wanproc.c
Previous file: linux/net/unix/af_unix.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Wed Aug 15 01:22:18 2001
- Orig file:
v2.4.8/linux/net/wanrouter/wanmain.c
- Orig date:
Tue Jul 3 17:08:22 2001
diff -u --recursive --new-file v2.4.8/linux/net/wanrouter/wanmain.c linux/net/wanrouter/wanmain.c
@@ -48,7 +48,7 @@
#include <linux/errno.h> /* return codes */
#include <linux/kernel.h>
#include <linux/module.h> /* support for loadable modules */
-#include <linux/malloc.h> /* kmalloc(), kfree() */
+#include <linux/slab.h> /* kmalloc(), kfree() */
#include <linux/mm.h> /* verify_area(), etc. */
#include <linux/string.h> /* inline mem*, str* functions */
@@ -137,17 +137,6 @@
#define kfree(x) dbg_kfree(x,__LINE__)
*****************************************************************************/
-
-/*
- * Defines and Macros
- */
-
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
-#endif
/*
* Function Prototypes
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)