From 7cab4a0f91318f4e14f00ee5b93d622004d8510e Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Sun, 5 Mar 2006 00:16:26 +0100
Subject: [PATCH] --- yaml --- r: 23723 b: refs/heads/master c:
 9209aed0726c77ad13b8d83e73a3cf9f59a8c2b2 h: refs/heads/master i:   23721:
 4c6852ea965fcb2c6c97069e3277251ad5d11bb8   23719:
 927b7ef13e3bc184b9c6c079d4b2df2972c25005 v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/mod/modpost.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6f4a8a94477..60cd07b9357f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62070fa42c4ac23d1d71146a4c14702302b80245
+refs/heads/master: 9209aed0726c77ad13b8d83e73a3cf9f59a8c2b2
diff --git a/trunk/scripts/mod/modpost.c b/trunk/scripts/mod/modpost.c
index 5de3c63091e9..c4dc1d72d02e 100644
--- a/trunk/scripts/mod/modpost.c
+++ b/trunk/scripts/mod/modpost.c
@@ -483,7 +483,7 @@ static int strrcmp(const char *s, const char *sub)
  *   this pattern.
  *   The pattern is identified by:
  *   tosec   = .init.data
- *   fromsec = .data
+ *   fromsec = .data*
  *   atsym   =__param*
  *
  * Pattern 2:
@@ -512,7 +512,7 @@ static int secref_whitelist(const char *tosec, const char *fromsec,
 	/* Check for pattern 1 */
 	if (strcmp(tosec, ".init.data") != 0)
 		f1 = 0;
-	if (strcmp(fromsec, ".data") != 0)
+	if (strncmp(fromsec, ".data", strlen(".data")) != 0)
 		f1 = 0;
 	if (strncmp(atsym, "__param", strlen("__param")) != 0)
 		f1 = 0;
@@ -743,9 +743,12 @@ static int init_section_ref_ok(const char *name)
 	/* Absolute section names */
 	const char *namelist1[] = {
 		".init",
+		".opd",   /* see comment [OPD] at exit_section_ref_ok() */
+		".toc1",  /* used by ppc64 */
 		".stab",
 		".rodata",
 		".text.lock",
+		"__bug_table", /* used by powerpc for BUG() */
 		".pci_fixup_header",
 		".pci_fixup_final",
 		".pdr",
@@ -812,8 +815,10 @@ static int exit_section_ref_ok(const char *name)
 		".exit.data",
 		".init.text",
 		".opd", /* See comment [OPD] */
+		".toc1",  /* used by ppc64 */
 		".altinstructions",
 		".pdr",
+		"__bug_table", /* used by powerpc for BUG() */
 		".exitcall.exit",
 		".eh_frame",
 		".stab",