lkml.org 
[lkml]   [2006]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/2] update 2 drivers for poison.h
From: Randy Dunlap <rdunlap@xenotime.net>

Update 2 drivers to use poison.h.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
drivers/atm/firestream.c | 3 ++-
include/linux/poison.h | 6 ++++++
sound/oss/via82cxxx_audio.c | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)

--- linux-2617-rc1g5.orig/drivers/atm/firestream.c
+++ linux-2617-rc1g5/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_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:
--- linux-2617-rc1g5.orig/include/linux/poison.h
+++ linux-2617-rc1g5/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
--- linux-2617-rc1g5.orig/sound/oss/via82cxxx_audio.c
+++ linux-2617-rc1g5/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 (st
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);


---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-04-13 23:10    [W:0.033 / U:0.420 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site