Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index e83e2ea3b3e0..29aad349e0c4 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -321,7 +321,8 @@ module_alloc (unsigned long size)
 void
 module_free (struct module *mod, void *module_region)
 {
-        if (mod->arch.init_unw_table && module_region == mod->module_init) {
+        if (mod && mod->arch.init_unw_table &&
+            module_region == mod->module_init) {
                 unw_remove_unwind_table(mod->arch.init_unw_table);
                 mod->arch.init_unw_table = NULL;
         }