From 99ad6aee9921c6f6d7a035baf8c29bc29f91dcfe Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@engr.sgi.com>
Date: Mon, 12 Dec 2005 09:34:32 -0800
Subject: [PATCH] --- yaml --- r: 15206 b: refs/heads/master c:
 dc86e88c2bb8a7603ee175fbb6a9e92cf3293dd8 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/kernel/vmlinux.lds.S | 3 +++
 trunk/include/linux/cache.h          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea7a5bf90ef5..351e381b5902 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5bf3165b6fbb879a4658f9da9ca2fe002b75f08
+refs/heads/master: dc86e88c2bb8a7603ee175fbb6a9e92cf3293dd8
diff --git a/trunk/arch/ia64/kernel/vmlinux.lds.S b/trunk/arch/ia64/kernel/vmlinux.lds.S
index 30d8564e9603..73af6267d2ef 100644
--- a/trunk/arch/ia64/kernel/vmlinux.lds.S
+++ b/trunk/arch/ia64/kernel/vmlinux.lds.S
@@ -177,6 +177,9 @@ SECTIONS
 	}
   . = ALIGN(PAGE_SIZE);		/* make sure the gate page doesn't expose kernel data */
 
+  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
+        { *(.data.read_mostly) }
+
   .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET)
         { *(.data.cacheline_aligned) }
 
diff --git a/trunk/include/linux/cache.h b/trunk/include/linux/cache.h
index f6b5a46c5f82..0b7ecf3af78a 100644
--- a/trunk/include/linux/cache.h
+++ b/trunk/include/linux/cache.h
@@ -13,7 +13,7 @@
 #define SMP_CACHE_BYTES L1_CACHE_BYTES
 #endif
 
-#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64)
 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #else
 #define __read_mostly