Skip to contentSkip to conversation

fix compile failure with non-modular builds

PATCH In review James Bottomley 2 participants 4 messages Sep 11, 2008 PA-RISC architecture

lore
Share & tools
lore

James Bottomley

author maintainer
#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.

Signed-off-by James Bottomley <[email protected]>
---
 arch/parisc/kernel/module.c   |   14 --------------
 include/asm-parisc/sections.h |   13 +++++++++++--
 2 files changed, 11 insertions(+), 16 deletions(-)
arch/parisc/kernel/module.c +0 -14
index 44138c3..fdacdd4 100644
@@ -47,9 +47,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/bug.h>
-#include <linux/uaccess.h>
 
-#include <asm/sections.h>
 #include <asm/unwind.h>
 
 #if 0

@@ -862,15 +860,3 @@ void module_arch_cleanup(struct module *mod)
 	deregister_unwind_table(mod);
 	module_bug_cleanup(mod);
 }
-
-#ifdef CONFIG_64BIT
-void *dereference_function_descriptor(void *ptr)
-{
-	Elf64_Fdesc *desc = ptr;
-	void *p;
-
-	if (!probe_kernel_address(&desc->addr, p))
-		ptr = p;
-	return ptr;
-}
-#endif
include/asm-parisc/sections.h +11 -2
index 9d13c35..b08f9f8 100644
@@ -1,12 +1,21 @@
 #ifndef _PARISC_SECTIONS_H
 #define _PARISC_SECTIONS_H
 
-/* nothing to see, move along */
+#include <linux/elf.h>
+#include <linux/uaccess.h>
 #include <asm-generic/sections.h>
 
 #ifdef CONFIG_64BIT
 #undef dereference_function_descriptor
-void *dereference_function_descriptor(void *);
+static inline void *dereference_function_descriptor(void *ptr)
+{
+	Elf64_Fdesc *desc = ptr;
+	void *p;
+
+	if (!probe_kernel_address(&desc->addr, p))
+		ptr = p;
+	return ptr;
+}
 #endif
 
 #endif
Signature · 1 line
1.5.6.5
#1 lore raw
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.

Signed-off-by James Bottomley <[email protected]>

Ack. Want to just fire it off to the big penguin, or should I submit it with the unwind fix in the meantime?

r, Kyle

author maintainer
#2 lore raw
Quoted 7 lines · Kyle McMartin
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 5 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.

Signed-off-by James Bottomley <[email protected]>

Ack. Want to just fire it off to the big penguin, or should I submit it with the unwind fix in the meantime?

We have this, that and the RTC fix ... I'd say that's enough to maintain a tree.

James

#3 lore raw
Quoted 12 lines · James Bottomley
Quoted 11 lines · Kyle McMartin
Quoted 10 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.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by James Bottomley <[email protected]>

Ack. Want to just fire it off to the big penguin, or should I submit it with the unwind fix in the meantime?

We have this, that and the RTC fix ... I'd say that's enough to maintain a tree.

Yeah, I cherrypicked from the parisc-2.6 branch for 2.6.27 (crap, haven't pushed the tree out, my bad.) I didn't want to 'rename' the tree since sfr is using "parisc-2.6" to mean "parisc-next-2.6" right now.

I'll push out a parisc-2.6.27.git tree later today.

r, Kyle