Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b3c681e09193559ba15f6c9562bd37045f120a96

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent c9cf55285e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] update two drivers for poison.h 

Update two drivers to use poison.h.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 11 additions and 3 deletions Side-by-side Diff

drivers/atm/firestream.c
Diff comments   View file @ b3c681e
... ... @@ -33,6 +33,7 @@
33 33 #include <linux/kernel.h>
34 34 #include <linux/mm.h>
35 35 #include <linux/pci.h>
  36 +#include <linux/poison.h>
36 37 #include <linux/errno.h>
37 38 #include <linux/atm.h>
38 39 #include <linux/atmdev.h>
... ... @@ -754,7 +755,7 @@
754 755 fs_kfree_skb (skb);
755 756  
756 757 fs_dprintk (FS_DEBUG_ALLOC, "Free trans-d: %p\n", td);
757   - memset (td, 0x12, sizeof (struct FS_BPENTRY));
  758 + memset (td, ATM_POISON_FREE, sizeof(struct FS_BPENTRY));
758 759 kfree (td);
759 760 break;
760 761 default:
include/linux/poison.h
Diff comments   View file @ b3c681e
... ... @@ -42,5 +42,11 @@
42 42 #define POOL_POISON_FREED 0xa7 /* !inuse */
43 43 #define POOL_POISON_ALLOCATED 0xa9 /* !initted */
44 44  
  45 +/********** drivers/atm/ **********/
  46 +#define ATM_POISON_FREE 0x12
  47 +
  48 +/********** sound/oss/ **********/
  49 +#define OSS_POISON_FREE 0xAB
  50 +
45 51 #endif
sound/oss/via82cxxx_audio.c
Diff comments   View file @ b3c681e
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/fs.h>
25 25 #include <linux/mm.h>
26 26 #include <linux/pci.h>
  27 +#include <linux/poison.h>
27 28 #include <linux/init.h>
28 29 #include <linux/interrupt.h>
29 30 #include <linux/proc_fs.h>
... ... @@ -3522,7 +3523,7 @@
3522 3523  
3523 3524 err_out_kfree:
3524 3525 #ifndef VIA_NDEBUG
3525   - memset (card, 0xAB, sizeof (*card)); /* poison memory */
  3526 + memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */
3526 3527 #endif
3527 3528 kfree (card);
3528 3529  
... ... @@ -3559,7 +3560,7 @@
3559 3560 via_ac97_cleanup (card);
3560 3561  
3561 3562 #ifndef VIA_NDEBUG
3562   - memset (card, 0xAB, sizeof (*card)); /* poison memory */
  3563 + memset (card, OSS_POISON_FREE, sizeof (*card)); /* poison memory */
3563 3564 #endif
3564 3565 kfree (card);
3565 3566