Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / poison.h

diff --git a/include/linux/poison.h b/include/linux/poison.h
index a9c31be7052c4bcbd4593963ebf32303b338e04f..03620dacba2d9d306ecc2ee576c8f28e36674434 100644 (file)
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -10,6 +10,13 @@
 #define LIST_POISON1  ((void *) 0x00100100)
 #define LIST_POISON2  ((void *) 0x00200200)
 
+/********** include/linux/timer.h **********/
+/*
+ * Magic number "tsta" to indicate a static timer initializer
+ * for the object debugging code.
+ */
+#define TIMER_ENTRY_STATIC     ((void *) 0x74737461)
+
 /********** mm/slab.c **********/
 /*
  * Magic nums for obj red zoning.
@@ -61,4 +68,10 @@
 /********** sound/oss/ **********/
 #define OSS_POISON_FREE                0xAB
 
+/*
+ * Used in arch/arm/plat-omap/sram.h to mark SRAM addresses that
+ * will be patched at runtime
+ */
+#define SRAM_VA_MAGIC          0xbadfeed1
+
 #endif