Re: linux-next: Tree for August 14 (sysfs/acpi errors)

[Sam Ravnborg]

On Sat, Aug 16, 2008 at 01:47:40PM +1000, Rusty Russell wrote:
> On Saturday 16 August 2008 12:57:57 Andi Kleen wrote:
> > >> Extract is:
> > >>
> > >> XXX adding modparam:'acpi.power_nocheck' 34 (ffffffff806a4cf0)
> > >
> > > ...
> > >
> > >> XXX adding modparam:'acpi.acpica_version' 45 (ffffffff806a4ea8)
> > >
> > > Two different "modules" use the same prefix, which does not work with
> > > the current logic, they need to live next to each other in the sequence
> > > of options.
> >
> > Sequence of options being defined by link order?
> 
> Simplest fix is to shuffle Makefile.  But better is to create an acpi "module"
> so the namespacing just works, something like below.  Overriding MODULE_PREFIX
> only works for builtin code anyway.  (Which makes sense: moving a parameter
> from one module to another isn't a change we can cover up).
> 
> (Sam: foo-objs-y would make this neater)

foo-y is even neater and works today.

> 
> diff -r 5f7194400572 drivers/acpi/Makefile
> --- a/drivers/acpi/Makefile	Sat Aug 16 13:23:26 2008 +1000
> +++ b/drivers/acpi/Makefile	Sat Aug 16 13:44:17 2008 +1000
> @@ -21,10 +21,18 @@ obj-$(CONFIG_X86)		+= blacklist.o
>  #
>  # ACPI Core Subsystem (Interpreter)
>  #
> -obj-y				+= osl.o utils.o reboot.o\
> +obj-y				+= osl.o utils.o reboot.o acpi.o \
>  				   dispatcher/ events/ executer/ hardware/ \
>  				   namespace/ parser/ resources/ tables/ \
>  				   utilities/
> +
> +# "acpi." module_param namespace.
> +ifdef CONFIG_ACPI_POWER
> +acpi-objs	+= power.o
> +endif

becomes:
acpi-y += power.o

> +ifdef CONFIG_ACPI_SYSTEM
> +acpi-objs	+= system.o event.o
> +endif
acpi-y += system.o event.o

[Assuming both config symbols are bool]

	Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/