Remove remaining unwinder code
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Gabor Gombas <gombasg@sztaki.hu> Cc: Jan Beulich <jbeulich@novell.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Ingo Molnar <mingo@elte.hu>, Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
eaccbfa564
commit
f1883f86de
|
@ -1,13 +0,0 @@
|
||||||
#ifndef _ASM_X86_UNWIND_H
|
|
||||||
#define _ASM_X86_UNWIND_H
|
|
||||||
|
|
||||||
#define UNW_PC(frame) ((void)(frame), 0UL)
|
|
||||||
#define UNW_SP(frame) ((void)(frame), 0UL)
|
|
||||||
#define UNW_FP(frame) ((void)(frame), 0UL)
|
|
||||||
|
|
||||||
static inline int arch_unw_user_mode(const void *info)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _ASM_X86_UNWIND_H */
|
|
|
@ -20,7 +20,6 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/ptrace.h>
|
#include <linux/ptrace.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/unwind.h>
|
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/kexec.h>
|
#include <linux/kexec.h>
|
||||||
|
@ -51,7 +50,6 @@
|
||||||
#include <asm/debugreg.h>
|
#include <asm/debugreg.h>
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/unwind.h>
|
|
||||||
#include <asm/traps.h>
|
#include <asm/traps.h>
|
||||||
#include <asm/desc.h>
|
#include <asm/desc.h>
|
||||||
#include <asm/i387.h>
|
#include <asm/i387.h>
|
||||||
|
|
|
@ -294,9 +294,6 @@ struct module
|
||||||
/* The size of the executable code in each section. */
|
/* The size of the executable code in each section. */
|
||||||
unsigned int init_text_size, core_text_size;
|
unsigned int init_text_size, core_text_size;
|
||||||
|
|
||||||
/* The handle returned from unwind_add_table. */
|
|
||||||
void *unwind_info;
|
|
||||||
|
|
||||||
/* Arch-specific module values */
|
/* Arch-specific module values */
|
||||||
struct mod_arch_specific arch;
|
struct mod_arch_specific arch;
|
||||||
|
|
||||||
|
|
|
@ -1,68 +0,0 @@
|
||||||
#ifndef _LINUX_UNWIND_H
|
|
||||||
#define _LINUX_UNWIND_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2002-2006 Novell, Inc.
|
|
||||||
* Jan Beulich <jbeulich@novell.com>
|
|
||||||
* This code is released under version 2 of the GNU GPL.
|
|
||||||
*
|
|
||||||
* A simple API for unwinding kernel stacks. This is used for
|
|
||||||
* debugging and error reporting purposes. The kernel doesn't need
|
|
||||||
* full-blown stack unwinding with all the bells and whistles, so there
|
|
||||||
* is not much point in implementing the full Dwarf2 unwind API.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct module;
|
|
||||||
|
|
||||||
struct unwind_frame_info {};
|
|
||||||
|
|
||||||
static inline void unwind_init(void) {}
|
|
||||||
static inline void unwind_setup(void) {}
|
|
||||||
|
|
||||||
#ifdef CONFIG_MODULES
|
|
||||||
|
|
||||||
static inline void *unwind_add_table(struct module *mod,
|
|
||||||
const void *table_start,
|
|
||||||
unsigned long table_size)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void unwind_remove_table(void *handle, int init_only)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline int unwind_init_frame_info(struct unwind_frame_info *info,
|
|
||||||
struct task_struct *tsk,
|
|
||||||
const struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int unwind_init_blocked(struct unwind_frame_info *info,
|
|
||||||
struct task_struct *tsk)
|
|
||||||
{
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int unwind_init_running(struct unwind_frame_info *info,
|
|
||||||
asmlinkage int (*cb)(struct unwind_frame_info *,
|
|
||||||
void *arg),
|
|
||||||
void *arg)
|
|
||||||
{
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int unwind(struct unwind_frame_info *info)
|
|
||||||
{
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int unwind_to_user(struct unwind_frame_info *info)
|
|
||||||
{
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _LINUX_UNWIND_H */
|
|
|
@ -50,7 +50,6 @@
|
||||||
#include <linux/rmap.h>
|
#include <linux/rmap.h>
|
||||||
#include <linux/mempolicy.h>
|
#include <linux/mempolicy.h>
|
||||||
#include <linux/key.h>
|
#include <linux/key.h>
|
||||||
#include <linux/unwind.h>
|
|
||||||
#include <linux/buffer_head.h>
|
#include <linux/buffer_head.h>
|
||||||
#include <linux/page_cgroup.h>
|
#include <linux/page_cgroup.h>
|
||||||
#include <linux/debug_locks.h>
|
#include <linux/debug_locks.h>
|
||||||
|
@ -537,7 +536,6 @@ asmlinkage void __init start_kernel(void)
|
||||||
* Need to run as early as possible, to initialize the
|
* Need to run as early as possible, to initialize the
|
||||||
* lockdep hash:
|
* lockdep hash:
|
||||||
*/
|
*/
|
||||||
unwind_init();
|
|
||||||
lockdep_init();
|
lockdep_init();
|
||||||
debug_objects_early_init();
|
debug_objects_early_init();
|
||||||
cgroup_init_early();
|
cgroup_init_early();
|
||||||
|
@ -559,7 +557,6 @@ asmlinkage void __init start_kernel(void)
|
||||||
setup_arch(&command_line);
|
setup_arch(&command_line);
|
||||||
mm_init_owner(&init_mm, &init_task);
|
mm_init_owner(&init_mm, &init_task);
|
||||||
setup_command_line(command_line);
|
setup_command_line(command_line);
|
||||||
unwind_setup();
|
|
||||||
setup_per_cpu_areas();
|
setup_per_cpu_areas();
|
||||||
setup_nr_cpu_ids();
|
setup_nr_cpu_ids();
|
||||||
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
|
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/unwind.h>
|
|
||||||
#include <linux/rculist.h>
|
#include <linux/rculist.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
|
@ -1449,8 +1448,6 @@ static void free_module(struct module *mod)
|
||||||
remove_sect_attrs(mod);
|
remove_sect_attrs(mod);
|
||||||
mod_kobject_remove(mod);
|
mod_kobject_remove(mod);
|
||||||
|
|
||||||
unwind_remove_table(mod->unwind_info, 0);
|
|
||||||
|
|
||||||
/* Arch-specific cleanup. */
|
/* Arch-specific cleanup. */
|
||||||
module_arch_cleanup(mod);
|
module_arch_cleanup(mod);
|
||||||
|
|
||||||
|
@ -1867,7 +1864,6 @@ static noinline struct module *load_module(void __user *umod,
|
||||||
unsigned int symindex = 0;
|
unsigned int symindex = 0;
|
||||||
unsigned int strindex = 0;
|
unsigned int strindex = 0;
|
||||||
unsigned int modindex, versindex, infoindex, pcpuindex;
|
unsigned int modindex, versindex, infoindex, pcpuindex;
|
||||||
unsigned int unwindex = 0;
|
|
||||||
unsigned int num_kp, num_mcount;
|
unsigned int num_kp, num_mcount;
|
||||||
struct kernel_param *kp;
|
struct kernel_param *kp;
|
||||||
struct module *mod;
|
struct module *mod;
|
||||||
|
@ -1957,9 +1953,6 @@ static noinline struct module *load_module(void __user *umod,
|
||||||
versindex = find_sec(hdr, sechdrs, secstrings, "__versions");
|
versindex = find_sec(hdr, sechdrs, secstrings, "__versions");
|
||||||
infoindex = find_sec(hdr, sechdrs, secstrings, ".modinfo");
|
infoindex = find_sec(hdr, sechdrs, secstrings, ".modinfo");
|
||||||
pcpuindex = find_pcpusec(hdr, sechdrs, secstrings);
|
pcpuindex = find_pcpusec(hdr, sechdrs, secstrings);
|
||||||
#ifdef ARCH_UNWIND_SECTION_NAME
|
|
||||||
unwindex = find_sec(hdr, sechdrs, secstrings, ARCH_UNWIND_SECTION_NAME);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Don't keep modinfo and version sections. */
|
/* Don't keep modinfo and version sections. */
|
||||||
sechdrs[infoindex].sh_flags &= ~(unsigned long)SHF_ALLOC;
|
sechdrs[infoindex].sh_flags &= ~(unsigned long)SHF_ALLOC;
|
||||||
|
@ -1969,8 +1962,6 @@ static noinline struct module *load_module(void __user *umod,
|
||||||
sechdrs[symindex].sh_flags |= SHF_ALLOC;
|
sechdrs[symindex].sh_flags |= SHF_ALLOC;
|
||||||
sechdrs[strindex].sh_flags |= SHF_ALLOC;
|
sechdrs[strindex].sh_flags |= SHF_ALLOC;
|
||||||
#endif
|
#endif
|
||||||
if (unwindex)
|
|
||||||
sechdrs[unwindex].sh_flags |= SHF_ALLOC;
|
|
||||||
|
|
||||||
/* Check module struct version now, before we try to use module. */
|
/* Check module struct version now, before we try to use module. */
|
||||||
if (!check_modstruct_version(sechdrs, versindex, mod)) {
|
if (!check_modstruct_version(sechdrs, versindex, mod)) {
|
||||||
|
@ -2267,11 +2258,6 @@ static noinline struct module *load_module(void __user *umod,
|
||||||
add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
|
add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
|
||||||
add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
|
add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
|
||||||
|
|
||||||
/* Size of section 0 is 0, so this works well if no unwind info. */
|
|
||||||
mod->unwind_info = unwind_add_table(mod,
|
|
||||||
(void *)sechdrs[unwindex].sh_addr,
|
|
||||||
sechdrs[unwindex].sh_size);
|
|
||||||
|
|
||||||
/* Get rid of temporary copy */
|
/* Get rid of temporary copy */
|
||||||
vfree(hdr);
|
vfree(hdr);
|
||||||
|
|
||||||
|
@ -2370,7 +2356,6 @@ sys_init_module(void __user *umod,
|
||||||
mutex_lock(&module_mutex);
|
mutex_lock(&module_mutex);
|
||||||
/* Drop initial reference. */
|
/* Drop initial reference. */
|
||||||
module_put(mod);
|
module_put(mod);
|
||||||
unwind_remove_table(mod->unwind_info, 1);
|
|
||||||
module_free(mod, mod->module_init);
|
module_free(mod, mod->module_init);
|
||||||
mod->module_init = NULL;
|
mod->module_init = NULL;
|
||||||
mod->init_size = 0;
|
mod->init_size = 0;
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/unwind.h>
|
|
||||||
#include <linux/stacktrace.h>
|
#include <linux/stacktrace.h>
|
||||||
#include <linux/kallsyms.h>
|
#include <linux/kallsyms.h>
|
||||||
#include <linux/fault-inject.h>
|
#include <linux/fault-inject.h>
|
||||||
|
|
Loading…
Reference in New Issue