Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c681e0 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

[PATCH] update two drivers for poison.h 



Update two drivers to use poison.h.

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c9cf5528

drivers/atm/firestream.c

+2 −1
Original line number Diff line number Diff line
@@ -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_dev *dev, struct queue *q) 
			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:

include/linux/poison.h

+6 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device 


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 (struct pci_dev *pdev) 
	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);