The patch titled
update two drivers for poison.h
has been added to the -mm tree. Its filename is
update-2-drivers-for-poisonh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
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
--- 25/drivers/atm/firestream.c~update-2-drivers-for-poisonh Thu Apr 13 16:14:01 2006
+++ 25-akpm/drivers/atm/firestream.c Thu Apr 13 16:14:01 2006
@@ -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
--- 25/include/linux/poison.h~update-2-drivers-for-poisonh Thu Apr 13 16:14:01 2006
+++ 25-akpm/include/linux/poison.h Thu Apr 13 16:14:01 2006
@@ -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
--- 25/sound/oss/via82cxxx_audio.c~update-2-drivers-for-poisonh Thu Apr 13 16:14:01 2006
+++ 25-akpm/sound/oss/via82cxxx_audio.c Thu Apr 13 16:14:01 2006
@@ -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
config-exit-if-no-beginning-filename.patch
git-mtd.patch
net-drivers-fix-section-attributes-for-gcc.patch
areca-raid-linux-scsi-driver.patch
git-watchdog.patch
softmac-uses-wiress-ext.patch
bcm43-wireless-fix-printk-format-warnings.patch
bcm43-fix-config-menu-alignment.patch
doc-vm-hugetlbpage-update-2.patch
ipmi-fix-devinit-placement.patch
config-update-usage-help-info.patch
add-poisonh-and-patch-primary-users.patch
update-2-drivers-for-poisonh.patch
acpi-identify-which-device-is-not-power-manageable.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
