Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d9c25dd authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

headers: move module_bug_finalize()/module_bug_cleanup() definitions into module.h 



They're in linux/bug.h at present, which causes include order tangles.  In
particular, linux/bug.h cannot be used by linux/atomic.h because,
according to Nikanth:

linux/bug.h pulls in linux/module.h => linux/spinlock.h => asm/spinlock.h
(which uses atomic_inc) => asm/atomic.h.

bug.h is a pretty low-level thing and module.h is a higher-level thing,
IMO.

Cc: Nikanth Karthikesan <knikanth@novell.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4938d7e0

include/linux/bug.h

+0 −12
Original line number Diff line number Diff line 
#ifndef _LINUX_BUG_H

#define _LINUX_BUG_H



#include <linux/module.h>

#include <asm/bug.h>



enum bug_trap_type {
@@ -24,10 +23,6 @@ const struct bug_entry *find_bug(unsigned long bugaddr); 


enum bug_trap_type report_bug(unsigned long bug_addr, struct pt_regs *regs);



int  module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,

			 struct module *);

void module_bug_cleanup(struct module *);



/* These are defined by the architecture */

int is_valid_bugaddr(unsigned long addr);
@@ -38,13 +33,6 @@ static inline enum bug_trap_type report_bug(unsigned long bug_addr, 
{

	return BUG_TRAP_TYPE_BUG;

}

static inline int  module_bug_finalize(const Elf_Ehdr *hdr,

					const Elf_Shdr *sechdrs,

					struct module *mod)

{

	return 0;

}

static inline void module_bug_cleanup(struct module *mod) {}



#endif	/* CONFIG_GENERIC_BUG */

#endif	/* _LINUX_BUG_H */

include/linux/module.h

+17 −0
Original line number Diff line number Diff line
@@ -697,4 +697,21 @@ static inline void module_remove_modinfo_attrs(struct module *mod) 


#define __MODULE_STRING(x) __stringify(x)





#ifdef CONFIG_GENERIC_BUG

int  module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,

			 struct module *);

void module_bug_cleanup(struct module *);



#else	/* !CONFIG_GENERIC_BUG */



static inline int  module_bug_finalize(const Elf_Ehdr *hdr,

					const Elf_Shdr *sechdrs,

					struct module *mod)

{

	return 0;

}

static inline void module_bug_cleanup(struct module *mod) {}

#endif	/* CONFIG_GENERIC_BUG */



#endif /* _LINUX_MODULE_H */