Skip to contentSkip to conversation

fix compile failure with non modular builds

PATCH In review James Bottomley 3 participants 5 messages Sep 10, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compile failure with non modular builds

commit deac93df26b20cf8438339b5935b5f5643bc30c9

Author: James Bottomley <[email protected]>
Date:   Wed Sep 3 20:43:36 2008 -0500

lib: Correct printk %pF to work on all architectures

Broke the non modular builds by moving an essential function into modules.c. Fix this by moving it out again and into asm/sections.h as an inline. To do this, the definition of struct ppc64_opd_entry has been lifted out of modules.c and put in asm/elf.h where it belongs.

---

arch/powerpc/include/asm/elf.h +7 -0
index 80d1f39..64c6ee2 100644
@@ -409,6 +409,13 @@ do {									\
 /* Keep this the last entry.  */
 #define R_PPC64_NUM		107
 
+/* There's actually a third entry here, but it's unused */
+struct ppc64_opd_entry
+{
+	unsigned long funcaddr;
+	unsigned long r2;
+};
+
 #ifdef  __KERNEL__
 
 #ifdef CONFIG_SPU_BASE
arch/powerpc/include/asm/sections.h +11 -1
index 7710e9e..07956f3 100644
@@ -2,6 +2,8 @@
 #define _ASM_POWERPC_SECTIONS_H
 #ifdef __KERNEL__
 
+#include <linux/elf.h>
+#include <linux/uaccess.h>
 #include <asm-generic/sections.h>
 
 #ifdef __powerpc64__
@@ -17,7 +19,15 @@ static inline int in_kernel_text(unsigned long addr)
 }
 
 #undef dereference_function_descriptor
-void *dereference_function_descriptor(void *);
+static inline void *dereference_function_descriptor(void *ptr)
+{
+	struct ppc64_opd_entry *desc = ptr;
+	void *p;
+
+	if (!probe_kernel_address(&desc->funcaddr, p))
+		ptr = p;
+	return ptr;
+}
 
 #endif
 
arch/powerpc/kernel/module_64.c +0 -19
index ad79de2..1af2377 100644
@@ -21,9 +21,7 @@
 #include <linux/err.h>
 #include <linux/vmalloc.h>
 #include <linux/bug.h>
-#include <linux/uaccess.h>
 #include <asm/module.h>
-#include <asm/sections.h>
 #include <asm/firmware.h>
 #include <asm/code-patching.h>
 #include <linux/sort.h>
@@ -43,13 +41,6 @@
 #define DEBUGP(fmt , ...)
 #endif
 
-/* There's actually a third entry here, but it's unused */
-struct ppc64_opd_entry
-{
-	unsigned long funcaddr;
-	unsigned long r2;
-};
-
 /* Like PPC32, we need little trampolines to do > 24-bit jumps (into
    the kernel itself).  But on PPC64, these need to be used for every
    jump, actually, to reset r2 (TOC+0x8000). */
@@ -452,13 +443,3 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 
 	return 0;
 }
-
-void *dereference_function_descriptor(void *ptr)
-{
-	struct ppc64_opd_entry *desc = ptr;
-	void *p;
-
-	if (!probe_kernel_address(&desc->funcaddr, p))
-		ptr = p;
-	return ptr;
-}
#1 lore raw
Quoted 4 lines · James Bottomley

commit deac93df26b20cf8438339b5935b5f5643bc30c9

Author: James Bottomley <[email protected]>
Date:   Wed Sep 3 20:43:36 2008 -0500
Quoted 8 lines

lib: Correct printk %pF to work on all architectures

Broke the non modular builds by moving an essential function into modules.c. Fix this by moving it out again and into asm/sections.h as an inline. To do this, the definition of struct ppc64_opd_entry has been lifted out of modules.c and put in asm/elf.h where it belongs.

Ouch. Ack.

Ben.

Quoted 92 lines

---

arch/powerpc/include/asm/elf.h +7 -0
index 80d1f39..64c6ee2 100644
@@ -409,6 +409,13 @@ do {									\
 /* Keep this the last entry.  */
 #define R_PPC64_NUM		107
 
+/* There's actually a third entry here, but it's unused */
+struct ppc64_opd_entry
+{
+	unsigned long funcaddr;
+	unsigned long r2;
+};
+
 #ifdef  __KERNEL__
 
 #ifdef CONFIG_SPU_BASE
arch/powerpc/include/asm/sections.h +11 -1
index 7710e9e..07956f3 100644
@@ -2,6 +2,8 @@
 #define _ASM_POWERPC_SECTIONS_H
 #ifdef __KERNEL__
 
+#include <linux/elf.h>
+#include <linux/uaccess.h>
 #include <asm-generic/sections.h>
 
 #ifdef __powerpc64__
@@ -17,7 +19,15 @@ static inline int in_kernel_text(unsigned long addr)
 }
 
 #undef dereference_function_descriptor
-void *dereference_function_descriptor(void *);
+static inline void *dereference_function_descriptor(void *ptr)
+{
+	struct ppc64_opd_entry *desc = ptr;
+	void *p;
+
+	if (!probe_kernel_address(&desc->funcaddr, p))
+		ptr = p;
+	return ptr;
+}
 
 #endif
 
arch/powerpc/kernel/module_64.c +0 -19
index ad79de2..1af2377 100644
@@ -21,9 +21,7 @@
 #include <linux/err.h>
 #include <linux/vmalloc.h>
 #include <linux/bug.h>
-#include <linux/uaccess.h>
 #include <asm/module.h>
-#include <asm/sections.h>
 #include <asm/firmware.h>
 #include <asm/code-patching.h>
 #include <linux/sort.h>
@@ -43,13 +41,6 @@
 #define DEBUGP(fmt , ...)
 #endif
 
-/* There's actually a third entry here, but it's unused */
-struct ppc64_opd_entry
-{
-	unsigned long funcaddr;
-	unsigned long r2;
-};
-
 /* Like PPC32, we need little trampolines to do > 24-bit jumps (into
    the kernel itself).  But on PPC64, these need to be used for every
    jump, actually, to reset r2 (TOC+0x8000). */
@@ -452,13 +443,3 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 
 	return 0;
 }
-
-void *dereference_function_descriptor(void *ptr)
-{
-	struct ppc64_opd_entry *desc = ptr;
-	void *p;
-
-	if (!probe_kernel_address(&desc->funcaddr, p))
-		ptr = p;
-	return ptr;
-}
#2 lore raw
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 6 lines · James Bottomley

commit deac93df26b20cf8438339b5935b5f5643bc30c9

Author: James Bottomley <[email protected]>
Date:   Wed Sep 3 20:43:36 2008 -0500

lib: Correct printk %pF to work on all architectures

Quoted 8 lines
Quoted 6 lines

Broke the non modular builds by moving an essential function into modules.c. Fix this by moving it out again and into asm/sections.h as an inline. To do this, the definition of struct ppc64_opd_entry has been lifted out of modules.c and put in asm/elf.h where it belongs.

Ouch. Ack.

Actually, this is for your powerpc tree, so we actually run it through some extended config testing this time ...

James

#3 lore raw
Quoted 13 lines · James Bottomley
Quoted 12 lines · Benjamin Herrenschmidt
Quoted 11 lines · James Bottomley

commit deac93df26b20cf8438339b5935b5f5643bc30c9

Author: James Bottomley <[email protected]>
Date:   Wed Sep 3 20:43:36 2008 -0500

lib: Correct printk %pF to work on all architectures

Broke the non modular builds by moving an essential function into modules.c. Fix this by moving it out again and into asm/sections.h as an inline. To do this, the definition of struct ppc64_opd_entry has been lifted out of modules.c and put in asm/elf.h where it belongs.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Ouch. Ack.

Actually, this is for your powerpc tree, so we actually run it through some extended config testing this time ...

Or rather Paul's tree :-)

He's on the way to Portland and I'm flying out tomorrow, but I'll make sure it gets picked up.

I must admit that none of my test configs I think has module support turned off (even if I tend to have all the stuff I need built-in).

Cheers,
Ben.

#4 lore raw
Quoted 3 lines · On Wed, 10 Sep 2008 10:46:39 +1000 Benjamin Herrenschmidt…

I must admit that none of my test configs I think has module support turned off (even if I tend to have all the stuff I need built-in).

And our allnoconfig turns off CONFIG_64BIT, so we didn't see it in any of our automated builds. :-(

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/