diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2006-06-27 02:53:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 17:32:38 -0700 |
| commit | b3c681e09193559ba15f6c9562bd37045f120a96 (patch) | |
| tree | 8c70d20988e6b04171cb1f60b0da34978bca5f36 | |
| parent | c9cf55285e87ac423c45d9efca750d3f50234d10 (diff) | |
| download | op-kernel-dev-b3c681e09193559ba15f6c9562bd37045f120a96.zip op-kernel-dev-b3c681e09193559ba15f6c9562bd37045f120a96.tar.gz | |
[PATCH] update two drivers for poison.h
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>
| -rw-r--r-- | drivers/atm/firestream.c | 3 | ||||
| -rw-r--r-- | include/linux/poison.h | 6 | ||||
| -rw-r--r-- | sound/oss/via82cxxx_audio.c | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index f2eeaf9..1bca86e 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c @@ -33,6 +33,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/pci.h> +#include <linux/poison.h> #include <linux/errno.h> #include <linux/atm.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_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); break; default: diff --git a/include/linux/poison.h b/include/linux/poison.h index d536de7..4109f37 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h @@ -42,4 +42,10 @@ #define POOL_POISON_FREED 0xa7 /* !inuse */ #define POOL_POISON_ALLOCATED 0xa9 /* !initted */ +/********** drivers/atm/ **********/ +#define ATM_POISON_FREE 0x12 + +/********** sound/oss/ **********/ +#define OSS_POISON_FREE 0xAB + #endif diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index 1a921ee7..2343ded 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c @@ -24,6 +24,7 @@ #include <linux/fs.h> #include <linux/mm.h> #include <linux/pci.h> +#include <linux/poison.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/proc_fs.h> @@ -3522,7 +3523,7 @@ err_out_have_mixer: err_out_kfree: #ifndef VIA_NDEBUG - memset (card, 0xAB, sizeof (*card)); /* poison memory */ + memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */ #endif kfree (card); @@ -3559,7 +3560,7 @@ static void __devexit via_remove_one (struct pci_dev *pdev) via_ac97_cleanup (card); #ifndef VIA_NDEBUG - memset (card, 0xAB, sizeof (*card)); /* poison memory */ + memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */ #endif kfree (card); |
