(patch-2.4.6) Fix oops with Iomega Clik! (ide-floppy)
Hi,
this fixes an Oops when accessing an IOMEGA PC card Clik! drive (NULL pointer in get_flexible_disk_page).
Linus, please include if you like.
This is the original patch from the MAINTAINER
but he seems defunct since three weeks.
Regards, Gunther
drivers/ide/ide-floppy.c Sat Jul 14 12:07:40 2001 renamed from drivers/ide/ide-floppy.c Fri Feb 9 20:30:23 2001 +118 -74
@@ -1,7 +1,8 @@ /* - * linux/drivers/ide/ide-floppy.c Version 0.9 Jul 4, 1999 + * linux/drivers/ide/ide-floppy.c Version 0.96 Jan 7, 2001 * * Copyright (C) 1996 - 1999 Gadi Oxman <[email protected]> + * Copyright (C) 2000 - 2001 Paul Bristow <[email protected]> */ /*
@@ -10,6 +11,12 @@ * The driver currently doesn't have any fancy features, just the bare * minimum read/write support. * + * This driver supports the following IDE floppy drives: + * + * LS-120 SuperDisk + * Iomega Zip 100/250 + * Iomega PC Card Clik!/PocketZip + * * Many thanks to Lode Leroy <[email protected]>, who tested so many * ALPHA patches to this driver on an EASYSTOR LS-120 ATAPI floppy drive. *
@@ -29,9 +36,20 @@ * Ver 0.9 Jul 4 99 Fix a bug which might have caused the number of * bytes requested on each interrupt to be zero. * Thanks to <[email protected]> for pointing this out. + * Ver 0.91 Dec 11 99 Added IOMEGA Clik! drive support by + * <[email protected]> + * Ver 0.92 Oct 22 00 Paul Bristow became official maintainer for this + * driver. Included Powerbook internal zip kludge. + * Ver 0.93 Oct 24 00 Fixed bugs for Clik! drive + * no disk on insert and disk change now works + * Ver 0.94 Oct 27 00 Tidied up to remove strstr(Clik) everywhere + * Ver 0.95 Nov 7 00 Brought across to kernel 2.4 + * Ver 0.96 Jan 7 01 Actually in line with release version of 2.4.0 + * including set_bit patch from Rusty Russel + * */ -#define IDEFLOPPY_VERSION "0.9" +#define IDEFLOPPY_VERSION "0.96" #include <linux/config.h> #include <linux/module.h>
@@ -45,7 +63,7 @@ #include <linux/major.h> #include <linux/errno.h> #include <linux/genhd.h> -#include <linux/slab.h> +#include <linux/malloc.h> #include <linux/cdrom.h> #include <linux/ide.h>
@@ -56,12 +74,14 @@ #include <asm/unaligned.h> #include <asm/bitops.h> + /* * The following are used to debug the driver. */ -#define IDEFLOPPY_DEBUG_LOG 0 #define IDEFLOPPY_DEBUG_INFO 0 #define IDEFLOPPY_DEBUG_BUGS 1 +/* #define IDEFLOPPY_DEBUG(fmt, args...) printk(KERN_INFO fmt, ## args) */ +#define IDEFLOPPY_DEBUG( fmt, args... ) /* * Some drives require a longer irq timeout.
@@ -104,7 +124,7 @@ byte *current_position; /* Pointer into the above buffer */ void (*callback) (ide_drive_t *); /* Called when this packet command is completed */ byte pc_buffer[IDEFLOPPY_PC_BUFFER_SIZE]; /* Temporary buffer */ - unsigned long flags; /* Status/Action bit flags: long for set_bit */ + unsigned long flags; /* Status/Action bit flags : long for set_bit() */ } idefloppy_pc_t; /*
@@ -181,6 +201,7 @@ u8 reserved30[2]; } idefloppy_flexible_disk_page_t; + /* * Format capacity */
@@ -237,7 +258,7 @@ idefloppy_flexible_disk_page_t flexible_disk_page; /* Copy of the flexible disk page */ int wp; /* Write protect */ - unsigned int flags; /* Status/Action flags */ + unsigned long flags; /* Status/Action flags : long for set_bit() */ } idefloppy_floppy_t; /*
@@ -246,6 +267,8 @@ #define IDEFLOPPY_DRQ_INTERRUPT 0 /* DRQ interrupt device */ #define IDEFLOPPY_MEDIA_CHANGED 1 /* Media may have changed */ #define IDEFLOPPY_USE_READ12 2 /* Use READ12/WRITE12 or READ10/WRITE10 */ +#define IDEFLOPPY_CLIK_DRIVE 3 /* Avoid commands not supported in Clik drive */ +#define IDEFLOPPY_POWERBOOK_ZIP 4 /* Kludge for Apple Powerbook Zip drive */ /* * ATAPI floppy drive packet commands
@@ -621,9 +644,7 @@ struct request *rq = hwgroup->rq; int error; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "Reached idefloppy_end_request\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "Reached idefloppy_end_request\n"); switch (uptodate) { case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
@@ -746,21 +767,19 @@ idefloppy_floppy_t *floppy = drive->driver_data; floppy->sense_key = result->sense_key; floppy->asc = result->asc; floppy->ascq = result->ascq; -#if IDEFLOPPY_DEBUG_LOG - if (floppy->failed_pc) - printk (KERN_INFO "ide-floppy: pc = %x, sense key = %x, asc = %x, ascq = %x\n",floppy->failed_pc->c[0],result->sense_key,result->asc,result->ascq); - else - printk (KERN_INFO "ide-floppy: sense key = %x, asc = %x, ascq = %x\n",result->sense_key,result->asc,result->ascq); -#endif /* IDEFLOPPY_DEBUG_LOG */ + if (floppy->failed_pc) { + IDEFLOPPY_DEBUG("ide-floppy: pc = %x, sense key = %x, asc = %x, ascq = %x\n",floppy->failed_pc->c[0],result->sense_key,result->asc,result->ascq); + } + else { + IDEFLOPPY_DEBUG("ide-floppy: sense key = %x, asc = %x, ascq = %x\n",result->sense_key,result->asc,result->ascq); + } } static void idefloppy_request_sense_callback (ide_drive_t *drive) { idefloppy_floppy_t *floppy = drive->driver_data; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: Reached idefloppy_request_sense_callback\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: Reached idefloppy_request_sense_callback\n"); if (!floppy->pc->error) { idefloppy_analyze_error (drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer); idefloppy_end_request (1,HWGROUP (drive));
@@ -777,9 +796,7 @@ { idefloppy_floppy_t *floppy = drive->driver_data; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: Reached idefloppy_pc_callback\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: Reached idefloppy_pc_callback\n"); idefloppy_end_request (floppy->pc->error ? 0:1, HWGROUP(drive)); }
@@ -840,9 +857,7 @@ struct request *rq = pc->rq; unsigned int temp; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: Reached idefloppy_pc_intr interrupt handler\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: Reached idefloppy_pc_intr interrupt handler\n"); #ifdef CONFIG_BLK_DEV_IDEDMA if (test_bit (PC_DMA_IN_PROGRESS, &pc->flags)) {
@@ -852,26 +867,20 @@ pc->actually_transferred=pc->request_transfer; idefloppy_update_buffers (drive, pc); } -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: DMA finished\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: DMA finished\n"); } #endif /* CONFIG_BLK_DEV_IDEDMA */ status.all = GET_STAT(); /* Clear the interrupt */ if (!status.b.drq) { /* No more interrupts */ -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "Packet command completed, %d bytes transferred\n", pc->actually_transferred); clear_bit (PC_DMA_IN_PROGRESS, &pc->flags); ide__sti(); /* local CPU only */ if (status.b.check || test_bit (PC_DMA_ERROR, &pc->flags)) { /* Error detected */ -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: %s: I/O error\n",drive->name); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: %s: I/O error\n",drive->name); rq->errors++; if (pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) { printk (KERN_ERR "ide-floppy: I/O error in request sense command\n");
@@ -915,9 +924,7 @@ ide_set_handler (drive,&idefloppy_pc_intr,IDEFLOPPY_WAIT_CMD, NULL); return ide_started; } -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_NOTICE "ide-floppy: The floppy wants to send us more data than expected - allowing transfer\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: The floppy wants to send us more data than expected - allowing transfer\n"); } } if (test_bit (PC_WRITING, &pc->flags)) {
@@ -983,7 +990,7 @@ * a legitimate error code was received. */ if (!test_bit (PC_ABORT, &pc->flags)) { - printk (KERN_ERR "ide-floppy: %s: I/O error, pc = %2x, key = %2x, asc = %2x, ascq = %2x\n", + IDEFLOPPY_DEBUG( "ide-floppy: %s: I/O error, pc = %2x, key = %2x, asc = %2x, ascq = %2x\n", drive->name, pc->c[0], floppy->sense_key, floppy->asc, floppy->ascq); pc->error = IDEFLOPPY_ERROR_GENERAL; /* Giving up */ }
@@ -991,9 +998,7 @@ pc->callback(drive); return ide_stopped; } -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "Retry number - %d\n",pc->retries); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "Retry number - %d\n",pc->retries); pc->retries++; pc->actually_transferred=0; /* We haven't transferred any data yet */
@@ -1034,9 +1039,7 @@ static void idefloppy_rw_callback (ide_drive_t *drive) { -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: Reached idefloppy_rw_callback\n"); idefloppy_end_request(1, HWGROUP(drive)); return;
@@ -1044,9 +1047,7 @@ static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent) { -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "ide-floppy: creating prevent removal command, prevent = %d\n", prevent); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "ide-floppy: creating prevent removal command, prevent = %d\n", prevent); idefloppy_init_pc (pc); pc->c[0] = IDEFLOPPY_PREVENT_REMOVAL_CMD;
@@ -1106,10 +1107,8 @@ int block = sector / floppy->bs_factor; int blocks = rq->nr_sectors / floppy->bs_factor; -#if IDEFLOPPY_DEBUG_LOG - printk ("create_rw1%d_cmd: block == %d, blocks == %d\n", + IDEFLOPPY_DEBUG( "create_rw1%d_cmd: block == %d, blocks == %d\n", 2 * test_bit (IDEFLOPPY_USE_READ12, &floppy->flags), block, blocks); -#endif /* IDEFLOPPY_DEBUG_LOG */ idefloppy_init_pc (pc); if (test_bit (IDEFLOPPY_USE_READ12, &floppy->flags)) {
@@ -1139,10 +1138,8 @@ idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_pc_t *pc; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "rq_status: %d, rq_dev: %u, cmd: %d, errors: %d\n",rq->rq_status,(unsigned int) rq->rq_dev,rq->cmd,rq->errors); - printk (KERN_INFO "sector: %ld, nr_sectors: %ld, current_nr_sectors: %ld\n",rq->sector,rq->nr_sectors,rq->current_nr_sectors); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "rq_status: %d, rq_dev: %u, cmd: %d, errors: %d\n",rq->rq_status,(unsigned int) rq->rq_dev,rq->cmd,rq->errors); + IDEFLOPPY_DEBUG( "sector: %ld, nr_sectors: %ld, current_nr_sectors: %ld\n",rq->sector,rq->nr_sectors,rq->current_nr_sectors); if (rq->errors >= ERROR_MAX) { if (floppy->failed_pc != NULL)
@@ -1235,6 +1232,7 @@ return 0; } + /* * Determine if a media is present in the floppy drive, and if so, * its LBA capacity.
@@ -1263,48 +1261,68 @@ for (i = 0; i < descriptors; i++, descriptor++) { blocks = descriptor->blocks = ntohl (descriptor->blocks); length = descriptor->length = ntohs (descriptor->length); - if (!i && descriptor->dc == CAPACITY_CURRENT) { - if (memcmp (descriptor, &floppy->capacity, sizeof (idefloppy_capacity_descriptor_t))) { - printk (KERN_INFO "%s: %dkB, %d blocks, %d sector size, %s \n", - drive->name, blocks * length / 1024, blocks, length, - drive->using_dma ? ", DMA":""); - } - floppy->capacity = *descriptor; + if (!i) { + switch (descriptor->dc) { + case CAPACITY_UNFORMATTED: /* Clik! drive returns this instead of CAPACITY_CURRENT */ + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) + break; /* If it is not a clik drive, break out (maintains previous driver behaviour) */ + case CAPACITY_CURRENT: /* Normal Zip/LS-120 disks */ + if (memcmp (descriptor, &floppy->capacity, sizeof (idefloppy_capacity_descriptor_t))) + printk (KERN_INFO "%s: %dkB, %d blocks, %d sector size\n", drive->name, blocks * length / 1024, blocks, length); + floppy->capacity = *descriptor; if (!length || length % 512) - printk (KERN_ERR "%s: %d bytes block size not supported\n", drive->name, length); + printk (KERN_NOTICE "%s: %d bytes block size not supported\n", drive->name, length); else { floppy->blocks = blocks; floppy->block_size = length; if ((floppy->bs_factor = length / 512) != 1) printk (KERN_NOTICE "%s: warning: non 512 bytes block size not fully supported\n", drive->name); - rc = 0; - } + rc = 0; + } + break; + case CAPACITY_NO_CARTRIDGE: + /* This is a KERN_ERR so it appears on screen for the user to see */ + printk (KERN_ERR "%s: No disk in drive\n", drive->name); + break; + case CAPACITY_INVALID: + printk (KERN_ERR "%s: Invalid capacity for disk in drive\n", drive->name); + break; } -#if IDEFLOPPY_DEBUG_INFO - if (!i) printk (KERN_INFO "Descriptor 0 Code: %d\n", descriptor->dc); - printk (KERN_INFO "Descriptor %d: %dkB, %d blocks, %d sector size\n", i, blocks * length / 1024, blocks, length); -#endif /* IDEFLOPPY_DEBUG_INFO */ } + if (!i) { + IDEFLOPPY_DEBUG( "Descriptor 0 Code: %d\n", descriptor->dc); + } + IDEFLOPPY_DEBUG( "Descriptor %d: %dkB, %d blocks, %d sector size\n", i, blocks * length / 1024, blocks, length); + } + + /* Clik! disk does not support get_flexible_disk_page */ + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) (void) idefloppy_get_flexible_disk_page (drive); + drive->part[0].nr_sects = floppy->blocks * floppy->bs_factor; return rc; } + /* * Our special ide-floppy ioctl's. * - * Currently there aren't any ioctl's. + * Supports eject command */ static int idefloppy_ioctl (ide_drive_t *drive, struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { idefloppy_pc_t pc; + idefloppy_floppy_t *floppy = drive->driver_data; if (cmd == CDROMEJECT) { if (drive->usage > 1) return -EBUSY; + /* The IOMEGA Clik! Drive doesn't support this command - no room for an eject mechanism */ + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { idefloppy_create_prevent_cmd (&pc, 0); (void) idefloppy_queue_pc_tail (drive, &pc); + } idefloppy_create_start_stop_cmd (&pc, 2); (void) idefloppy_queue_pc_tail (drive, &pc); return 0;
@@ -1320,20 +1338,24 @@ idefloppy_floppy_t *floppy = drive->driver_data; idefloppy_pc_t pc; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "Reached idefloppy_open\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "Reached idefloppy_open\n"); MOD_INC_USE_COUNT; if (drive->usage == 1) { + IDEFLOPPY_DEBUG( "Testing if unit is ready...\n"); idefloppy_create_test_unit_ready_cmd(&pc); if (idefloppy_queue_pc_tail(drive, &pc)) { + IDEFLOPPY_DEBUG( "Not ready, issuing start command\n"); idefloppy_create_start_stop_cmd (&pc, 1); (void) idefloppy_queue_pc_tail (drive, &pc); + } else + { + IDEFLOPPY_DEBUG( "Yes unit is ready\n"); } if (idefloppy_get_capacity (drive)) { drive->usage--; MOD_DEC_USE_COUNT; + IDEFLOPPY_DEBUG( "I/O Error Getting Capacity\n"); return -EIO; } if (floppy->wp && (filp->f_mode & 2)) {
@@ -1342,8 +1364,11 @@ return -EROFS; } set_bit (IDEFLOPPY_MEDIA_CHANGED, &floppy->flags); + /* IOMEGA Clik! drives do not support lock/unlock commands - no room for mechanism */ + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { idefloppy_create_prevent_cmd (&pc, 1); (void) idefloppy_queue_pc_tail (drive, &pc); + } check_disk_change(inode->i_rdev); } return 0;
@@ -1352,16 +1377,18 @@ static void idefloppy_release (struct inode *inode, struct file *filp, ide_drive_t *drive) { idefloppy_pc_t pc; + idefloppy_floppy_t *floppy = drive->driver_data; -#if IDEFLOPPY_DEBUG_LOG - printk (KERN_INFO "Reached idefloppy_release\n"); -#endif /* IDEFLOPPY_DEBUG_LOG */ + IDEFLOPPY_DEBUG( "Reached idefloppy_release\n"); if (!drive->usage) { invalidate_buffers (inode->i_rdev); + /* IOMEGA Clik! drives do not support lock/unlock commands */ + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) { idefloppy_create_prevent_cmd (&pc, 0); (void) idefloppy_queue_pc_tail (drive, &pc); } + } MOD_DEC_USE_COUNT; }
@@ -1559,6 +1586,17 @@ for (i = 0; i < 1 << PARTN_BITS; i++) max_sectors[major][minor + i] = 64; } + /* + * Guess what? The IOMEGA Clik! drive also needs the + * above fix. It makes nasty clicking noises without + * it, so please don't remove this. + */ + if (strcmp(drive->id->model, "IOMEGA Clik! 40 CZ ATAPI") == 0) + { + for (i = 0; i < 1 << PARTN_BITS; i++) + max_sectors[major][minor + i] = 64; + set_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags); + } (void) idefloppy_get_capacity (drive); idefloppy_add_settings(drive);
@@ -1597,6 +1635,7 @@ #endif /* CONFIG_PROC_FS */ + /* * IDE subdriver functions, registered with ide.c */
@@ -1629,6 +1668,7 @@ NULL }; + /* * idefloppy_init will register the driver for each floppy. */
@@ -1665,12 +1705,16 @@ return 0; } + #ifdef MODULE +/* Initialisation code for loading the driver as a modules */ int init_module (void) { return idefloppy_init (); } + +/* Cleanup code for removing the driver module */ void cleanup_module (void) { ide_drive_t *drive;
Quoted 4 lines
Linus, please include if you like.
This is the original patch from the MAINTAINER
but he seems defunct since three weeks.
Argh so we now have two forked versions of ide-floppy to resolve.
Linus - can this one wait until the main merges are done ?
I'll be happy to sort this out, if it will actually go into the kernel.
So far, every time I've posted something to linux-kernel, Alan, or
Linus it has disappeared into a black hole. :-)
Quoted 11 lines · Alan Cox
Quoted 5 lines
Linus, please include if you like.
This is the original patch from the MAINTAINER
but he seems defunct since three weeks.Argh so we now have two forked versions of ide-floppy to resolve.
Linus - can this one wait until the main merges are done ?
Signature · 5 lines
Paul Email: [email protected] Web: http://paulbristow.net ICQ: 11965223
Hi Gunter,
drivers/ide/ide-floppy.c Sat Jul 14 12:07:40 2001 line 68
Quoted 8 lines · In article <[email protected]> you wrote:
drivers/ide/ide-floppy.c Sat Jul 14 12:07:40 2001 renamed from drivers/ide/ide-floppy.c Fri Feb 9 20:30:23 2001 +1
-1@@ -45,7 +63,7 @@ #include <linux/major.h> #include <linux/errno.h> #include <linux/genhd.h> -#include <linux/slab.h> +#include <linux/malloc.h> #include <linux/cdrom.h> #include <linux/ide.h>
Why doe people reverse Jeff's s/malloc.h/slab.h/ changes all the time. Malloc.h does nothing but including slab.h and should just die.
Christoph
Signature · 1 line
Of course it doesn't work. We've performed a software upgrade.
On Sat, Jul 14, 2001 at 04:14:45PM +0200, Christoph Hellwig wrote:
Why doe people reverse Jeff's s/malloc.h/slab.h/ changes all the time. Malloc.h does nothing but including slab.h and should just die.
Quite.
Linus, please consider applying the following patch.
--cw
Signature · 993 lines
diff -Nur linux-2.4.7-pre6/arch/arm/kernel/irq-arch.c linux-2.4.7-pre6+mallocRIP/arch/arm/kernel/irq-arch.c --- linux-2.4.7-pre6/arch/arm/kernel/irq-arch.c Mon Apr 30 14:18:35 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/kernel/irq-arch.c Sun Jul 15 03:12:57 2001 @@ -17,7 +17,7 @@ #include <linux/sched.h> #include <linux/ioport.h> #include <linux/interrupt.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/random.h> #include <linux/smp.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/arch/arm/mach-integrator/dma.c linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/dma.c --- linux-2.4.7-pre6/arch/arm/mach-integrator/dma.c Mon Apr 2 18:15:08 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/dma.c Sun Jul 15 03:12:57 2001 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mman.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/arch/arm/mach-integrator/pci_v3.c linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/pci_v3.c --- linux-2.4.7-pre6/arch/arm/mach-integrator/pci_v3.c Mon Apr 2 18:15:08 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/pci_v3.c Sun Jul 15 03:12:57 2001 @@ -24,7 +24,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/spinlock.h> diff -Nur linux-2.4.7-pre6/arch/arm/mach-sa1100/dma-sa1100.c linux-2.4.7-pre6+mallocRIP/arch/arm/mach-sa1100/dma-sa1100.c --- linux-2.4.7-pre6/arch/arm/mach-sa1100/dma-sa1100.c Mon Apr 30 14:18:35 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/mach-sa1100/dma-sa1100.c Sun Jul 15 03:12:57 2001 @@ -16,7 +16,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/spinlock.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/system.h> diff -Nur linux-2.4.7-pre6/arch/cris/drivers/parport.c linux-2.4.7-pre6+mallocRIP/arch/cris/drivers/parport.c --- linux-2.4.7-pre6/arch/cris/drivers/parport.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/cris/drivers/parport.c Sun Jul 15 03:12:57 2001 @@ -23,7 +23,7 @@ #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <asm/setup.h> diff -Nur linux-2.4.7-pre6/arch/mips/ite-boards/generic/irq.c linux-2.4.7-pre6+mallocRIP/arch/mips/ite-boards/generic/irq.c --- linux-2.4.7-pre6/arch/mips/ite-boards/generic/irq.c Mon Apr 30 14:18:38 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/mips/ite-boards/generic/irq.c Sun Jul 15 03:12:57 2001 @@ -44,7 +44,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/random.h> #include <linux/serial_reg.h> diff -Nur linux-2.4.7-pre6/arch/ppc/kernel/gemini_pci.c linux-2.4.7-pre6+mallocRIP/arch/ppc/kernel/gemini_pci.c --- linux-2.4.7-pre6/arch/ppc/kernel/gemini_pci.c Sun Jun 17 15:54:03 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/ppc/kernel/gemini_pci.c Sun Jul 15 03:12:57 2001 @@ -4,7 +4,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/pci.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/machdep.h> #include <asm/gemini.h> diff -Nur linux-2.4.7-pre6/arch/s390/kernel/debug.c linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/debug.c --- linux-2.4.7-pre6/arch/s390/kernel/debug.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/debug.c Sun Jul 15 03:12:57 2001 @@ -14,7 +14,7 @@ #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ctype.h> #include <linux/version.h> #include <asm/uaccess.h> diff -Nur linux-2.4.7-pre6/arch/s390/kernel/irq.c linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/irq.c --- linux-2.4.7-pre6/arch/s390/kernel/irq.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/irq.c Sun Jul 15 03:12:57 2001 @@ -21,7 +21,7 @@ #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/random.h> #include <linux/smp.h> diff -Nur linux-2.4.7-pre6/arch/s390/kernel/s390_ext.c linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/s390_ext.c --- linux-2.4.7-pre6/arch/s390/kernel/s390_ext.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/s390_ext.c Sun Jul 15 03:12:57 2001 @@ -9,7 +9,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/lowcore.h> #include <asm/s390_ext.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/debug.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/debug.c --- linux-2.4.7-pre6/arch/s390x/kernel/debug.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/debug.c Sun Jul 15 03:12:57 2001 @@ -14,7 +14,7 @@ #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ctype.h> #include <linux/version.h> #include <asm/uaccess.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/irq.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/irq.c --- linux-2.4.7-pre6/arch/s390x/kernel/irq.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/irq.c Sun Jul 15 03:12:57 2001 @@ -21,7 +21,7 @@ #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/random.h> #include <linux/smp.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/linux32.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/linux32.c --- linux-2.4.7-pre6/arch/s390x/kernel/linux32.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/linux32.c Sun Jul 15 03:12:57 2001 @@ -32,7 +32,7 @@ #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/uio.h> #include <linux/nfs_fs.h> #include <linux/smb_fs.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/s390_ext.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/s390_ext.c --- linux-2.4.7-pre6/arch/s390x/kernel/s390_ext.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/s390_ext.c Sun Jul 15 03:12:57 2001 @@ -9,7 +9,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/lowcore.h> #include <asm/s390_ext.h> diff -Nur linux-2.4.7-pre6/drivers/acorn/char/mouse_ps2.c linux-2.4.7-pre6+mallocRIP/drivers/acorn/char/mouse_ps2.c --- linux-2.4.7-pre6/drivers/acorn/char/mouse_ps2.c Wed Jul 4 22:58:47 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/acorn/char/mouse_ps2.c Sun Jul 15 03:12:58 2001 @@ -8,7 +8,7 @@ #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ptrace.h> #include <linux/signal.h> #include <linux/timer.h> diff -Nur linux-2.4.7-pre6/drivers/block/paride/bpck6.c linux-2.4.7-pre6+mallocRIP/drivers/block/paride/bpck6.c --- linux-2.4.7-pre6/drivers/block/paride/bpck6.c Mon Apr 30 14:18:41 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/block/paride/bpck6.c Sun Jul 15 03:12:58 2001 @@ -28,7 +28,7 @@ #define EXPORT_SYMTAB #include <linux/module.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/types.h> #include <asm/io.h> diff -Nur linux-2.4.7-pre6/drivers/bluetooth/hci_uart.c linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_uart.c --- linux-2.4.7-pre6/drivers/bluetooth/hci_uart.c Wed Jul 4 22:58:47 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_uart.c Sun Jul 15 03:12:58 2001 @@ -42,7 +42,7 @@ #include <linux/ptrace.h> #include <linux/poll.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/tty.h> #include <linux/errno.h> #include <linux/string.h> diff -Nur linux-2.4.7-pre6/drivers/bluetooth/hci_usb.c linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_usb.c --- linux-2.4.7-pre6/drivers/bluetooth/hci_usb.c Wed Jul 4 22:58:47 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_usb.c Sun Jul 15 03:12:58 2001 @@ -45,7 +45,7 @@ #include <linux/ptrace.h> #include <linux/poll.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/tty.h> #include <linux/errno.h> #include <linux/string.h> diff -Nur linux-2.4.7-pre6/drivers/char/ec3104_keyb.c linux-2.4.7-pre6+mallocRIP/drivers/char/ec3104_keyb.c --- linux-2.4.7-pre6/drivers/char/ec3104_keyb.c Mon Apr 30 14:18:41 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/char/ec3104_keyb.c Sun Jul 15 03:12:57 2001 @@ -40,7 +40,7 @@ #include <linux/random.h> #include <linux/poll.h> #include <linux/miscdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/kbd_kern.h> #include <linux/smp_lock.h> diff -Nur linux-2.4.7-pre6/drivers/char/machzwd.c linux-2.4.7-pre6+mallocRIP/drivers/char/machzwd.c --- linux-2.4.7-pre6/drivers/char/machzwd.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/char/machzwd.c Sun Jul 15 03:12:57 2001 @@ -36,7 +36,7 @@ #include <linux/sched.h> #include <linux/miscdevice.h> #include <linux/watchdog.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/fcntl.h> #include <linux/smp_lock.h> diff -Nur linux-2.4.7-pre6/drivers/char/qtronix.c linux-2.4.7-pre6+mallocRIP/drivers/char/qtronix.c --- linux-2.4.7-pre6/drivers/char/qtronix.c Mon Apr 30 14:18:41 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/char/qtronix.c Sun Jul 15 03:12:57 2001 @@ -71,7 +71,7 @@ #include <linux/random.h> #include <linux/poll.h> #include <linux/miscdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/kbd_kern.h> #include <linux/smp_lock.h> #include <asm/io.h> diff -Nur linux-2.4.7-pre6/drivers/isdn/hisax/sedlbauer_cs.c linux-2.4.7-pre6+mallocRIP/drivers/isdn/hisax/sedlbauer_cs.c --- linux-2.4.7-pre6/drivers/isdn/hisax/sedlbauer_cs.c Mon Apr 2 18:15:25 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/isdn/hisax/sedlbauer_cs.c Sun Jul 15 03:12:57 2001 @@ -42,7 +42,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/adv7175.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/adv7175.c --- linux-2.4.7-pre6/drivers/media/video/adv7175.c Sun Jun 17 15:54:55 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/adv7175.c Sun Jul 15 03:12:58 2001 @@ -30,7 +30,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/bt819.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt819.c --- linux-2.4.7-pre6/drivers/media/video/bt819.c Sun Jun 17 15:54:55 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt819.c Sun Jul 15 03:12:58 2001 @@ -31,7 +31,7 @@ #include <linux/errno.h> #include <linux/fs.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/bt856.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt856.c --- linux-2.4.7-pre6/drivers/media/video/bt856.c Sun Jun 17 15:54:55 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt856.c Sun Jul 15 03:12:58 2001 @@ -32,7 +32,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/saa7111.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7111.c --- linux-2.4.7-pre6/drivers/media/video/saa7111.c Sun Jun 17 15:54:57 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7111.c Sun Jul 15 03:12:58 2001 @@ -28,7 +28,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/sched.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/saa7185.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7185.c --- linux-2.4.7-pre6/drivers/media/video/saa7185.c Sun Jun 17 15:54:57 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7185.c Sun Jul 15 03:12:58 2001 @@ -28,7 +28,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/zr36067.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/zr36067.c --- linux-2.4.7-pre6/drivers/media/video/zr36067.c Thu Jul 12 03:13:02 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/zr36067.c Sun Jul 15 03:12:58 2001 @@ -50,7 +50,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/net/au1000_eth.c linux-2.4.7-pre6+mallocRIP/drivers/net/au1000_eth.c --- linux-2.4.7-pre6/drivers/net/au1000_eth.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/au1000_eth.c Sun Jul 15 03:12:57 2001 @@ -39,7 +39,7 @@ #include <linux/errno.h> #include <linux/in.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/dmfe.c linux-2.4.7-pre6+mallocRIP/drivers/net/dmfe.c --- linux-2.4.7-pre6/drivers/net/dmfe.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/dmfe.c Sun Jul 15 03:12:57 2001 @@ -61,7 +61,7 @@ #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/gt96100eth.c linux-2.4.7-pre6+mallocRIP/drivers/net/gt96100eth.c --- linux-2.4.7-pre6/drivers/net/gt96100eth.c Mon Apr 30 14:18:43 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/gt96100eth.c Sun Jul 15 03:12:57 2001 @@ -38,7 +38,7 @@ #include <linux/errno.h> #include <linux/in.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/irda/ali-ircc.c linux-2.4.7-pre6+mallocRIP/drivers/net/irda/ali-ircc.c --- linux-2.4.7-pre6/drivers/net/irda/ali-ircc.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/irda/ali-ircc.c Sun Jul 15 03:12:57 2001 @@ -27,7 +27,7 @@ #include <linux/netdevice.h> #include <linux/ioport.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/rtnetlink.h> #include <linux/serial_reg.h> diff -Nur linux-2.4.7-pre6/drivers/net/irda/irda-usb.c linux-2.4.7-pre6+mallocRIP/drivers/net/irda/irda-usb.c --- linux-2.4.7-pre6/drivers/net/irda/irda-usb.c Sun Jun 17 15:55:04 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/irda/irda-usb.c Sun Jul 15 03:12:57 2001 @@ -33,7 +33,7 @@ #include <linux/init.h> #include <linux/skbuff.h> #include <linux/netdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/rtnetlink.h> #include <linux/usb.h> diff -Nur linux-2.4.7-pre6/drivers/net/lp486e.c linux-2.4.7-pre6+mallocRIP/drivers/net/lp486e.c --- linux-2.4.7-pre6/drivers/net/lp486e.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/lp486e.c Sun Jul 15 03:12:57 2001 @@ -65,7 +65,7 @@ #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> diff -Nur linux-2.4.7-pre6/drivers/net/ncr885e.c linux-2.4.7-pre6+mallocRIP/drivers/net/ncr885e.c --- linux-2.4.7-pre6/drivers/net/ncr885e.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/ncr885e.c Sun Jul 15 03:12:57 2001 @@ -19,7 +19,7 @@ #include <linux/sched.h> #include <linux/timer.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/netdevice.h> #include <linux/pci.h> #include <linux/delay.h> diff -Nur linux-2.4.7-pre6/drivers/net/pcmcia/ibmtr_cs.c linux-2.4.7-pre6+mallocRIP/drivers/net/pcmcia/ibmtr_cs.c --- linux-2.4.7-pre6/drivers/net/pcmcia/ibmtr_cs.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/pcmcia/ibmtr_cs.c Sun Jul 15 03:12:57 2001 @@ -49,7 +49,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/module.h> diff -Nur linux-2.4.7-pre6/drivers/net/sungem.c linux-2.4.7-pre6+mallocRIP/drivers/net/sungem.c --- linux-2.4.7-pre6/drivers/net/sungem.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/sungem.c Sun Jul 15 03:12:57 2001 @@ -14,7 +14,7 @@ #include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/in.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/delay.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/tun.c linux-2.4.7-pre6+mallocRIP/drivers/net/tun.c --- linux-2.4.7-pre6/drivers/net/tun.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/tun.c Sun Jul 15 03:12:57 2001 @@ -29,7 +29,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_chdlc.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_chdlc.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_chdlc.c Mon Apr 30 14:18:45 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_chdlc.c Sun Jul 15 03:12:57 2001 @@ -53,7 +53,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_fr.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_fr.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_fr.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_fr.c Sun Jul 15 03:12:57 2001 @@ -143,7 +143,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_ft1.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ft1.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_ft1.c Mon Apr 30 14:18:45 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ft1.c Sun Jul 15 03:12:57 2001 @@ -25,7 +25,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_ppp.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ppp.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_ppp.c Sun Jun 17 15:55:11 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ppp.c Sun Jul 15 03:12:57 2001 @@ -95,7 +95,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_x25.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_x25.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_x25.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_x25.c Sun Jul 15 03:12:57 2001 @@ -87,7 +87,7 @@ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ #include <linux/ctype.h> -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <asm/byteorder.h> /* htons(), etc. */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdlamain.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdlamain.c --- linux-2.4.7-pre6/drivers/net/wan/sdlamain.c Mon Apr 30 14:18:45 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdlamain.c Sun Jul 15 03:12:57 2001 @@ -51,7 +51,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/kernel.h> /* printk(), and other useful stuff */ #include <linux/module.h> /* support for loadable modules */ #include <linux/ioport.h> /* request_region(), release_region() */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/wanpipe_multppp.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/wanpipe_multppp.c --- linux-2.4.7-pre6/drivers/net/wan/wanpipe_multppp.c Sun Jun 17 15:55:12 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/wanpipe_multppp.c Sun Jul 15 03:12:57 2001 @@ -22,7 +22,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wireless/airo.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo.c --- linux-2.4.7-pre6/drivers/net/wireless/airo.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo.c Sun Jul 15 03:12:57 2001 @@ -28,7 +28,7 @@ #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/airo_cs.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo_cs.c --- linux-2.4.7-pre6/drivers/net/wireless/airo_cs.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo_cs.c Sun Jul 15 03:12:57 2001 @@ -31,7 +31,7 @@ #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/netdevice.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/airport.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airport.c --- linux-2.4.7-pre6/drivers/net/wireless/airport.c Sun Jun 17 15:55:12 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airport.c Sun Jul 15 03:12:57 2001 @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/orinoco.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco.c --- linux-2.4.7-pre6/drivers/net/wireless/orinoco.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco.c Sun Jul 15 03:12:57 2001 @@ -177,7 +177,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/orinoco_cs.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco_cs.c --- linux-2.4.7-pre6/drivers/net/wireless/orinoco_cs.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco_cs.c Sun Jul 15 03:12:57 2001 @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd.c --- linux-2.4.7-pre6/drivers/s390/block/dasd.c Sun Jun 17 15:55:17 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd.c Sun Jul 15 03:12:58 2001 @@ -31,7 +31,7 @@ #include <linux/kernel.h> #include <linux/tqueue.h> #include <linux/timer.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/genhd.h> #include <linux/hdreg.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd_diag.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_diag.c --- linux-2.4.7-pre6/drivers/s390/block/dasd_diag.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_diag.c Sun Jul 15 03:12:57 2001 @@ -18,7 +18,7 @@ #include <linux/kernel.h> #include <asm/debug.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/blk.h> #include <asm/ccwcache.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd_eckd.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_eckd.c --- linux-2.4.7-pre6/drivers/s390/block/dasd_eckd.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_eckd.c Sun Jul 15 03:12:57 2001 @@ -24,7 +24,7 @@ #include <linux/kernel.h> #include <asm/debug.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/blk.h> #include <asm/ccwcache.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd_fba.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_fba.c --- linux-2.4.7-pre6/drivers/s390/block/dasd_fba.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_fba.c Sun Jul 15 03:12:58 2001 @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <asm/debug.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/blk.h> #include <asm/ccwcache.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/xpram.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/xpram.c --- linux-2.4.7-pre6/drivers/s390/block/xpram.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/xpram.c Sun Jul 15 03:12:57 2001 @@ -74,7 +74,7 @@ #endif /* V24 */ #include <linux/sched.h> #include <linux/kernel.h> /* printk() */ -#include <linux/malloc.h> /* kmalloc() */ +#include <linux/slab.h> /* kmalloc() */ #if (XPRAM_VERSION == 24) # include <linux/devfs_fs_kernel.h> #endif /* V24 */ diff -Nur linux-2.4.7-pre6/drivers/s390/ccwcache.c linux-2.4.7-pre6+mallocRIP/drivers/s390/ccwcache.c --- linux-2.4.7-pre6/drivers/s390/ccwcache.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/ccwcache.c Sun Jul 15 03:12:58 2001 @@ -10,7 +10,7 @@ */ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,3,98)) diff -Nur linux-2.4.7-pre6/drivers/s390/idals.c linux-2.4.7-pre6+mallocRIP/drivers/s390/idals.c --- linux-2.4.7-pre6/drivers/s390/idals.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/idals.c Sun Jul 15 03:12:58 2001 @@ -11,7 +11,7 @@ #include <linux/module.h> #include <linux/config.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/irq.h> #include <asm/idals.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/ctcmain.c linux-2.4.7-pre6+mallocRIP/drivers/s390/net/ctcmain.c --- linux-2.4.7-pre6/drivers/s390/net/ctcmain.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/ctcmain.c Sun Jul 15 03:12:57 2001 @@ -98,7 +98,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <linux/types.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/iucv.c linux-2.4.7-pre6+mallocRIP/drivers/s390/net/iucv.c --- linux-2.4.7-pre6/drivers/s390/net/iucv.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/iucv.c Sun Jul 15 03:12:57 2001 @@ -13,7 +13,7 @@ #include <linux/version.h> #include <linux/spinlock.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/tqueue.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/netiucv.c linux-2.4.7-pre6+mallocRIP/drivers/s390/net/netiucv.c --- linux-2.4.7-pre6/drivers/s390/net/netiucv.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/netiucv.c Sun Jul 15 03:12:57 2001 @@ -71,7 +71,7 @@ #endif #include <linux/sched.h> /* task queues */ -#include <linux/malloc.h> /* kmalloc() */ +#include <linux/slab.h> /* kmalloc() */ #include <linux/errno.h> /* error codes */ #include <linux/types.h> /* size_t */ #include <linux/interrupt.h> /* mark_bh */ diff -Nur linux-2.4.7-pre6/drivers/s390/s390io.c linux-2.4.7-pre6+mallocRIP/drivers/s390/s390io.c --- linux-2.4.7-pre6/drivers/s390/s390io.c Thu Jul 12 03:13:08 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/s390io.c Sun Jul 15 03:12:58 2001 @@ -24,7 +24,7 @@ #include <linux/signal.h> #include <linux/sched.h> #include <linux/interrupt.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/smp.h> #include <linux/threads.h> diff -Nur linux-2.4.7-pre6/drivers/s390/s390mach.c linux-2.4.7-pre6+mallocRIP/drivers/s390/s390mach.c --- linux-2.4.7-pre6/drivers/s390/s390mach.c Mon Apr 2 18:15:29 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/s390mach.c Sun Jul 15 03:12:58 2001 @@ -11,7 +11,7 @@ #include <linux/config.h> #include <linux/spinlock.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #ifdef CONFIG_SMP #include <linux/smp.h> #endif diff -Nur linux-2.4.7-pre6/drivers/scsi/advansys.c linux-2.4.7-pre6+mallocRIP/drivers/scsi/advansys.c --- linux-2.4.7-pre6/drivers/scsi/advansys.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/scsi/advansys.c Sun Jul 15 03:12:58 2001 @@ -789,7 +789,7 @@ #include <linux/types.h> #include <linux/ioport.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/proc_fs.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/scsi/megaraid.c linux-2.4.7-pre6+mallocRIP/drivers/scsi/megaraid.c --- linux-2.4.7-pre6/drivers/scsi/megaraid.c Thu Jul 12 03:13:08 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/scsi/megaraid.c Sun Jul 15 03:12:58 2001 @@ -391,7 +391,7 @@ #include <linux/sched.h> #include <linux/stat.h> -#include <linux/malloc.h> /* for kmalloc() */ +#include <linux/slab.h> /* for kmalloc() */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) /* 0x20100 */ #include <linux/bios32.h> #else diff -Nur linux-2.4.7-pre6/drivers/sound/cmpci.c linux-2.4.7-pre6+mallocRIP/drivers/sound/cmpci.c --- linux-2.4.7-pre6/drivers/sound/cmpci.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/sound/cmpci.c Sun Jul 15 03:12:58 2001 @@ -93,7 +93,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/wrapper.h> diff -Nur linux-2.4.7-pre6/drivers/sound/cs4281/cs4281m.c linux-2.4.7-pre6+mallocRIP/drivers/sound/cs4281/cs4281m.c --- linux-2.4.7-pre6/drivers/sound/cs4281/cs4281m.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/sound/cs4281/cs4281m.c Sun Jul 15 03:12:58 2001 @@ -65,7 +65,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/bitops.h> diff -Nur linux-2.4.7-pre6/drivers/sound/maestro3.c linux-2.4.7-pre6+mallocRIP/drivers/sound/maestro3.c --- linux-2.4.7-pre6/drivers/sound/maestro3.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/sound/maestro3.c Sun Jul 15 03:12:58 2001 @@ -130,7 +130,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/vmalloc.h> diff -Nur linux-2.4.7-pre6/drivers/usb/catc.c linux-2.4.7-pre6+mallocRIP/drivers/usb/catc.c --- linux-2.4.7-pre6/drivers/usb/catc.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/usb/catc.c Sun Jul 15 03:12:57 2001 @@ -33,7 +33,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/string.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> diff -Nur linux-2.4.7-pre6/drivers/usb/serial/io_edgeport.c linux-2.4.7-pre6+mallocRIP/drivers/usb/serial/io_edgeport.c --- linux-2.4.7-pre6/drivers/usb/serial/io_edgeport.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/usb/serial/io_edgeport.c Sun Jul 15 03:12:57 2001 @@ -233,7 +233,7 @@ #include <linux/errno.h> #include <linux/poll.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/fcntl.h> #include <linux/tty.h> #include <linux/tty_driver.h> diff -Nur linux-2.4.7-pre6/drivers/video/epson1355fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/epson1355fb.c --- linux-2.4.7-pre6/drivers/video/epson1355fb.c Sun Jun 17 15:55:44 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/epson1355fb.c Sun Jul 15 03:12:58 2001 @@ -25,7 +25,7 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/sched.h> diff -Nur linux-2.4.7-pre6/drivers/video/maxinefb.c linux-2.4.7-pre6+mallocRIP/drivers/video/maxinefb.c --- linux-2.4.7-pre6/drivers/video/maxinefb.c Thu Jul 12 03:13:09 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/maxinefb.c Sun Jul 15 03:12:58 2001 @@ -31,7 +31,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff -Nur linux-2.4.7-pre6/drivers/video/pmag-ba-fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/pmag-ba-fb.c --- linux-2.4.7-pre6/drivers/video/pmag-ba-fb.c Mon Apr 30 14:18:49 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/pmag-ba-fb.c Sun Jul 15 03:12:58 2001 @@ -27,7 +27,7 @@ #include <linux/timer.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff -Nur linux-2.4.7-pre6/drivers/video/pmagb-b-fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/pmagb-b-fb.c --- linux-2.4.7-pre6/drivers/video/pmagb-b-fb.c Mon Apr 30 14:18:49 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/pmagb-b-fb.c Sun Jul 15 03:12:58 2001 @@ -30,7 +30,7 @@ #include <linux/timer.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff -Nur linux-2.4.7-pre6/drivers/video/pvr2fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/pvr2fb.c --- linux-2.4.7-pre6/drivers/video/pvr2fb.c Thu Jul 12 03:13:09 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/pvr2fb.c Sun Jul 15 03:12:58 2001 @@ -51,7 +51,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/config.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/fs/partitions/ibm.c linux-2.4.7-pre6+mallocRIP/fs/partitions/ibm.c --- linux-2.4.7-pre6/fs/partitions/ibm.c Sun Jun 17 15:55:52 2001 +++ linux-2.4.7-pre6+mallocRIP/fs/partitions/ibm.c Sun Jul 15 03:12:57 2001 @@ -17,7 +17,7 @@ #include <linux/major.h> #include <linux/string.h> #include <linux/blk.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> #include <linux/ioctl.h> #include <linux/version.h> diff -Nur linux-2.4.7-pre6/include/linux/malloc.h linux-2.4.7-pre6+mallocRIP/include/linux/malloc.h --- linux-2.4.7-pre6/include/linux/malloc.h Thu Jul 12 03:53:53 2001 +++ linux-2.4.7-pre6+mallocRIP/include/linux/malloc.h Thu Jan 1 12:00:00 1970 @@ -1,5 +0,0 @@ -#ifndef _LINUX_MALLOC_H -#define _LINUX_MALLOC_H - -#include <linux/slab.h> -#endif /* _LINUX_MALLOC_H */ diff -Nur linux-2.4.7-pre6/net/bluetooth/af_bluetooth.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/af_bluetooth.c --- linux-2.4.7-pre6/net/bluetooth/af_bluetooth.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/af_bluetooth.c Sun Jul 15 03:12:57 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/skbuff.h> #include <linux/init.h> #include <linux/proc_fs.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/hci_core.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_core.c --- linux-2.4.7-pre6/net/bluetooth/hci_core.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_core.c Sun Jul 15 03:12:57 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/hci_sock.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_sock.c --- linux-2.4.7-pre6/net/bluetooth/hci_sock.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_sock.c Sun Jul 15 03:12:57 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/l2cap_core.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_core.c --- linux-2.4.7-pre6/net/bluetooth/l2cap_core.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_core.c Sun Jul 15 03:12:57 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/l2cap_proc.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_proc.c --- linux-2.4.7-pre6/net/bluetooth/l2cap_proc.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_proc.c Sun Jul 15 03:12:57 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/wanrouter/wanmain.c linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanmain.c --- linux-2.4.7-pre6/net/wanrouter/wanmain.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanmain.c Sun Jul 15 03:12:57 2001 @@ -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 */ diff -Nur linux-2.4.7-pre6/net/wanrouter/wanproc.c linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanproc.c --- linux-2.4.7-pre6/net/wanrouter/wanproc.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanproc.c Sun Jul 15 03:12:57 2001 @@ -25,7 +25,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/kernel.h> -#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 */ #include <asm/byteorder.h> /* htons(), etc. */
include/linux/malloc.h line 5
Quoted 10 lines · [email protected] said:
Linus, please consider applying the following patch.
include/linux/malloc.h +0
-5@@ -1,5 +0,0 @@ -#ifndef _LINUX_MALLOC_H -#define _LINUX_MALLOC_H - -#include <linux/slab.h> -#endif /* _LINUX_MALLOC_H */
Doing that in the middle of a supposedly stable series, even if it wasn't a fundamentally stupid thing to do in the first place, isn't really very sensible.
--
dwmw2
On Sat, Jul 14, 2001 at 05:47:05PM +0100, David Woodhouse wrote:
Doing that in the middle of a supposedly stable series, even if it wasn't a fundamentally stupid thing to do in the first place, isn't really very sensible.
If it changes vmlinux by a single byte, I might agree.... all it does is close off and older depricated API.
Anyhow, say we leave linux/malloc.h for external module authors, but make the other changes?
I'll re-run the script I wrote duing 2.5.x when we do remove malloc.h to catch anything left over.
Does that sound reasonable?
--cw
Quoted 2 lines
Anyhow, say we leave
linux/malloc.hfor external module authors, but make the other changes?
At most for 2.4 but a #warning in it
Quoted 2 lines
I'll re-run the script I wrote duing 2.5.x when we do remove
malloc.hto catch anything left over.
Yep
Quoted 2 lines · Alan Cox
Anyhow, say we leave
linux/malloc.hfor external module authors, but make the other changes?
At most for 2.4 but a #warning in it
> I'll re-run the script I wrote duing 2.5.x when we do remove malloc.h > to catch anything left over.
Yep
OK, how is this for -ac then?
--cw
Signature · 1,042 lines
diff -Nur linux-2.4.7-pre6/arch/arm/kernel/irq-arch.c linux-2.4.7-pre6+mallocRIP/arch/arm/kernel/irq-arch.c --- linux-2.4.7-pre6/arch/arm/kernel/irq-arch.c Mon Apr 30 14:18:35 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/kernel/irq-arch.c Sun Jul 15 05:06:10 2001 @@ -17,7 +17,7 @@ #include <linux/sched.h> #include <linux/ioport.h> #include <linux/interrupt.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/random.h> #include <linux/smp.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/arch/arm/mach-integrator/dma.c linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/dma.c --- linux-2.4.7-pre6/arch/arm/mach-integrator/dma.c Mon Apr 2 18:15:08 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/dma.c Sun Jul 15 05:06:10 2001 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mman.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/arch/arm/mach-integrator/pci_v3.c linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/pci_v3.c --- linux-2.4.7-pre6/arch/arm/mach-integrator/pci_v3.c Mon Apr 2 18:15:08 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/mach-integrator/pci_v3.c Sun Jul 15 05:06:10 2001 @@ -24,7 +24,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/spinlock.h> diff -Nur linux-2.4.7-pre6/arch/arm/mach-sa1100/dma-sa1100.c linux-2.4.7-pre6+mallocRIP/arch/arm/mach-sa1100/dma-sa1100.c --- linux-2.4.7-pre6/arch/arm/mach-sa1100/dma-sa1100.c Mon Apr 30 14:18:35 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/arm/mach-sa1100/dma-sa1100.c Sun Jul 15 05:06:10 2001 @@ -16,7 +16,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/spinlock.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/system.h> diff -Nur linux-2.4.7-pre6/arch/cris/drivers/parport.c linux-2.4.7-pre6+mallocRIP/arch/cris/drivers/parport.c --- linux-2.4.7-pre6/arch/cris/drivers/parport.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/cris/drivers/parport.c Sun Jul 15 05:06:10 2001 @@ -23,7 +23,7 @@ #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <asm/setup.h> diff -Nur linux-2.4.7-pre6/arch/mips/ite-boards/generic/irq.c linux-2.4.7-pre6+mallocRIP/arch/mips/ite-boards/generic/irq.c --- linux-2.4.7-pre6/arch/mips/ite-boards/generic/irq.c Mon Apr 30 14:18:38 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/mips/ite-boards/generic/irq.c Sun Jul 15 05:06:10 2001 @@ -44,7 +44,7 @@ #include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/random.h> #include <linux/serial_reg.h> diff -Nur linux-2.4.7-pre6/arch/ppc/kernel/gemini_pci.c linux-2.4.7-pre6+mallocRIP/arch/ppc/kernel/gemini_pci.c --- linux-2.4.7-pre6/arch/ppc/kernel/gemini_pci.c Sun Jun 17 15:54:03 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/ppc/kernel/gemini_pci.c Sun Jul 15 05:06:10 2001 @@ -4,7 +4,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/pci.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/machdep.h> #include <asm/gemini.h> diff -Nur linux-2.4.7-pre6/arch/s390/kernel/debug.c linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/debug.c --- linux-2.4.7-pre6/arch/s390/kernel/debug.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/debug.c Sun Jul 15 05:06:10 2001 @@ -14,7 +14,7 @@ #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ctype.h> #include <linux/version.h> #include <asm/uaccess.h> diff -Nur linux-2.4.7-pre6/arch/s390/kernel/irq.c linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/irq.c --- linux-2.4.7-pre6/arch/s390/kernel/irq.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/irq.c Sun Jul 15 05:06:10 2001 @@ -21,7 +21,7 @@ #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/random.h> #include <linux/smp.h> diff -Nur linux-2.4.7-pre6/arch/s390/kernel/s390_ext.c linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/s390_ext.c --- linux-2.4.7-pre6/arch/s390/kernel/s390_ext.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390/kernel/s390_ext.c Sun Jul 15 05:06:10 2001 @@ -9,7 +9,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/lowcore.h> #include <asm/s390_ext.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/debug.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/debug.c --- linux-2.4.7-pre6/arch/s390x/kernel/debug.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/debug.c Sun Jul 15 05:06:10 2001 @@ -14,7 +14,7 @@ #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ctype.h> #include <linux/version.h> #include <asm/uaccess.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/irq.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/irq.c --- linux-2.4.7-pre6/arch/s390x/kernel/irq.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/irq.c Sun Jul 15 05:06:10 2001 @@ -21,7 +21,7 @@ #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/random.h> #include <linux/smp.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/linux32.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/linux32.c --- linux-2.4.7-pre6/arch/s390x/kernel/linux32.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/linux32.c Sun Jul 15 05:06:10 2001 @@ -32,7 +32,7 @@ #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/uio.h> #include <linux/nfs_fs.h> #include <linux/smb_fs.h> diff -Nur linux-2.4.7-pre6/arch/s390x/kernel/s390_ext.c linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/s390_ext.c --- linux-2.4.7-pre6/arch/s390x/kernel/s390_ext.c Mon Apr 30 14:18:39 2001 +++ linux-2.4.7-pre6+mallocRIP/arch/s390x/kernel/s390_ext.c Sun Jul 15 05:06:10 2001 @@ -9,7 +9,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/lowcore.h> #include <asm/s390_ext.h> diff -Nur linux-2.4.7-pre6/drivers/acorn/char/mouse_ps2.c linux-2.4.7-pre6+mallocRIP/drivers/acorn/char/mouse_ps2.c --- linux-2.4.7-pre6/drivers/acorn/char/mouse_ps2.c Wed Jul 4 22:58:47 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/acorn/char/mouse_ps2.c Sun Jul 15 05:06:15 2001 @@ -8,7 +8,7 @@ #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ptrace.h> #include <linux/signal.h> #include <linux/timer.h> diff -Nur linux-2.4.7-pre6/drivers/block/paride/bpck6.c linux-2.4.7-pre6+mallocRIP/drivers/block/paride/bpck6.c --- linux-2.4.7-pre6/drivers/block/paride/bpck6.c Mon Apr 30 14:18:41 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/block/paride/bpck6.c Sun Jul 15 05:06:15 2001 @@ -28,7 +28,7 @@ #define EXPORT_SYMTAB #include <linux/module.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/types.h> #include <asm/io.h> diff -Nur linux-2.4.7-pre6/drivers/bluetooth/hci_uart.c linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_uart.c --- linux-2.4.7-pre6/drivers/bluetooth/hci_uart.c Wed Jul 4 22:58:47 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_uart.c Sun Jul 15 05:06:15 2001 @@ -42,7 +42,7 @@ #include <linux/ptrace.h> #include <linux/poll.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/tty.h> #include <linux/errno.h> #include <linux/string.h> diff -Nur linux-2.4.7-pre6/drivers/bluetooth/hci_usb.c linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_usb.c --- linux-2.4.7-pre6/drivers/bluetooth/hci_usb.c Wed Jul 4 22:58:47 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/bluetooth/hci_usb.c Sun Jul 15 05:06:15 2001 @@ -45,7 +45,7 @@ #include <linux/ptrace.h> #include <linux/poll.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/tty.h> #include <linux/errno.h> #include <linux/string.h> diff -Nur linux-2.4.7-pre6/drivers/char/ec3104_keyb.c linux-2.4.7-pre6+mallocRIP/drivers/char/ec3104_keyb.c --- linux-2.4.7-pre6/drivers/char/ec3104_keyb.c Mon Apr 30 14:18:41 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/char/ec3104_keyb.c Sun Jul 15 05:06:14 2001 @@ -40,7 +40,7 @@ #include <linux/random.h> #include <linux/poll.h> #include <linux/miscdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/kbd_kern.h> #include <linux/smp_lock.h> diff -Nur linux-2.4.7-pre6/drivers/char/machzwd.c linux-2.4.7-pre6+mallocRIP/drivers/char/machzwd.c --- linux-2.4.7-pre6/drivers/char/machzwd.c Thu Jul 12 03:13:01 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/char/machzwd.c Sun Jul 15 05:06:14 2001 @@ -36,7 +36,7 @@ #include <linux/sched.h> #include <linux/miscdevice.h> #include <linux/watchdog.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/fcntl.h> #include <linux/smp_lock.h> diff -Nur linux-2.4.7-pre6/drivers/char/qtronix.c linux-2.4.7-pre6+mallocRIP/drivers/char/qtronix.c --- linux-2.4.7-pre6/drivers/char/qtronix.c Mon Apr 30 14:18:41 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/char/qtronix.c Sun Jul 15 05:06:14 2001 @@ -71,7 +71,7 @@ #include <linux/random.h> #include <linux/poll.h> #include <linux/miscdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/kbd_kern.h> #include <linux/smp_lock.h> #include <asm/io.h> diff -Nur linux-2.4.7-pre6/drivers/isdn/hisax/sedlbauer_cs.c linux-2.4.7-pre6+mallocRIP/drivers/isdn/hisax/sedlbauer_cs.c --- linux-2.4.7-pre6/drivers/isdn/hisax/sedlbauer_cs.c Mon Apr 2 18:15:25 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/isdn/hisax/sedlbauer_cs.c Sun Jul 15 05:06:14 2001 @@ -42,7 +42,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/adv7175.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/adv7175.c --- linux-2.4.7-pre6/drivers/media/video/adv7175.c Sun Jun 17 15:54:55 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/adv7175.c Sun Jul 15 05:06:15 2001 @@ -30,7 +30,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/bt819.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt819.c --- linux-2.4.7-pre6/drivers/media/video/bt819.c Sun Jun 17 15:54:55 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt819.c Sun Jul 15 05:06:15 2001 @@ -31,7 +31,7 @@ #include <linux/errno.h> #include <linux/fs.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/bt856.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt856.c --- linux-2.4.7-pre6/drivers/media/video/bt856.c Sun Jun 17 15:54:55 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/bt856.c Sun Jul 15 05:06:15 2001 @@ -32,7 +32,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/saa7111.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7111.c --- linux-2.4.7-pre6/drivers/media/video/saa7111.c Sun Jun 17 15:54:57 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7111.c Sun Jul 15 05:06:15 2001 @@ -28,7 +28,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/sched.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/saa7185.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7185.c --- linux-2.4.7-pre6/drivers/media/video/saa7185.c Sun Jun 17 15:54:57 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/saa7185.c Sun Jul 15 05:06:15 2001 @@ -28,7 +28,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/media/video/zr36067.c linux-2.4.7-pre6+mallocRIP/drivers/media/video/zr36067.c --- linux-2.4.7-pre6/drivers/media/video/zr36067.c Thu Jul 12 03:13:02 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/media/video/zr36067.c Sun Jul 15 05:06:15 2001 @@ -50,7 +50,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> diff -Nur linux-2.4.7-pre6/drivers/net/au1000_eth.c linux-2.4.7-pre6+mallocRIP/drivers/net/au1000_eth.c --- linux-2.4.7-pre6/drivers/net/au1000_eth.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/au1000_eth.c Sun Jul 15 05:06:14 2001 @@ -39,7 +39,7 @@ #include <linux/errno.h> #include <linux/in.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/dmfe.c linux-2.4.7-pre6+mallocRIP/drivers/net/dmfe.c --- linux-2.4.7-pre6/drivers/net/dmfe.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/dmfe.c Sun Jul 15 05:06:14 2001 @@ -61,7 +61,7 @@ #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/gt96100eth.c linux-2.4.7-pre6+mallocRIP/drivers/net/gt96100eth.c --- linux-2.4.7-pre6/drivers/net/gt96100eth.c Mon Apr 30 14:18:43 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/gt96100eth.c Sun Jul 15 05:06:14 2001 @@ -38,7 +38,7 @@ #include <linux/errno.h> #include <linux/in.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/irda/ali-ircc.c linux-2.4.7-pre6+mallocRIP/drivers/net/irda/ali-ircc.c --- linux-2.4.7-pre6/drivers/net/irda/ali-ircc.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/irda/ali-ircc.c Sun Jul 15 05:06:14 2001 @@ -27,7 +27,7 @@ #include <linux/netdevice.h> #include <linux/ioport.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/rtnetlink.h> #include <linux/serial_reg.h> diff -Nur linux-2.4.7-pre6/drivers/net/irda/irda-usb.c linux-2.4.7-pre6+mallocRIP/drivers/net/irda/irda-usb.c --- linux-2.4.7-pre6/drivers/net/irda/irda-usb.c Sun Jun 17 15:55:04 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/irda/irda-usb.c Sun Jul 15 05:06:14 2001 @@ -33,7 +33,7 @@ #include <linux/init.h> #include <linux/skbuff.h> #include <linux/netdevice.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/rtnetlink.h> #include <linux/usb.h> diff -Nur linux-2.4.7-pre6/drivers/net/lp486e.c linux-2.4.7-pre6+mallocRIP/drivers/net/lp486e.c --- linux-2.4.7-pre6/drivers/net/lp486e.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/lp486e.c Sun Jul 15 05:06:14 2001 @@ -65,7 +65,7 @@ #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> diff -Nur linux-2.4.7-pre6/drivers/net/ncr885e.c linux-2.4.7-pre6+mallocRIP/drivers/net/ncr885e.c --- linux-2.4.7-pre6/drivers/net/ncr885e.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/ncr885e.c Sun Jul 15 05:06:14 2001 @@ -19,7 +19,7 @@ #include <linux/sched.h> #include <linux/timer.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/netdevice.h> #include <linux/pci.h> #include <linux/delay.h> diff -Nur linux-2.4.7-pre6/drivers/net/pcmcia/ibmtr_cs.c linux-2.4.7-pre6+mallocRIP/drivers/net/pcmcia/ibmtr_cs.c --- linux-2.4.7-pre6/drivers/net/pcmcia/ibmtr_cs.c Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/pcmcia/ibmtr_cs.c Sun Jul 15 05:06:14 2001 @@ -49,7 +49,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/module.h> diff -Nur linux-2.4.7-pre6/drivers/net/sk98lin/h/skdrv1st.h linux-2.4.7-pre6+mallocRIP/drivers/net/sk98lin/h/skdrv1st.h --- linux-2.4.7-pre6/drivers/net/sk98lin/h/skdrv1st.h Thu Jul 12 03:13:07 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/sk98lin/h/skdrv1st.h Sun Jul 15 05:06:14 2001 @@ -113,7 +113,7 @@ #include <linux/string.h> #include <linux/errno.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <asm/byteorder.h> diff -Nur linux-2.4.7-pre6/drivers/net/sungem.c linux-2.4.7-pre6+mallocRIP/drivers/net/sungem.c --- linux-2.4.7-pre6/drivers/net/sungem.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/sungem.c Sun Jul 15 05:06:14 2001 @@ -14,7 +14,7 @@ #include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/in.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/delay.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/tun.c linux-2.4.7-pre6+mallocRIP/drivers/net/tun.c --- linux-2.4.7-pre6/drivers/net/tun.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/tun.c Sun Jul 15 05:06:14 2001 @@ -29,7 +29,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_chdlc.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_chdlc.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_chdlc.c Mon Apr 30 14:18:45 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_chdlc.c Sun Jul 15 05:06:14 2001 @@ -53,7 +53,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_fr.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_fr.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_fr.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_fr.c Sun Jul 15 05:06:14 2001 @@ -143,7 +143,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_ft1.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ft1.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_ft1.c Mon Apr 30 14:18:45 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ft1.c Sun Jul 15 05:06:14 2001 @@ -25,7 +25,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_ppp.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ppp.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_ppp.c Sun Jun 17 15:55:11 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_ppp.c Sun Jul 15 05:06:14 2001 @@ -95,7 +95,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdla_x25.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_x25.c --- linux-2.4.7-pre6/drivers/net/wan/sdla_x25.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdla_x25.c Sun Jul 15 05:06:14 2001 @@ -87,7 +87,7 @@ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ #include <linux/ctype.h> -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <asm/byteorder.h> /* htons(), etc. */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/sdlamain.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdlamain.c --- linux-2.4.7-pre6/drivers/net/wan/sdlamain.c Mon Apr 30 14:18:45 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/sdlamain.c Sun Jul 15 05:06:14 2001 @@ -51,7 +51,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/kernel.h> /* printk(), and other useful stuff */ #include <linux/module.h> /* support for loadable modules */ #include <linux/ioport.h> /* request_region(), release_region() */ diff -Nur linux-2.4.7-pre6/drivers/net/wan/wanpipe_multppp.c linux-2.4.7-pre6+mallocRIP/drivers/net/wan/wanpipe_multppp.c --- linux-2.4.7-pre6/drivers/net/wan/wanpipe_multppp.c Sun Jun 17 15:55:12 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wan/wanpipe_multppp.c Sun Jul 15 05:06:14 2001 @@ -22,7 +22,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/string.h> /* inline memset(), etc. */ -#include <linux/malloc.h> /* kmalloc(), kfree() */ +#include <linux/slab.h> /* kmalloc(), kfree() */ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/if_arp.h> /* ARPHRD_* defines */ diff -Nur linux-2.4.7-pre6/drivers/net/wireless/airo.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo.c --- linux-2.4.7-pre6/drivers/net/wireless/airo.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo.c Sun Jul 15 05:06:14 2001 @@ -28,7 +28,7 @@ #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/airo_cs.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo_cs.c --- linux-2.4.7-pre6/drivers/net/wireless/airo_cs.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airo_cs.c Sun Jul 15 05:06:14 2001 @@ -31,7 +31,7 @@ #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/netdevice.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/airport.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airport.c --- linux-2.4.7-pre6/drivers/net/wireless/airport.c Sun Jun 17 15:55:12 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/airport.c Sun Jul 15 05:06:14 2001 @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/orinoco.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco.c --- linux-2.4.7-pre6/drivers/net/wireless/orinoco.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco.c Sun Jul 15 05:06:14 2001 @@ -177,7 +177,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/net/wireless/orinoco_cs.c linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco_cs.c --- linux-2.4.7-pre6/drivers/net/wireless/orinoco_cs.c Wed Jul 4 22:58:50 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/net/wireless/orinoco_cs.c Sun Jul 15 05:06:14 2001 @@ -15,7 +15,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/ioport.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd.c --- linux-2.4.7-pre6/drivers/s390/block/dasd.c Sun Jun 17 15:55:17 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd.c Sun Jul 15 05:06:15 2001 @@ -31,7 +31,7 @@ #include <linux/kernel.h> #include <linux/tqueue.h> #include <linux/timer.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/genhd.h> #include <linux/hdreg.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd_diag.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_diag.c --- linux-2.4.7-pre6/drivers/s390/block/dasd_diag.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_diag.c Sun Jul 15 05:06:14 2001 @@ -18,7 +18,7 @@ #include <linux/kernel.h> #include <asm/debug.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/blk.h> #include <asm/ccwcache.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd_eckd.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_eckd.c --- linux-2.4.7-pre6/drivers/s390/block/dasd_eckd.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_eckd.c Sun Jul 15 05:06:15 2001 @@ -24,7 +24,7 @@ #include <linux/kernel.h> #include <asm/debug.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/blk.h> #include <asm/ccwcache.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/dasd_fba.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_fba.c --- linux-2.4.7-pre6/drivers/s390/block/dasd_fba.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/dasd_fba.c Sun Jul 15 05:06:15 2001 @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <asm/debug.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/blk.h> #include <asm/ccwcache.h> diff -Nur linux-2.4.7-pre6/drivers/s390/block/xpram.c linux-2.4.7-pre6+mallocRIP/drivers/s390/block/xpram.c --- linux-2.4.7-pre6/drivers/s390/block/xpram.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/block/xpram.c Sun Jul 15 05:06:14 2001 @@ -74,7 +74,7 @@ #endif /* V24 */ #include <linux/sched.h> #include <linux/kernel.h> /* printk() */ -#include <linux/malloc.h> /* kmalloc() */ +#include <linux/slab.h> /* kmalloc() */ #if (XPRAM_VERSION == 24) # include <linux/devfs_fs_kernel.h> #endif /* V24 */ diff -Nur linux-2.4.7-pre6/drivers/s390/ccwcache.c linux-2.4.7-pre6+mallocRIP/drivers/s390/ccwcache.c --- linux-2.4.7-pre6/drivers/s390/ccwcache.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/ccwcache.c Sun Jul 15 05:06:15 2001 @@ -10,7 +10,7 @@ */ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/version.h> #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,3,98)) diff -Nur linux-2.4.7-pre6/drivers/s390/char/tubio.h linux-2.4.7-pre6+mallocRIP/drivers/s390/char/tubio.h --- linux-2.4.7-pre6/drivers/s390/char/tubio.h Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/char/tubio.h Sun Jul 15 05:06:14 2001 @@ -23,7 +23,7 @@ #endif /* IBM_FS3270_MAJOR */ -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/irq.h> #include <asm/io.h> #include <linux/console.h> diff -Nur linux-2.4.7-pre6/drivers/s390/idals.c linux-2.4.7-pre6+mallocRIP/drivers/s390/idals.c --- linux-2.4.7-pre6/drivers/s390/idals.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/idals.c Sun Jul 15 05:06:15 2001 @@ -11,7 +11,7 @@ #include <linux/module.h> #include <linux/config.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/irq.h> #include <asm/idals.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/ctcmain.c linux-2.4.7-pre6+mallocRIP/drivers/s390/net/ctcmain.c --- linux-2.4.7-pre6/drivers/s390/net/ctcmain.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/ctcmain.c Sun Jul 15 05:06:14 2001 @@ -98,7 +98,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <linux/types.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/fsm.h linux-2.4.7-pre6+mallocRIP/drivers/s390/net/fsm.h --- linux-2.4.7-pre6/drivers/s390/net/fsm.h Sun Feb 25 01:10:38 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/fsm.h Sun Jul 15 05:06:14 2001 @@ -16,7 +16,7 @@ #include <linux/types.h> #include <linux/timer.h> #include <linux/time.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/sched.h> #include <linux/string.h> #include <asm/atomic.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/iucv.c linux-2.4.7-pre6+mallocRIP/drivers/s390/net/iucv.c --- linux-2.4.7-pre6/drivers/s390/net/iucv.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/iucv.c Sun Jul 15 05:06:14 2001 @@ -13,7 +13,7 @@ #include <linux/version.h> #include <linux/spinlock.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/tqueue.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/drivers/s390/net/netiucv.c linux-2.4.7-pre6+mallocRIP/drivers/s390/net/netiucv.c --- linux-2.4.7-pre6/drivers/s390/net/netiucv.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/net/netiucv.c Sun Jul 15 05:06:14 2001 @@ -71,7 +71,7 @@ #endif #include <linux/sched.h> /* task queues */ -#include <linux/malloc.h> /* kmalloc() */ +#include <linux/slab.h> /* kmalloc() */ #include <linux/errno.h> /* error codes */ #include <linux/types.h> /* size_t */ #include <linux/interrupt.h> /* mark_bh */ diff -Nur linux-2.4.7-pre6/drivers/s390/s390io.c linux-2.4.7-pre6+mallocRIP/drivers/s390/s390io.c --- linux-2.4.7-pre6/drivers/s390/s390io.c Thu Jul 12 03:13:08 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/s390io.c Sun Jul 15 05:06:15 2001 @@ -24,7 +24,7 @@ #include <linux/signal.h> #include <linux/sched.h> #include <linux/interrupt.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/smp.h> #include <linux/threads.h> diff -Nur linux-2.4.7-pre6/drivers/s390/s390mach.c linux-2.4.7-pre6+mallocRIP/drivers/s390/s390mach.c --- linux-2.4.7-pre6/drivers/s390/s390mach.c Mon Apr 2 18:15:29 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/s390/s390mach.c Sun Jul 15 05:06:15 2001 @@ -11,7 +11,7 @@ #include <linux/config.h> #include <linux/spinlock.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #ifdef CONFIG_SMP #include <linux/smp.h> #endif diff -Nur linux-2.4.7-pre6/drivers/scsi/advansys.c linux-2.4.7-pre6+mallocRIP/drivers/scsi/advansys.c --- linux-2.4.7-pre6/drivers/scsi/advansys.c Mon Apr 30 14:18:46 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/scsi/advansys.c Sun Jul 15 05:06:15 2001 @@ -789,7 +789,7 @@ #include <linux/types.h> #include <linux/ioport.h> #include <linux/delay.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/proc_fs.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/drivers/scsi/aic7xxx/aic7xxx_osm.h linux-2.4.7-pre6+mallocRIP/drivers/scsi/aic7xxx/aic7xxx_osm.h --- linux-2.4.7-pre6/drivers/scsi/aic7xxx/aic7xxx_osm.h Thu Jul 12 03:53:53 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/scsi/aic7xxx/aic7xxx_osm.h Sun Jul 15 05:06:15 2001 @@ -58,7 +58,7 @@ #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/pci.h> #include <linux/version.h> diff -Nur linux-2.4.7-pre6/drivers/scsi/megaraid.c linux-2.4.7-pre6+mallocRIP/drivers/scsi/megaraid.c --- linux-2.4.7-pre6/drivers/scsi/megaraid.c Thu Jul 12 03:13:08 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/scsi/megaraid.c Sun Jul 15 05:06:15 2001 @@ -391,7 +391,7 @@ #include <linux/sched.h> #include <linux/stat.h> -#include <linux/malloc.h> /* for kmalloc() */ +#include <linux/slab.h> /* for kmalloc() */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) /* 0x20100 */ #include <linux/bios32.h> #else diff -Nur linux-2.4.7-pre6/drivers/sound/cmpci.c linux-2.4.7-pre6+mallocRIP/drivers/sound/cmpci.c --- linux-2.4.7-pre6/drivers/sound/cmpci.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/sound/cmpci.c Sun Jul 15 05:06:15 2001 @@ -93,7 +93,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/wrapper.h> diff -Nur linux-2.4.7-pre6/drivers/sound/cs4281/cs4281m.c linux-2.4.7-pre6+mallocRIP/drivers/sound/cs4281/cs4281m.c --- linux-2.4.7-pre6/drivers/sound/cs4281/cs4281m.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/sound/cs4281/cs4281m.c Sun Jul 15 05:06:15 2001 @@ -65,7 +65,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/bitops.h> diff -Nur linux-2.4.7-pre6/drivers/sound/maestro3.c linux-2.4.7-pre6+mallocRIP/drivers/sound/maestro3.c --- linux-2.4.7-pre6/drivers/sound/maestro3.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/sound/maestro3.c Sun Jul 15 05:06:15 2001 @@ -130,7 +130,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/vmalloc.h> diff -Nur linux-2.4.7-pre6/drivers/usb/catc.c linux-2.4.7-pre6+mallocRIP/drivers/usb/catc.c --- linux-2.4.7-pre6/drivers/usb/catc.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/usb/catc.c Sun Jul 15 05:06:14 2001 @@ -33,7 +33,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/string.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> diff -Nur linux-2.4.7-pre6/drivers/usb/serial/io_edgeport.c linux-2.4.7-pre6+mallocRIP/drivers/usb/serial/io_edgeport.c --- linux-2.4.7-pre6/drivers/usb/serial/io_edgeport.c Wed Jul 4 22:58:51 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/usb/serial/io_edgeport.c Sun Jul 15 05:06:14 2001 @@ -233,7 +233,7 @@ #include <linux/errno.h> #include <linux/poll.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/fcntl.h> #include <linux/tty.h> #include <linux/tty_driver.h> diff -Nur linux-2.4.7-pre6/drivers/video/epson1355fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/epson1355fb.c --- linux-2.4.7-pre6/drivers/video/epson1355fb.c Sun Jun 17 15:55:44 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/epson1355fb.c Sun Jul 15 05:06:15 2001 @@ -25,7 +25,7 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/sched.h> diff -Nur linux-2.4.7-pre6/drivers/video/maxinefb.c linux-2.4.7-pre6+mallocRIP/drivers/video/maxinefb.c --- linux-2.4.7-pre6/drivers/video/maxinefb.c Thu Jul 12 03:13:09 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/maxinefb.c Sun Jul 15 05:06:15 2001 @@ -31,7 +31,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff -Nur linux-2.4.7-pre6/drivers/video/pmag-ba-fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/pmag-ba-fb.c --- linux-2.4.7-pre6/drivers/video/pmag-ba-fb.c Mon Apr 30 14:18:49 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/pmag-ba-fb.c Sun Jul 15 05:06:15 2001 @@ -27,7 +27,7 @@ #include <linux/timer.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff -Nur linux-2.4.7-pre6/drivers/video/pmagb-b-fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/pmagb-b-fb.c --- linux-2.4.7-pre6/drivers/video/pmagb-b-fb.c Mon Apr 30 14:18:49 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/pmagb-b-fb.c Sun Jul 15 05:06:15 2001 @@ -30,7 +30,7 @@ #include <linux/timer.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/fb.h> diff -Nur linux-2.4.7-pre6/drivers/video/pvr2fb.c linux-2.4.7-pre6+mallocRIP/drivers/video/pvr2fb.c --- linux-2.4.7-pre6/drivers/video/pvr2fb.c Thu Jul 12 03:13:09 2001 +++ linux-2.4.7-pre6+mallocRIP/drivers/video/pvr2fb.c Sun Jul 15 05:06:15 2001 @@ -51,7 +51,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/tty.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/delay.h> #include <linux/config.h> #include <linux/interrupt.h> diff -Nur linux-2.4.7-pre6/fs/partitions/ibm.c linux-2.4.7-pre6+mallocRIP/fs/partitions/ibm.c --- linux-2.4.7-pre6/fs/partitions/ibm.c Sun Jun 17 15:55:52 2001 +++ linux-2.4.7-pre6+mallocRIP/fs/partitions/ibm.c Sun Jul 15 05:06:15 2001 @@ -17,7 +17,7 @@ #include <linux/major.h> #include <linux/string.h> #include <linux/blk.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/hdreg.h> #include <linux/ioctl.h> #include <linux/version.h> diff -Nur linux-2.4.7-pre6/include/linux/malloc.h linux-2.4.7-pre6+mallocRIP/include/linux/malloc.h --- linux-2.4.7-pre6/include/linux/malloc.h Thu Jul 12 03:53:53 2001 +++ linux-2.4.7-pre6+mallocRIP/include/linux/malloc.h Sun Jul 15 05:07:34 2001 @@ -1,5 +1,5 @@ #ifndef _LINUX_MALLOC_H #define _LINUX_MALLOC_H - +#warning The Use of linux/malloc.h is depricated, linux/slab.h #include <linux/slab.h> #endif /* _LINUX_MALLOC_H */ diff -Nur linux-2.4.7-pre6/net/bluetooth/af_bluetooth.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/af_bluetooth.c --- linux-2.4.7-pre6/net/bluetooth/af_bluetooth.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/af_bluetooth.c Sun Jul 15 05:06:16 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/skbuff.h> #include <linux/init.h> #include <linux/proc_fs.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/hci_core.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_core.c --- linux-2.4.7-pre6/net/bluetooth/hci_core.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_core.c Sun Jul 15 05:06:16 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/hci_sock.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_sock.c --- linux-2.4.7-pre6/net/bluetooth/hci_sock.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/hci_sock.c Sun Jul 15 05:06:16 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/l2cap_core.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_core.c --- linux-2.4.7-pre6/net/bluetooth/l2cap_core.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_core.c Sun Jul 15 05:06:16 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/bluetooth/l2cap_proc.c linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_proc.c --- linux-2.4.7-pre6/net/bluetooth/l2cap_proc.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/bluetooth/l2cap_proc.c Sun Jul 15 05:06:16 2001 @@ -36,7 +36,7 @@ #include <linux/kernel.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> diff -Nur linux-2.4.7-pre6/net/wanrouter/wanmain.c linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanmain.c --- linux-2.4.7-pre6/net/wanrouter/wanmain.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanmain.c Sun Jul 15 05:06:16 2001 @@ -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 */ diff -Nur linux-2.4.7-pre6/net/wanrouter/wanproc.c linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanproc.c --- linux-2.4.7-pre6/net/wanrouter/wanproc.c Wed Jul 4 22:58:54 2001 +++ linux-2.4.7-pre6+mallocRIP/net/wanrouter/wanproc.c Sun Jul 15 05:06:16 2001 @@ -25,7 +25,7 @@ #include <linux/stddef.h> /* offsetof(), etc. */ #include <linux/errno.h> /* return codes */ #include <linux/kernel.h> -#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 */ #include <asm/byteorder.h> /* htons(), etc. */
oh cool, thanks. This saves me some work. I originally did a lot of the cleanup in 2.4 to get rid of malloc.h references, but specifically didn't touch much arch/* at the time.
tangent, it would be nice to remove __KERNEL__ from at least the i386 kernel headers in 2.5, and I think it's a doable task...
Signature · 3 lines
Jeff Garzik | A recent study has shown that too much soup Building 1024 | can cause malaise in laboratory mice. MandrakeSoft |
Quoted 2 lines
tangent, it would be nice to remove
__KERNEL__from at least the i386 kernel headers in 2.5, and I think it's a doable task...
That just generates work for the glibc folks when they are working off copies of kernel header snapshots as they need to
Quoted 6 lines · Alan Cox
Quoted 2 lines · Jeff Garzik
it would be nice to remove
__KERNEL__from at least the i386 kernel headers in 2.5, and I think it's a doable task...That just generates work for the glibc folks when they are working off copies of kernel header snapshots as they need to
It is a flag day change so it generates [a lot of] work once... it has always been policy that userspace shouldn't be including kernel headers. uClibc and now dietlibc are following this policy.
IMHO we have made an exception for glibc for long enough...
Signature · 3 lines
Jeff Garzik | A recent study has shown that too much soup Building 1024 | can cause malaise in laboratory mice. MandrakeSoft |
Quoted 5 lines
It is a flag day change so it generates [a lot of] work once... it has always been policy that userspace shouldn't be including kernel headers. uClibc and now dietlibc are following this policy.
IMHO we have made an exception for glibc for long enough...
Glibc includes a copy of the kernel headers it wants to get the kernel side ABI structures not to export them to user space. Thats quite different and attempting to maintain that seperately as well will just lead to an ever increasing number of stupid ABI coping errors and weird bugs.
The kernel headers define syscall interfaces for the libraries. They don't define user app interfaces. Two different things and we need __KERNEL__ to make the former (sane) use work
__KERNEL__ removal
In reply to Jeff GarzikQuoted 9 lines · Jeff Garzik
Quoted 7 lines · Alan Cox
Quoted 2 lines · Jeff Garzik
it would be nice to remove
__KERNEL__from at least the i386 kernel headers in 2.5, and I think it's a doable task...That just generates work for the glibc folks when they are working
off copies
of kernel header snapshots as they need to
Quoted 5 lines
It is a flag day change so it generates [a lot of] work once... it has always been policy that userspace shouldn't be including kernel headers. uClibc and now dietlibc are following this policy.
IMHO we have made an exception for glibc for long enough...
I take it the policy JG is referring to applies to including any kernel header files at all in userspace programs, and that __KERNEL__ removal is a mere consequence of that policy.
AC points out that syscall interfaces in glibc are a reasonable exception to that policy.
What about a header like ethtool.h? Isn't its whole reason for existing to provide a common ABI for ethtool.c and the various drivers that support it?
Likewise sockios.h, which ethtool (and no doubt many others) also #includes. Unless you're going to encapsulate all possible ioctl interfaces into libc, sockios.h (for example) provides a piece of the ABI that's needed by the user code, not just by libc. Why would it make sense to require retyping of this stuff?
If, on the other hand, the argument is that user-kernel ABI definitions should be isolated in their own headers, and not mixed up (hence __KERNEL__), that's a much more restricted argument. My impression is that this is *not* the argument though; is it?
Signature · 1 line
/Jonathan Lundell.
In article <[email protected]>,
Quoted 1 line · Jeff Garzik
IMHO we have made an exception for glibc for long enough...
glibc and strace, which is already having a truely horrible time trying to get the right data from the kernel includes. There is some functionality deliberately missing from strace since the only way to implement it would have been to copy things from the kernel includes into the source which just adds extra maintenance nightmares.
Wichert.
Signature · 4 lines
_________________________________________________________________ / Nothing is fool-proof to a sufficiently talented fool \ | [email protected] http://www.liacs.nl/~wichert/ | | 1024D/2FA3BC2D 576E 100B 518D 2F16 36B0 2805 3CB8 9250 2FA3 BC2D |
Re: __KERNEL__ removal
In reply to Alan CoxQuoted 10 lines · Jonathan Lundell
I take it the policy JG is referring to applies to including any kernel header files at all in userspace programs, and that
__KERNEL__removal is a mere consequence of that policy.AC points out that syscall interfaces in glibc are a reasonable exception to that policy.
What about a header like
ethtool.h? Isn't its whole reason for existing to provide a common ABI forethtool.cand the various drivers that support it?
no. this is counter to the don't-include-kernel-headers-in-userspace-programs policy.
kernel types are not userspace types, kernel namespace isn't userspace namespace.
Quoted 10 lines
Likewise
sockios.h, which ethtool (and no doubt many others) also #includes. Unless you're going to encapsulate all possible ioctl interfaces into libc,sockios.h(for example) provides a piece of the ABI that's needed by the user code, not just by libc. Why would it make sense to require retyping of this stuff?If, on the other hand, the argument is that user-kernel ABI definitions should be isolated in their own headers, and not mixed up (hence
__KERNEL__), that's a much more restricted argument. My impression is that this is *not* the argument though; is it?
If there -must- be parts of the kernel that are visible to userspace, yes, we should separate them and make that separation obvious. I would not call our current setup obvious :)
IMHO the current __KERNEL__ "policy" is largely unenforced... It takes no time at all to find any number of cases (drivers adding ioctls are the worst) where a header is shared between userspace and kernelspace, and it pollutes kernel types or structures to userspace, or vice versa.
If we want to avoid the retyping (which is IMHO the most clean separation for all cases, even if it involves drudgery) then separating out code into libc-only headers would be nice.
Jeff
Signature · 3 lines
Jeff Garzik | A recent study has shown that too much soup Building 1024 | can cause malaise in laboratory mice. MandrakeSoft |
Re: __KERNEL__ removal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 3 lines · Jeff Garzik
If we want to avoid the retyping (which is IMHO the most clean separation for all cases, even if it involves drudgery) then separating out code into libc-only headers would be nice.
I agree...the "worst" case is that the libc and kernel become out of step. Big deal. If that was to have a bad effect, then statically-compiled programs would fail to work as well... and if this happened, well, it'd generally be universally accepted as a bug in the particular release of the kernel.
I know it takes time and effort, but so does fixing and working around all of the problems created by using kernelspace headers in userspace. /usr/src/kernel/include should never *ever* be seen by anything except the kernel and kernel-level drivers. Everything else should either have its own headers, or use the libc's (which should have its own set defining the appropriate types and structures needed for syscalls and ioctls).
This really isn't *that* difficult to get your head around.
Mo.
- --
Mo McKinlay
[email protected]
- ------------------------------------------------------------------------- GnuPG/PGP Key: pub 1024D/76A275F9 2000-07-22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.0 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iEYEARECAAYFAjtQj7AACgkQRcGgB3aidfmTlACgmT1+c9JH0ShTp/roTgewMHq3 c70AoIyj/baePWnPgjI7TahB/VXl8BNy
=gKji
-----END PGP SIGNATURE-----
Re: __KERNEL__ removal
In reply to Jeff Garzik[email protected] (Jeff Garzik) wrote on 14.07.01 in <[email protected]>:
Quoted 3 lines
If we want to avoid the retyping (which is IMHO the most clean separation for all cases, even if it involves drudgery) then separating out code into libc-only headers would be nice.
Not that I think anyone is going to take me up on this, judging from prior experience ...
... but if we are looking for a clean solution to types and constants that are needed to communicate between kernel and user space, IMO the thing to do is to define these in some sort of generic format, and have a tool to generate actual headers from that according to whatever kernel, libc or whoever wants to see. Possibly more than one tool as requirements differ.
That generic format *could* be a restricted form of C (restricted to only those features needed for this task), but need not be.
The tool in question is not all that difficult to write; *if* people think this is the right way to go (and agree on some of the necessary details), I could write it. In C, even, so it doesn't need extra tools.
MfG Kai
Re: __KERNEL__ removal
[email protected] (Kai Henningsen) said:
[...]
Quoted 5 lines
... but if we are looking for a clean solution to types and constants that are needed to communicate between kernel and user space, IMO the thing to do is to define these in some sort of generic format, and have a tool to generate actual headers from that according to whatever kernel, libc or whoever wants to see. Possibly more than one tool as requirements differ.
Much easier, plain C, no special tools:
include/linux/...
include/asm/...
include/glibc/...
where .../glibc/xyz.h contains the shared parts, and the others feel free to include that as needed.
The real problem is that the interfaces _do_ change, as new syscalls, ioctls, and constants show up (so "one set of .h for userland, cast in stone for all eternity" won't _ever_ do), and that parts of the userland are tightly bound to the kernel, and _need_ inside knowledge (strace, the tools for manipulating modules, ...). Plus glibc and userland also changes...
Signature · 2 lines
Horst von Brand [email protected] Casilla 9G, Vin~a del Mar, Chile +56 32 672616
Re: __KERNEL__ removal
On Sun, Jul 15, 2001 at 10:21:44AM -0400, Horst von Brand wrote:
Much easier, plain C, no special tools:
include/linux/...
include/asm/...
include/glibc/...
where .../glibc/xyz.h contains the shared parts, and the others feel free to include that as needed.
Often lots of little files are a pain to edit compared to one larger file.
--cw
On Sat, Jul 14, 2001 at 06:33:45PM +0100, Alan Cox wrote:
That just generates work for the glibc folks when they are working off copies of kernel header snapshots as they need to
Can't we just do something like:
/* KERNEL_PRIVATE_BEGIN: blah */
struct internal organs(int foo, char *bar);
/* KERNEL_PRIVATE_END */
sort of thing? That way glibc people can use sed to eliminate bogons and confilcts and they can also submit patches for areas of overlap the kernel people miss --- without fear of breaking the kernel?
Seems win-win to me and stops glibc and kernel developers from having to trip over people and will allow us to eliminate all the rediculous numbers of __KERNEL__ checks.
--cw
Quoted 5 lines · Chris Wedgwood
/*
KERNEL_PRIVATE_BEGIN: blah */struct internal
organs(int foo, char *bar);/*
KERNEL_PRIVATE_END*/
1) this is the same fscking thing we have now with ifdef __KERNEL__
2) if you are coming up with a -new- token, realize that kernel-private stuff is the common case, and use LIBC_KERNEL_SHARED_{BEGIN,END} instead
Signature · 3 lines
Jeff Garzik | A recent study has shown that too much soup Building 1024 | can cause malaise in laboratory mice. MandrakeSoft |
On Sat, Jul 14, 2001 at 11:46:46PM -0400, Jeff Garzik wrote:
1) this is the same fscking thing we have now with ifdef __KERNEL__
Except it is completely ignored by the preprocessor.
2) if you are coming up with a -new- token, realize that kernel-private stuff is the common case, and use LIBC_KERNEL_SHARED_{BEGIN,END} instead
Sure, whatever works... the points I am trying to make are:
* Don't pollute kernel headers with unnecessary pre-processor junk.
* Give the LIBC people the power to choose which parts of the headers they ingore and otherwise.
* Linus et al, can merge patches from LIBC people knowing they should only affect LIBC, not the kernel.
It doesn't matter what the token(s) is/are --- by making them comments and invisible to the kernel is make life easier.
Also, if the LIBC people want something like:
typedef unsigned int uint32_t;
then it could look like:
/* LIBC_ONLY_BEGIN
typedef unsigned int uint32_t;
LIBC_ONLY_END */or whatever. All the libc specific stuff hidden in comments, and shared stuff indictaed by comments. A simple script can then produce LIBC suitable headers from the kernel ones.
--cw
Re: __KERNEL__ removal
In reply to Alan CoxOn Sun, Jul 15, 2001 at 01:53:00PM +0200, Kai Henningsen wrote:
... but if we are looking for a clean solution to types and constants that are needed to communicate between kernel and user space, IMO the thing to do is to define these in some sort of generic format, and have a tool to generate actual headers from that according to whatever kernel, libc or whoever wants to see. Possibly more than one tool as requirements differ.
Too complex, too hard... why not standard headers for the kernel peoplem as that is the origin on the headers and helper comments for others?
--cw
Quoted 2 lines · [email protected] said:
If it changes vmlinux by a single byte, I might agree.... all it does
is close off and older depricated API.
Why is the sane API deprecated in favour of the implementation-specific one?
If we must standardise on a single header file to include, surely we should do it the other way round?
Index: include/linux/slab.h
===================================================================
RCS file: /inst/cvs/linux/include/linux/slab.h,v
retrieving revision 1.1.1.1.2.12
linux/slab.h +4 -0
@@ -4,6 +4,10 @@* ([email protected]) */ +#ifndef _LINUX_MALLOC_H +#warning Please do not include linux/slab.h directly, use linux/malloc.h instead. +#endif +#if !defined(_LINUX_SLAB_H)#define _LINUX_SLAB_H
--
dwmw2
Quoted 18 lines · David Woodhouse
Quoted 2 lines · [email protected] said:
If it changes vmlinux by a single byte, I might agree.... all it does
is close off and older depricated API.Why is the sane API deprecated in favour of the implementation-specific one?
If we must standardise on a single header file to include, surely we should do it the other way round?
Index:
include/linux/slab.h
===================================================================
RCS file: /inst/cvs/linux/include/linux/slab.h,v
retrieving revision 1.1.1.1.2.12
diff -u -r1.1.1.1.2.12slab.h
linux/slab.h 2001/07/14 18:08:37 line 9
Quoted 6 lines
linux/slab.h 2001/07/14 18:08:37 renamed from linux/slab.h 2001/06/08 22:41:51 1.1.1.1.2.12 +3
-0@@ -4,6 +4,10 @@ * ([email protected]) */ +#ifndef _LINUX_MALLOC_H +#warning Please do not include linux/slab.h directly, use linux/malloc.h instead. +#endif
malloc.h is extra indirection we don't need. IMHO
/* malloc.h */ #include <linux/slab.h>
is a windows interface. Linux wrappers should be kept to a minimum...
Signature · 3 lines
Jeff Garzik | A recent study has shown that too much soup Building 1024 | can cause malaise in laboratory mice. MandrakeSoft |
Quoted 4 lines · [email protected] said:
malloc.his extra indirection we don't need. IMHO/* malloc.h */ #include <linux/slab.h>is a windows interface. Linux wrappers should be kept to a minimum...
Fine. I can see the logic in that.
mv include/linux/slab.h include/linux/malloc.h
perl -pi -e s/_LINUX_SLAB_H/_LINUX_MALLOC_H/ include/linux/malloc.h cat > include/linux/slab.h <<EOF
#warning Please include malloc.h not slab.h
#include <linux/malloc.h>
EOF
--
dwmw2
Quoted 2 lines · [email protected] said:
Why doe people reverse Jeff's s/malloc.h/slab.h/ changes all the
time.Malloc.hdoes nothing but includingslab.hand should just die.
"malloc.h" is generic. "slab.h" exposes an implementation detail.
Why should we change code to include slab.h?
Should we also rename other sanely-named include files to expose implementation details? rwsem-xadd.h? kmod-userhelper.h?
--
dwmw2