From: "Randy.Dunlap" <rdunlap@xenotime.net>
To: lkml <linux-kernel@vger.kernel.org>
Cc: akpm <akpm@osdl.org>, jgarzik <jgarzik@pobox.com>,
perex@suse.cz, chas@cmf.nrl.navy.mil
Subject: [PATCH 2/2] update 2 drivers for poison.h
Date: Thu, 13 Apr 2006 14:10:10 -0700 [thread overview]
Message-ID: <20060413141010.66ea08e8.rdunlap@xenotime.net> (raw)
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);
---
reply other threads:[~2006-04-13 21:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060413141010.66ea08e8.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@osdl.org \
--cc=chas@cmf.nrl.navy.mil \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®