update 2 drivers for poison.h
PATCH 2/2 update 2 drivers for poison.h
From: Randy Dunlap <[email protected]>
Update 2 drivers to use poison.h.
Signed-off-by Randy Dunlap <[email protected]>
--- drivers/atm/firestream.c | 3 ++- include/linux/poison.h | 6 ++++++ sound/oss/via82cxxx_audio.c | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/atm/firestream.c +2 -1
@@ -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 (structfs_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 :
include/linux/poison.h +6 -0
@@ -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
sound/oss/via82cxxx_audio.c +3 -2
@@ -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 (stvia_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);
---