linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rusty Russell <rusty@rustcorp.com.au>
To: Andi Kleen <ak@linux.intel.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>,
	Randy Dunlap <randy.dunlap@oracle.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>, gregkh <greg@kroah.com>,
	linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	linux-acpi@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>
Subject: Re: linux-next: Tree for August 14 (sysfs/acpi errors)
Date: Sat, 16 Aug 2008 13:47:40 +1000	[thread overview]
Message-ID: <200808161347.41253.rusty@rustcorp.com.au> (raw)
In-Reply-To: <48A64235.2030108@linux.intel.com>

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)

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
+ifdef CONFIG_ACPI_SYSTEM
+acpi-objs	+= system.o event.o
+endif
 
 #
 # ACPI Bus and Device Drivers
@@ -49,11 +57,9 @@ obj-$(CONFIG_ACPI_VIDEO)	+= video.o
 obj-$(CONFIG_ACPI_VIDEO)	+= video.o
 obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
 obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
-obj-$(CONFIG_ACPI_POWER)	+= power.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
-obj-$(CONFIG_ACPI_SYSTEM)	+= system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)	+= debug.o
 obj-$(CONFIG_ACPI_NUMA)		+= numa.o
 obj-$(CONFIG_ACPI_WMI)		+= wmi.o
diff -r 5f7194400572 drivers/acpi/system.c
--- a/drivers/acpi/system.c	Sat Aug 16 13:23:26 2008 +1000
+++ b/drivers/acpi/system.c	Sat Aug 16 13:44:17 2008 +1000
@@ -33,10 +33,6 @@
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("system");
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
 
 #define ACPI_SYSTEM_CLASS		"system"
 #define ACPI_SYSTEM_DEVICE_NAME		"System"

  parent reply	other threads:[~2008-08-16  3:48 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-14  7:29 linux-next: Tree for August 14 Stephen Rothwell
2008-08-14  9:16 ` Geert Uytterhoeven
2008-08-14 15:34 ` linux-next: Tree for August 14 (bug: cciss) Randy Dunlap
2008-08-14 15:38 ` linux-next: Tree for August 14 (sysfs/acpi errors) Randy Dunlap
2008-08-14 15:44   ` Greg KH
2008-08-15  2:56     ` Andi Kleen
2008-08-15  3:09       ` Zhang Rui
2008-08-15  3:11         ` Andi Kleen
2008-08-15  2:41   ` Zhang Rui
2008-08-15  2:46     ` Randy Dunlap
2008-08-15 11:27   ` Kay Sievers
2008-08-15 15:58     ` Randy Dunlap
2008-08-16  2:36       ` Kay Sievers
2008-08-16  2:57         ` Andi Kleen
2008-08-16  3:19           ` Kay Sievers
2008-08-16  3:48             ` Andi Kleen
2008-08-16  4:47               ` Greg KH
2008-08-17  2:30                 ` Andi Kleen
2008-08-17  3:40                   ` Greg KH
2008-08-17  3:53                     ` Andi Kleen
2008-08-18  3:48                       ` Greg KH
2008-08-18  9:43                         ` Rusty Russell
2008-08-18 10:58                           ` Kay Sievers
2008-08-17  5:13                   ` Rusty Russell
2008-09-24  7:59                     ` Len Brown
2008-09-25  2:39                       ` Rusty Russell
2008-08-16  3:47           ` Rusty Russell [this message]
2008-08-16  3:49             ` Andi Kleen
2008-08-16  5:25             ` Sam Ravnborg
2008-08-16  5:56               ` Rusty Russell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200808161347.41253.rusty@rustcorp.com.au \
    --to=rusty@rustcorp.com.au \
    --cc=ak@linux.intel.com \
    --cc=greg@kroah.com \
    --cc=kay.sievers@vrfy.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    --cc=sam@ravnborg.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).