Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 23:39:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] update two drivers for poison.h

Browse Source 
Update two drivers to use poison.h.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Randy Dunlap 2006-06-27 02:53:53 -07:00 committed by Linus Torvalds
parent c9cf55285e
commit b3c681e091
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/atm/firestream.c
View File

@ -33,6 +33,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/poison.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/atm.h> #include <linux/atm.h>
#include <linux/atmdev.h> #include <linux/atmdev.h>
@ -754,7 +755,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
fs_kfree_skb (skb); fs_kfree_skb (skb);
fs_dprintk (FS_DEBUG_ALLOC, "Free trans-d: %p\n", td); fs_dprintk (FS_DEBUG_ALLOC, "Free trans-d: %p\n", td);
memset (td, 0x12, sizeof (struct FS_BPENTRY)); memset (td, ATM_POISON_FREE, sizeof(struct FS_BPENTRY));
kfree (td); kfree (td);
break; break;
default: default:

6
include/linux/poison.h
View File

@ -42,4 +42,10 @@
#define POOL_POISON_FREED 0xa7 /* !inuse */ #define POOL_POISON_FREED 0xa7 /* !inuse */
#define POOL_POISON_ALLOCATED 0xa9 /* !initted */ #define POOL_POISON_ALLOCATED 0xa9 /* !initted */
/********** drivers/atm/ **********/
#define ATM_POISON_FREE 0x12
/********** sound/oss/ **********/
#define OSS_POISON_FREE 0xAB
#endif #endif

5
sound/oss/via82cxxx_audio.c
View File

@ -24,6 +24,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/poison.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
@ -3522,7 +3523,7 @@ err_out_have_mixer:
err_out_kfree: err_out_kfree:
#ifndef VIA_NDEBUG #ifndef VIA_NDEBUG
memset (card, 0xAB, sizeof (*card)); /* poison memory */ memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */
#endif #endif
kfree (card); kfree (card);
@ -3559,7 +3560,7 @@ static void __devexit via_remove_one (struct pci_dev *pdev)
via_ac97_cleanup (card); via_ac97_cleanup (card);
#ifndef VIA_NDEBUG #ifndef VIA_NDEBUG
memset (card, 0xAB, sizeof (*card)); /* poison memory */ memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */
#endif #endif
kfree (card); kfree (card);