The patch titled
ATM: add+use poison defines
has been removed from the -mm tree. Its filename is
atm-adduse-poison-defines.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ATM: add+use poison defines
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
ATM: add and use POISON define values.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/atm/ambassador.c | 3 ++-
drivers/atm/idt77252.c | 3 ++-
include/linux/poison.h | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff -puN drivers/atm/ambassador.c~atm-adduse-poison-defines drivers/atm/ambassador.c
--- a/drivers/atm/ambassador.c~atm-adduse-poison-defines
+++ a/drivers/atm/ambassador.c
@@ -31,6 +31,7 @@
#include <linux/atmdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
+#include <linux/poison.h>
#include <asm/atomic.h>
#include <asm/io.h>
@@ -1995,7 +1996,7 @@ static int __devinit ucode_init (loader_
}
i += 1;
}
- if (*pointer == 0xdeadbeef) {
+ if (*pointer == ATM_POISON) {
return loader_start (lb, dev, ucode_start);
} else {
// cast needed as there is no %? for pointer differnces
diff -puN drivers/atm/idt77252.c~atm-adduse-poison-defines drivers/atm/idt77252.c
--- a/drivers/atm/idt77252.c~atm-adduse-poison-defines
+++ a/drivers/atm/idt77252.c
@@ -35,6 +35,7 @@ static char const rcsid[] =
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/poison.h>
#include <linux/skbuff.h>
#include <linux/kernel.h>
#include <linux/vmalloc.h>
@@ -3657,7 +3658,7 @@ probe_sram(struct idt77252_dev *card)
writel(SAR_CMD_WRITE_SRAM | (0 << 2), SAR_REG_CMD);
for (addr = 0x4000; addr < 0x80000; addr += 0x4000) {
- writel(0xdeadbeef, SAR_REG_DR0);
+ writel(ATM_POISON, SAR_REG_DR0);
writel(SAR_CMD_WRITE_SRAM | (addr << 2), SAR_REG_CMD);
writel(SAR_CMD_READ_SRAM | (0 << 2), SAR_REG_CMD);
diff -puN include/linux/poison.h~atm-adduse-poison-defines include/linux/poison.h
--- a/include/linux/poison.h~atm-adduse-poison-defines
+++ a/include/linux/poison.h
@@ -44,6 +44,7 @@
/********** drivers/atm/ **********/
#define ATM_POISON_FREE 0x12
+#define ATM_POISON 0xdeadbeef
/********** net/ **********/
#define NEIGHBOR_DEAD 0xdeadbeef
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
areca-raid-linux-scsi-driver.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.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
