From 449134bb85dfd763f8074fc183e122edb340b011 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 8 Dec 2006 02:35:57 -0800
Subject: [PATCH] --- yaml --- r: 43487 b: refs/heads/master c:
 aad094701c6355cb2b3d74a07ec0496f4a48c787 h: refs/heads/master i:   43485:
 80f0497b824d5c824e8c263b24db46d29895cfa9   43483:
 d1b9b8ca3ec560f6c93f616a7b370c81f79a10f1   43479:
 cea1accf0d835256d4bc61ecc44e6dd4095365a6   43471:
 07d299fe6b140c630ddafcd17b7a6863dd567a71   43455:
 29dc026bca6c1a1eae2b4f3a620ebaf91ad361e5 v: v3

---
 [refs]                   |  2 +-
 trunk/kernel/kallsyms.c  | 16 ++++++++--------
 trunk/scripts/kallsyms.c |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5c79ccf59e4e..b87afa7c0f92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d93f7de8c5dfefb030a5e65d0857176879bf78e9
+refs/heads/master: aad094701c6355cb2b3d74a07ec0496f4a48c787
diff --git a/trunk/kernel/kallsyms.c b/trunk/kernel/kallsyms.c
index ab63cfc42992..6f294ff4f9ee 100644
--- a/trunk/kernel/kallsyms.c
+++ b/trunk/kernel/kallsyms.c
@@ -31,14 +31,14 @@
 #endif
 
 /* These will be re-linked against their real values during the second link stage */
-extern unsigned long kallsyms_addresses[] __attribute__((weak));
-extern unsigned long kallsyms_num_syms __attribute__((weak,section("data")));
-extern u8 kallsyms_names[] __attribute__((weak));
+extern const unsigned long kallsyms_addresses[] __attribute__((weak));
+extern const unsigned long kallsyms_num_syms __attribute__((weak));
+extern const u8 kallsyms_names[] __attribute__((weak));
 
-extern u8 kallsyms_token_table[] __attribute__((weak));
-extern u16 kallsyms_token_index[] __attribute__((weak));
+extern const u8 kallsyms_token_table[] __attribute__((weak));
+extern const u16 kallsyms_token_index[] __attribute__((weak));
 
-extern unsigned long kallsyms_markers[] __attribute__((weak));
+extern const unsigned long kallsyms_markers[] __attribute__((weak));
 
 static inline int is_kernel_inittext(unsigned long addr)
 {
@@ -84,7 +84,7 @@ static int is_ksym_addr(unsigned long addr)
 static unsigned int kallsyms_expand_symbol(unsigned int off, char *result)
 {
 	int len, skipped_first = 0;
-	u8 *tptr, *data;
+	const u8 *tptr, *data;
 
 	/* get the compressed symbol length from the first symbol byte */
 	data = &kallsyms_names[off];
@@ -132,7 +132,7 @@ static char kallsyms_get_symbol_type(unsigned int off)
  * kallsyms array */
 static unsigned int get_symbol_offset(unsigned long pos)
 {
-	u8 *name;
+	const u8 *name;
 	int i;
 
 	/* use the closest marker we have. We have markers every 256 positions,
diff --git a/trunk/scripts/kallsyms.c b/trunk/scripts/kallsyms.c
index f359b730c2c5..8b809b264d18 100644
--- a/trunk/scripts/kallsyms.c
+++ b/trunk/scripts/kallsyms.c
@@ -265,7 +265,7 @@ static void write_src(void)
 	printf("#define ALGN .align 4\n");
 	printf("#endif\n");
 
-	printf(".data\n");
+	printf("\t.section .rodata, \"a\"\n");
 
 	/* Provide proper symbols relocatability by their '_text'
 	 * relativeness.  The symbol names cannot be used to construct