The patch titled
allow unwinder to build without module support being configured
has been added to the -mm tree. Its filename is
allow-unwinder-to-build-without-module-support.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: allow unwinder to build without module support being configured
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
Add proper conditionals to be able to build with CONFIG_MODULES=n.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/unwind.h | 8 ++++++++
kernel/unwind.c | 4 ++++
2 files changed, 12 insertions(+)
diff -puN include/linux/unwind.h~allow-unwinder-to-build-without-module-support include/linux/unwind.h
--- devel/include/linux/unwind.h~allow-unwinder-to-build-without-module-support 2006-06-02 11:13:45.000000000 -0700
+++ devel-akpm/include/linux/unwind.h 2006-06-02 11:13:45.000000000 -0700
@@ -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)
{
}
diff -puN kernel/unwind.c~allow-unwinder-to-build-without-module-support kernel/unwind.c
--- devel/kernel/unwind.c~allow-unwinder-to-build-without-module-support 2006-06-02 11:13:45.000000000 -0700
+++ devel-akpm/kernel/unwind.c 2006-06-02 11:13:45.000000000 -0700
@@ -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;
_
Patches currently in -mm which might be from jbeulich@xxxxxxxxxx are
origin.patch
dprintk-adjustments-to-cpufreq-nforce2.patch
dprintk-adjustments-to-cpufreq-speedstep-centrino.patch
cpufreq-dprintk-adjustments.patch
mpt_interrupt-should-return-irq_none-when.patch
fall-back-to-old-style-call-trace-if-no-unwinding.patch
allow-unwinder-to-build-without-module-support.patch
fix-x86-microcode-driver-handling-of-multiple-matching.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
adjust-handle_irr_event-return-type.patch
lock-validator-irqtrace-cleanup-include-asm-x86_64-irqflagsh.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
