diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-09-09 18:56:47 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-09-10 13:46:32 -0400 |
commit | 4611a771fc8e5ad77d27f25268846abb425101a0 (patch) | |
tree | 0c897e70d6ae6a810dfa2f4be8a6aaba7d33e8f1 /arch/ia64/kernel | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) |
[IA64] fix compile failure with non modular builds
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 definitions of struct fdesc and struct
got_val have been lifted out of modules.c and put in asm/elf.h where
they belong.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/module.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index 545626f66a4c..aaa7d901521f 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c | |||
@@ -31,11 +31,9 @@ | |||
31 | #include <linux/elf.h> | 31 | #include <linux/elf.h> |
32 | #include <linux/moduleloader.h> | 32 | #include <linux/moduleloader.h> |
33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
34 | #include <linux/uaccess.h> | ||
35 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
36 | 35 | ||
37 | #include <asm/patch.h> | 36 | #include <asm/patch.h> |
38 | #include <asm/sections.h> | ||
39 | #include <asm/unaligned.h> | 37 | #include <asm/unaligned.h> |
40 | 38 | ||
41 | #define ARCH_MODULE_DEBUG 0 | 39 | #define ARCH_MODULE_DEBUG 0 |
@@ -137,15 +135,6 @@ static const char *reloc_name[256] = { | |||
137 | 135 | ||
138 | #undef N | 136 | #undef N |
139 | 137 | ||
140 | struct got_entry { | ||
141 | uint64_t val; | ||
142 | }; | ||
143 | |||
144 | struct fdesc { | ||
145 | uint64_t ip; | ||
146 | uint64_t gp; | ||
147 | }; | ||
148 | |||
149 | /* Opaque struct for insns, to protect against derefs. */ | 138 | /* Opaque struct for insns, to protect against derefs. */ |
150 | struct insn; | 139 | struct insn; |
151 | 140 | ||
@@ -943,13 +932,3 @@ module_arch_cleanup (struct module *mod) | |||
943 | if (mod->arch.core_unw_table) | 932 | if (mod->arch.core_unw_table) |
944 | unw_remove_unwind_table(mod->arch.core_unw_table); | 933 | unw_remove_unwind_table(mod->arch.core_unw_table); |
945 | } | 934 | } |
946 | |||
947 | void *dereference_function_descriptor(void *ptr) | ||
948 | { | ||
949 | struct fdesc *desc = ptr; | ||
950 | void *p; | ||
951 | |||
952 | if (!probe_kernel_address(&desc->ip, p)) | ||
953 | ptr = p; | ||
954 | return ptr; | ||
955 | } | ||