diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2009-03-15 16:49:55 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-04-02 04:16:27 +0000 |
| commit | b609308e1415efebdf79ebd553f4dd47b0ff2722 (patch) | |
| tree | 49755dcda956ee0ce75d6f3d3e38e4d54245f799 /arch/parisc | |
| parent | bf589a349b9a41ea202ddb8115b18f543b944bfd (diff) | |
| download | linux-3.10-b609308e1415efebdf79ebd553f4dd47b0ff2722.tar.gz linux-3.10-b609308e1415efebdf79ebd553f4dd47b0ff2722.tar.bz2 linux-3.10-b609308e1415efebdf79ebd553f4dd47b0ff2722.zip | |
parisc: move dereference_function_descriptor to process.c
Commit deac93df26b20cf8438339b5935b5f5643bc30c9 fixed up printing
of %pF on parisc, but added the dereference_function_descriptor
prototype to module.c... this isn't a particularly wise idea as
module.c might not always be compiled.
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/module.c | 14 | ||||
| -rw-r--r-- | arch/parisc/kernel/process.c | 15 |
2 files changed, 14 insertions, 15 deletions
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index 3439cbd896b..ecd1c502444 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -61,9 +61,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 @@ -912,15 +910,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 diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index ad585fd7748..029831dfce3 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -46,14 +46,15 @@ #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/kallsyms.h> +#include <linux/uaccess.h> #include <asm/io.h> #include <asm/asm-offsets.h> #include <asm/pdc.h> #include <asm/pdc_chassis.h> #include <asm/pgalloc.h> -#include <asm/uaccess.h> #include <asm/unwind.h> +#include <asm/sections.h> /* * The idle thread. There's no useful work to be @@ -390,3 +391,15 @@ get_wchan(struct task_struct *p) } while (count++ < 16); return 0; } + +#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 |