Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757353Ab0FDWuq (ORCPT ); Fri, 4 Jun 2010 18:50:46 -0400 Received: from mga01.intel.com ([192.55.52.88]:44590 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751530Ab0FDWuo convert rfc822-to-8bit (ORCPT ); Fri, 4 Jun 2010 18:50:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,363,1272870000"; d="scan'208";a="804883524" From: "Luck, Tony" To: Linus Torvalds CC: Rusty Russell , Dave Young , Stephen Rothwell , "linux-next@vger.kernel.org" , LKML Date: Fri, 4 Jun 2010 15:50:41 -0700 Subject: RE: linux-next: Tree for June 3 Thread-Topic: linux-next: Tree for June 3 Thread-Index: AcsEMsfjJb3LN2sZRwWRDfzzClcI6gAAxBiw Message-ID: <987664A83D2D224EAE907B061CE93D530114C3DE4D@orsmsx505.amr.corp.intel.com> References: <20100603134753.710a64b3.sfr@canb.auug.org.au> <201006032222.57411.rusty@rustcorp.com.au> <987664A83D2D224EAE907B061CE93D530114C3DC47@orsmsx505.amr.corp.intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1033 Lines: 35 > Does this fix it? I stopped looking for other possible causes when I found > this one. It gets rid of the oops. So that's good. Something is still hokey in linux-next land though because no modules get loaded. So no ehci/uhci available :-( No obvious looking error messages on the console. -Tony --- kernel/module.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 69a3f12..9a0b275 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -2653,9 +2653,10 @@ static struct module *load_module(void __user *umod, module_unload_free(mod); free_module: module_deallocate(mod, &info); + mod = ERR_PTR(err); free_copy: free_copy(&info); - return ERR_PTR(err); + return mod; } /* Call module constructors. */ -- 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/