The patch titled
update two drivers for poison.h
has been removed from the -mm tree. Its filename is
update-2-drivers-for-poisonh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: update two drivers for poison.h
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Update two drivers to use poison.h.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/atm/firestream.c | 3 ++-
include/linux/poison.h | 6 ++++++
sound/oss/via82cxxx_audio.c | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff -puN drivers/atm/firestream.c~update-2-drivers-for-poisonh drivers/atm/firestream.c
--- a/drivers/atm/firestream.c~update-2-drivers-for-poisonh
+++ a/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:
diff -puN include/linux/poison.h~update-2-drivers-for-poisonh include/linux/poison.h
--- a/include/linux/poison.h~update-2-drivers-for-poisonh
+++ a/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 -puN sound/oss/via82cxxx_audio.c~update-2-drivers-for-poisonh sound/oss/via82cxxx_audio.c
--- a/sound/oss/via82cxxx_audio.c~update-2-drivers-for-poisonh
+++ a/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);
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
origin.patch
git-acpi.patch
acpi-identify-which-device-is-not-power-manageable.patch
videocodec-make-1-bit-fields-unsigned.patch
ioat-fix-sparse-ulong-warning.patch
git-pcmcia.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
qla1280-fix-section-mismatch-warnings.patch
areca-raid-linux-scsi-driver.patch
dc395x-fix-printk-format-warning.patch
git-watchdog.patch
sound-fix-cs4232-section-mismatch.patch
ac97_codec-make-bitfield-unsigned.patch
oss-via-make-bitfield-unsigned.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
