Messages in this thread Patch in this message | | | Date | Fri, 02 Jun 2006 13:54:03 +0200 | From | "Jan Beulich" <> | Subject | [PATCH 2/2] allow unwinder to build without module support being configured |
| |
Add proper conditionals to be able to build with CONFIG_MODULES=n.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: 2.6.17-rc5-unwind-generic/include/linux/unwind.h =================================================================== --- 2.6.17-rc5-unwind-generic.orig/include/linux/unwind.h 2006-06-02 13:23:30.000000000 +0200 +++ 2.6.17-rc5-unwind-generic/include/linux/unwind.h 2006-06-02 13:32:48.000000000 +0200 @@ -29,12 +29,16 @@ struct module; */ extern void unwind_init(void); +#ifdef CONFIG_MODULES + extern void *unwind_add_table(struct module *, const void *table_start, unsigned long table_size); extern void unwind_remove_table(void *handle, int init_only); +#endif + extern int unwind_init_frame_info(struct unwind_frame_info *, struct task_struct *, /*const*/ struct pt_regs *); @@ -72,6 +76,8 @@ struct unwind_frame_info {}; static inline void unwind_init(void) {} +#ifdef CONFIG_MODULES + static inline void *unwind_add_table(struct module *mod, const void *table_start, unsigned long table_size) @@ -79,6 +85,8 @@ static inline void *unwind_add_table(str return NULL; } +#endif + static inline void unwind_remove_table(void *handle, int init_only) { } Index: 2.6.17-rc5-unwind-generic/kernel/unwind.c =================================================================== --- 2.6.17-rc5-unwind-generic.orig/kernel/unwind.c 2006-06-02 13:23:30.000000000 +0200 +++ 2.6.17-rc5-unwind-generic/kernel/unwind.c 2006-06-02 13:32:48.000000000 +0200 @@ -172,6 +172,8 @@ void __init unwind_init(void) __start_unwind, __end_unwind - __start_unwind); } +#ifdef CONFIG_MODULES + /* Must be called with module_mutex held. */ void *unwind_add_table(struct module *module, const void *table_start, @@ -253,6 +255,8 @@ void unwind_remove_table(void *handle, i kfree(table); } +#endif /* CONFIG_MODULES */ + static uleb128_t get_uleb128(const u8 **pcur, const u8 *end) { const u8 *cur = *pcur;
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |