Re: oom-killer problem

[Daniel Ritz <daniel.ritz-ml@swissonline.ch>]

On Tuesday 27 June 2006 07.39, Sam Ravnborg wrote:
> On Mon, Jun 26, 2006 at 04:05:40PM -0700, Linus Torvalds wrote:
> > On Tue, 27 Jun 2006, Daniel Ritz wrote:
> > >
> > > reverting the attached patch fixes the problem...
> > 
> > Michal, can you also confirm that just doing a simple revert of that one 
> > commit makes things work for you?
> > 
> > Sam, if I don't hear otherwise from you, and Michael confirms, I'll just 
> > revert it for now, and you can figure out how to fix it without breakage?
> I will try to find time during the weekend to track down the cause of
> this.
> But by reverting said patch you also have to revert:
> 566f81ca598f80de03e80a9a743e94b65b4e017e
> 
> This is the patch where make -rR is enabled and that one initally caused
> problems for ia64.
> 
> 	Sam
> 

this little something on top (instead of reverting the patch) also fixes the
problem for me. because the module name depends on the name of module.mod.o
it's necessary to call basename twice on that, otherwise the name ends up
being module.mod

maybe we could also define basetarget in Kbuild.include as:
	basetarget = $(basename $(basename $(notdir $@)))
but that might be too much...dunno


diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 3cb445c..e66f6dc 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -117,7 +117,7 @@ quiet_modtag := $(empty)   $(empty)
 $(obj-m)              : quiet_modtag := [M]
 
 # Default for not multi-part modules
-modname = $(basetarget)
+modname = $(basename $(basetarget))
 
 $(multi-objs-m)         : modname = $(modname-multi)
 $(multi-objs-m:.o=.i)   : modname = $(modname-multi)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index e83613e..17f3d31 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -72,7 +72,7 @@ # Declare generated files as targets for
 # Step 5), compile all *.mod.c files
 
 # modname is set to make c_flags define KBUILD_MODNAME
-modname = $(basetarget)
+modname = $(basename $(basetarget))
 
 quiet_cmd_cc_o_c = CC      $@
       cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE)	\



-
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/