linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* RFC - ACPI source code re-org
@ 2008-12-31 10:51 Len Brown
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
  0 siblings, 1 reply; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel

This re-org splits the kernel built-in part of ACPI
from the ACPI drivers drivers.  Within built-in, it splits
the regular GPL Linux/ACPI files from the dual-licensed
ACPICA files.  Further, the private ACPICA headers
are moved in with the ACPICA files to prevent future
temptation to go behind the public ACPICA interfaces.
 
This series sits on top of the latest ACPICA code,
and is included on the 2.6.28-based acpica branch here:

git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git acpica

cheers,
-Len Brown, Intel Open Source Technology Center


^ permalink raw reply	[flat|nested] 33+ messages in thread

* [PATCH 01/15] ACPI: create kernel/acpi/
  2008-12-31 10:51 RFC - ACPI source code re-org Len Brown
@ 2008-12-31 10:51 ` Len Brown
  2008-12-31 10:51   ` [PATCH 02/15] ACPI: delete include/acpi/platform/ Len Brown
                     ` (14 more replies)
  0 siblings, 15 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

All of the Linux ACPI implementation used to live in drivers/acpi.
But most of the code isn't in drivers, and there was constant
confusion about what files are part of ACPICA.
So here we split ACPI code into three pieces.

kernel/acpi/*.c
	These are regular GPL Linux files
	that are statically built into the kernel.

kernel/acpi/acpica/*.c
	These implement the ACPICA Core Interpreter.
	They come from http://acpica.org/ and are
	dual licensed.  Linux shares them with
	other operating systems, such as BSD, and Solaris.

drivers/acpi/*.c
	Also regular GPL Linux files,
	these drivers implement OS policy, for
	there is no OS policy in the two bodies
	of code above.  A typical distro will
	include all of these drivers, for they
	are largely what make ACPI useful.

This change lays the groundwork for moving the
headers so that internal functions remain private.

Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/Makefile                              |   23 +--------
 drivers/acpi/dispatcher/Makefile                   |    9 ---
 drivers/acpi/events/Makefile                       |    9 ---
 drivers/acpi/executer/Makefile                     |   10 ----
 drivers/acpi/hardware/Makefile                     |    9 ---
 drivers/acpi/namespace/Makefile                    |   12 -----
 drivers/acpi/parser/Makefile                       |    8 ---
 drivers/acpi/resources/Makefile                    |   10 ----
 drivers/acpi/sleep/Makefile                        |    5 --
 drivers/acpi/tables/Makefile                       |    7 ---
 drivers/acpi/utilities/Makefile                    |    9 ---
 kernel/Makefile                                    |    1 +
 kernel/acpi/Makefile                               |   26 ++++++++++
 kernel/acpi/acpica/Makefile                        |   52 ++++++++++++++++++++
 .../dispatcher => kernel/acpi/acpica}/dsfield.c    |    0 
 .../dispatcher => kernel/acpi/acpica}/dsinit.c     |    0 
 .../dispatcher => kernel/acpi/acpica}/dsmethod.c   |    0 
 .../dispatcher => kernel/acpi/acpica}/dsmthdat.c   |    0 
 .../dispatcher => kernel/acpi/acpica}/dsobject.c   |    0 
 .../dispatcher => kernel/acpi/acpica}/dsopcode.c   |    0 
 .../dispatcher => kernel/acpi/acpica}/dsutils.c    |    0 
 .../dispatcher => kernel/acpi/acpica}/dswexec.c    |    0 
 .../dispatcher => kernel/acpi/acpica}/dswload.c    |    0 
 .../dispatcher => kernel/acpi/acpica}/dswscope.c   |    0 
 .../dispatcher => kernel/acpi/acpica}/dswstate.c   |    0 
 .../acpi/events => kernel/acpi/acpica}/evevent.c   |    0 
 .../acpi/events => kernel/acpi/acpica}/evgpe.c     |    0 
 .../acpi/events => kernel/acpi/acpica}/evgpeblk.c  |    0 
 .../acpi/events => kernel/acpi/acpica}/evmisc.c    |    0 
 .../acpi/events => kernel/acpi/acpica}/evregion.c  |    0 
 .../acpi/events => kernel/acpi/acpica}/evrgnini.c  |    0 
 .../acpi/events => kernel/acpi/acpica}/evsci.c     |    0 
 .../acpi/events => kernel/acpi/acpica}/evxface.c   |    0 
 .../acpi/events => kernel/acpi/acpica}/evxfevnt.c  |    0 
 .../acpi/events => kernel/acpi/acpica}/evxfregn.c  |    0 
 .../executer => kernel/acpi/acpica}/exconfig.c     |    0 
 .../executer => kernel/acpi/acpica}/exconvrt.c     |    0 
 .../executer => kernel/acpi/acpica}/excreate.c     |    0 
 .../acpi/executer => kernel/acpi/acpica}/exdump.c  |    0 
 .../acpi/executer => kernel/acpi/acpica}/exfield.c |    0 
 .../acpi/executer => kernel/acpi/acpica}/exfldio.c |    0 
 .../acpi/executer => kernel/acpi/acpica}/exmisc.c  |    0 
 .../acpi/executer => kernel/acpi/acpica}/exmutex.c |    0 
 .../acpi/executer => kernel/acpi/acpica}/exnames.c |    0 
 .../executer => kernel/acpi/acpica}/exoparg1.c     |    0 
 .../executer => kernel/acpi/acpica}/exoparg2.c     |    0 
 .../executer => kernel/acpi/acpica}/exoparg3.c     |    0 
 .../executer => kernel/acpi/acpica}/exoparg6.c     |    0 
 .../acpi/executer => kernel/acpi/acpica}/exprep.c  |    0 
 .../executer => kernel/acpi/acpica}/exregion.c     |    0 
 .../executer => kernel/acpi/acpica}/exresnte.c     |    0 
 .../executer => kernel/acpi/acpica}/exresolv.c     |    0 
 .../acpi/executer => kernel/acpi/acpica}/exresop.c |    0 
 .../acpi/executer => kernel/acpi/acpica}/exstore.c |    0 
 .../executer => kernel/acpi/acpica}/exstoren.c     |    0 
 .../executer => kernel/acpi/acpica}/exstorob.c     |    0 
 .../executer => kernel/acpi/acpica}/exsystem.c     |    0 
 .../acpi/executer => kernel/acpi/acpica}/exutils.c |    0 
 .../acpi/hardware => kernel/acpi/acpica}/hwacpi.c  |    0 
 .../acpi/hardware => kernel/acpi/acpica}/hwgpe.c   |    0 
 .../acpi/hardware => kernel/acpi/acpica}/hwregs.c  |    0 
 .../acpi/hardware => kernel/acpi/acpica}/hwsleep.c |    0 
 .../acpi/hardware => kernel/acpi/acpica}/hwtimer.c |    0 
 .../acpi/hardware => kernel/acpi/acpica}/hwxface.c |    0 
 .../namespace => kernel/acpi/acpica}/nsaccess.c    |    0 
 .../namespace => kernel/acpi/acpica}/nsalloc.c     |    0 
 .../acpi/namespace => kernel/acpi/acpica}/nsdump.c |    0 
 .../namespace => kernel/acpi/acpica}/nsdumpdv.c    |    0 
 .../acpi/namespace => kernel/acpi/acpica}/nseval.c |    0 
 .../acpi/namespace => kernel/acpi/acpica}/nsinit.c |    0 
 .../acpi/namespace => kernel/acpi/acpica}/nsload.c |    0 
 .../namespace => kernel/acpi/acpica}/nsnames.c     |    0 
 .../namespace => kernel/acpi/acpica}/nsobject.c    |    0 
 .../namespace => kernel/acpi/acpica}/nsparse.c     |    0 
 .../namespace => kernel/acpi/acpica}/nspredef.c    |    0 
 .../namespace => kernel/acpi/acpica}/nssearch.c    |    0 
 .../namespace => kernel/acpi/acpica}/nsutils.c     |    0 
 .../acpi/namespace => kernel/acpi/acpica}/nswalk.c |    0 
 .../namespace => kernel/acpi/acpica}/nsxfeval.c    |    0 
 .../namespace => kernel/acpi/acpica}/nsxfname.c    |    0 
 .../namespace => kernel/acpi/acpica}/nsxfobj.c     |    0 
 .../acpi/parser => kernel/acpi/acpica}/psargs.c    |    0 
 .../acpi/parser => kernel/acpi/acpica}/psloop.c    |    0 
 .../acpi/parser => kernel/acpi/acpica}/psopcode.c  |    0 
 .../acpi/parser => kernel/acpi/acpica}/psparse.c   |    0 
 .../acpi/parser => kernel/acpi/acpica}/psscope.c   |    0 
 .../acpi/parser => kernel/acpi/acpica}/pstree.c    |    0 
 .../acpi/parser => kernel/acpi/acpica}/psutils.c   |    0 
 .../acpi/parser => kernel/acpi/acpica}/pswalk.c    |    0 
 .../acpi/parser => kernel/acpi/acpica}/psxface.c   |    0 
 .../acpi/resources => kernel/acpi/acpica}/rsaddr.c |    0 
 .../acpi/resources => kernel/acpi/acpica}/rscalc.c |    0 
 .../resources => kernel/acpi/acpica}/rscreate.c    |    0 
 .../acpi/resources => kernel/acpi/acpica}/rsdump.c |    0 
 .../acpi/resources => kernel/acpi/acpica}/rsinfo.c |    0 
 .../acpi/resources => kernel/acpi/acpica}/rsio.c   |    0 
 .../acpi/resources => kernel/acpi/acpica}/rsirq.c  |    0 
 .../acpi/resources => kernel/acpi/acpica}/rslist.c |    0 
 .../resources => kernel/acpi/acpica}/rsmemory.c    |    0 
 .../acpi/resources => kernel/acpi/acpica}/rsmisc.c |    0 
 .../resources => kernel/acpi/acpica}/rsutils.c     |    0 
 .../resources => kernel/acpi/acpica}/rsxface.c     |    0 
 .../acpi/tables => kernel/acpi/acpica}/tbfadt.c    |    0 
 .../acpi/tables => kernel/acpi/acpica}/tbfind.c    |    0 
 .../acpi/tables => kernel/acpi/acpica}/tbinstal.c  |    0 
 .../acpi/tables => kernel/acpi/acpica}/tbutils.c   |    0 
 .../acpi/tables => kernel/acpi/acpica}/tbxface.c   |    0 
 .../acpi/tables => kernel/acpi/acpica}/tbxfroot.c  |    0 
 .../utilities => kernel/acpi/acpica}/utalloc.c     |    0 
 .../utilities => kernel/acpi/acpica}/utcache.c     |    0 
 .../acpi/utilities => kernel/acpi/acpica}/utcopy.c |    0 
 .../utilities => kernel/acpi/acpica}/utdebug.c     |    0 
 .../utilities => kernel/acpi/acpica}/utdelete.c    |    0 
 .../acpi/utilities => kernel/acpi/acpica}/uteval.c |    0 
 .../utilities => kernel/acpi/acpica}/utglobal.c    |    0 
 .../acpi/utilities => kernel/acpi/acpica}/utinit.c |    0 
 .../acpi/utilities => kernel/acpi/acpica}/utmath.c |    0 
 .../acpi/utilities => kernel/acpi/acpica}/utmisc.c |    0 
 .../utilities => kernel/acpi/acpica}/utmutex.c     |    0 
 .../utilities => kernel/acpi/acpica}/utobject.c    |    0 
 .../utilities => kernel/acpi/acpica}/utresrc.c     |    0 
 .../utilities => kernel/acpi/acpica}/utstate.c     |    0 
 .../utilities => kernel/acpi/acpica}/utxface.c     |    0 
 {drivers => kernel}/acpi/bus.c                     |    0 
 {drivers => kernel}/acpi/glue.c                    |    0 
 {drivers/acpi/sleep => kernel/acpi}/main.c         |    0 
 {drivers => kernel}/acpi/osl.c                     |    0 
 {drivers => kernel}/acpi/pci_bind.c                |    0 
 {drivers => kernel}/acpi/pci_irq.c                 |    0 
 {drivers => kernel}/acpi/pci_link.c                |    0 
 {drivers => kernel}/acpi/pci_root.c                |    0 
 {drivers => kernel}/acpi/power.c                   |    0 
 {drivers/acpi/sleep => kernel/acpi}/proc.c         |    0 
 {drivers => kernel}/acpi/reboot.c                  |    0 
 {drivers => kernel}/acpi/scan.c                    |    0 
 {drivers/acpi/sleep => kernel/acpi}/sleep.h        |    0 
 {drivers => kernel}/acpi/tables.c                  |    0 
 {drivers => kernel}/acpi/utils.c                   |    0 
 {drivers/acpi/sleep => kernel/acpi}/wakeup.c       |    0 
 kernel/acpi/x86/Makefile                           |    5 ++
 {drivers/acpi => kernel/acpi/x86}/blacklist.c      |    0 
 141 files changed, 86 insertions(+), 109 deletions(-)
 delete mode 100644 drivers/acpi/dispatcher/Makefile
 delete mode 100644 drivers/acpi/events/Makefile
 delete mode 100644 drivers/acpi/executer/Makefile
 delete mode 100644 drivers/acpi/hardware/Makefile
 delete mode 100644 drivers/acpi/namespace/Makefile
 delete mode 100644 drivers/acpi/parser/Makefile
 delete mode 100644 drivers/acpi/resources/Makefile
 delete mode 100644 drivers/acpi/sleep/Makefile
 delete mode 100644 drivers/acpi/tables/Makefile
 delete mode 100644 drivers/acpi/utilities/Makefile
 create mode 100644 kernel/acpi/Makefile
 create mode 100644 kernel/acpi/acpica/Makefile
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsfield.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsinit.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsmethod.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsmthdat.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsobject.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsopcode.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dsutils.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dswexec.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dswload.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dswscope.c (100%)
 rename {drivers/acpi/dispatcher => kernel/acpi/acpica}/dswstate.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evevent.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evgpe.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evgpeblk.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evmisc.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evregion.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evrgnini.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evsci.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evxface.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evxfevnt.c (100%)
 rename {drivers/acpi/events => kernel/acpi/acpica}/evxfregn.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exconfig.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exconvrt.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/excreate.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exdump.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exfield.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exfldio.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exmisc.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exmutex.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exnames.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exoparg1.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exoparg2.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exoparg3.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exoparg6.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exprep.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exregion.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exresnte.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exresolv.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exresop.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exstore.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exstoren.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exstorob.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exsystem.c (100%)
 rename {drivers/acpi/executer => kernel/acpi/acpica}/exutils.c (100%)
 rename {drivers/acpi/hardware => kernel/acpi/acpica}/hwacpi.c (100%)
 rename {drivers/acpi/hardware => kernel/acpi/acpica}/hwgpe.c (100%)
 rename {drivers/acpi/hardware => kernel/acpi/acpica}/hwregs.c (100%)
 rename {drivers/acpi/hardware => kernel/acpi/acpica}/hwsleep.c (100%)
 rename {drivers/acpi/hardware => kernel/acpi/acpica}/hwtimer.c (100%)
 rename {drivers/acpi/hardware => kernel/acpi/acpica}/hwxface.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsaccess.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsalloc.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsdump.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsdumpdv.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nseval.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsinit.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsload.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsnames.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsobject.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsparse.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nspredef.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nssearch.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsutils.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nswalk.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsxfeval.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsxfname.c (100%)
 rename {drivers/acpi/namespace => kernel/acpi/acpica}/nsxfobj.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psargs.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psloop.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psopcode.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psparse.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psscope.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/pstree.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psutils.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/pswalk.c (100%)
 rename {drivers/acpi/parser => kernel/acpi/acpica}/psxface.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsaddr.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rscalc.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rscreate.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsdump.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsinfo.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsio.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsirq.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rslist.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsmemory.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsmisc.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsutils.c (100%)
 rename {drivers/acpi/resources => kernel/acpi/acpica}/rsxface.c (100%)
 rename {drivers/acpi/tables => kernel/acpi/acpica}/tbfadt.c (100%)
 rename {drivers/acpi/tables => kernel/acpi/acpica}/tbfind.c (100%)
 rename {drivers/acpi/tables => kernel/acpi/acpica}/tbinstal.c (100%)
 rename {drivers/acpi/tables => kernel/acpi/acpica}/tbutils.c (100%)
 rename {drivers/acpi/tables => kernel/acpi/acpica}/tbxface.c (100%)
 rename {drivers/acpi/tables => kernel/acpi/acpica}/tbxfroot.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utalloc.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utcache.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utcopy.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utdebug.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utdelete.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/uteval.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utglobal.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utinit.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utmath.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utmisc.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utmutex.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utobject.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utresrc.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utstate.c (100%)
 rename {drivers/acpi/utilities => kernel/acpi/acpica}/utxface.c (100%)
 rename {drivers => kernel}/acpi/bus.c (100%)
 rename {drivers => kernel}/acpi/glue.c (100%)
 rename {drivers/acpi/sleep => kernel/acpi}/main.c (100%)
 rename {drivers => kernel}/acpi/osl.c (100%)
 rename {drivers => kernel}/acpi/pci_bind.c (100%)
 rename {drivers => kernel}/acpi/pci_irq.c (100%)
 rename {drivers => kernel}/acpi/pci_link.c (100%)
 rename {drivers => kernel}/acpi/pci_root.c (100%)
 rename {drivers => kernel}/acpi/power.c (100%)
 rename {drivers/acpi/sleep => kernel/acpi}/proc.c (100%)
 rename {drivers => kernel}/acpi/reboot.c (100%)
 rename {drivers => kernel}/acpi/scan.c (100%)
 rename {drivers/acpi/sleep => kernel/acpi}/sleep.h (100%)
 rename {drivers => kernel}/acpi/tables.c (100%)
 rename {drivers => kernel}/acpi/utils.c (100%)
 rename {drivers/acpi/sleep => kernel/acpi}/wakeup.c (100%)
 create mode 100644 kernel/acpi/x86/Makefile
 rename {drivers/acpi => kernel/acpi/x86}/blacklist.c (100%)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 3c0c933..5f4096d 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the Linux ACPI interpreter
+# Makefile for the Linux ACPI Drivers
 #
 
 export ACPI_CFLAGS
@@ -13,21 +13,7 @@ endif
 EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
 
 #
-# ACPI Boot-Time Table Parsing
-#
-obj-y				+= tables.o
-obj-$(CONFIG_X86)		+= blacklist.o
-
-#
-# ACPI Core Subsystem (Interpreter)
-#
-obj-y				+= osl.o utils.o reboot.o\
-				   dispatcher/ events/ executer/ hardware/ \
-				   namespace/ parser/ resources/ tables/ \
-				   utilities/
-
-#
-# ACPI Bus and Device Drivers
+# ACPI Device Drivers
 #
 processor-objs	+= processor_core.o processor_throttling.o \
 				processor_idle.o processor_thermal.o
@@ -35,9 +21,6 @@ ifdef CONFIG_CPU_FREQ
 processor-objs	+= processor_perflib.o
 endif
 
-obj-y				+= sleep/
-obj-y				+= bus.o glue.o
-obj-y				+= scan.o
 # Keep EC driver first. Initialization of others depend on it.
 obj-y				+= ec.o
 obj-$(CONFIG_ACPI_AC) 		+= ac.o
@@ -50,12 +33,10 @@ ifdef CONFIG_ACPI_VIDEO
 obj-y				+= video_detect.o
 endif
 
-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_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)	+= container.o
 obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o
-obj-y				+= power.o
 obj-$(CONFIG_ACPI_SYSTEM)	+= system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)	+= debug.o
 obj-$(CONFIG_ACPI_NUMA)		+= numa.o
diff --git a/drivers/acpi/dispatcher/Makefile b/drivers/acpi/dispatcher/Makefile
deleted file mode 100644
index eb7e602..0000000
--- a/drivers/acpi/dispatcher/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
-	 dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
-	 dsinit.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/events/Makefile b/drivers/acpi/events/Makefile
deleted file mode 100644
index d29f2ee..0000000
--- a/drivers/acpi/events/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := evevent.o  evregion.o  evsci.o    evxfevnt.o \
-	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
-	 evgpe.o    evgpeblk.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/executer/Makefile b/drivers/acpi/executer/Makefile
deleted file mode 100644
index e09998a..0000000
--- a/drivers/acpi/executer/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
-	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
-	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
-	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/hardware/Makefile b/drivers/acpi/hardware/Makefile
deleted file mode 100644
index 238fbe5..0000000
--- a/drivers/acpi/hardware/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o
-
-obj-$(ACPI_FUTURE_USAGE) += hwtimer.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/namespace/Makefile b/drivers/acpi/namespace/Makefile
deleted file mode 100644
index 371a2da..0000000
--- a/drivers/acpi/namespace/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
-	 nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
-	 nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
-	 nsparse.o   nspredef.o
-
-obj-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/parser/Makefile b/drivers/acpi/parser/Makefile
deleted file mode 100644
index db24ee0..0000000
--- a/drivers/acpi/parser/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
-	 psopcode.o  psscope.o  psutils.o  psxface.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/resources/Makefile b/drivers/acpi/resources/Makefile
deleted file mode 100644
index 8de4f69..0000000
--- a/drivers/acpi/resources/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
-	 rscalc.o  rsirq.o  rsmemory.o  rsutils.o
-
-obj-$(ACPI_FUTURE_USAGE) += rsdump.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
deleted file mode 100644
index f1fb888..0000000
--- a/drivers/acpi/sleep/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-y					:= wakeup.o
-obj-y					+= main.o
-obj-$(CONFIG_ACPI_SLEEP)		+= proc.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/tables/Makefile b/drivers/acpi/tables/Makefile
deleted file mode 100644
index 7385efa..0000000
--- a/drivers/acpi/tables/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/utilities/Makefile b/drivers/acpi/utilities/Makefile
deleted file mode 100644
index 88eff14..0000000
--- a/drivers/acpi/utilities/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for all Linux ACPI interpreter subdirectories
-#
-
-obj-y := utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
-		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
-		utstate.o utmutex.o utobject.o utcache.o utresrc.o
-
-EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/kernel/Makefile b/kernel/Makefile
index 19fad00..adc327c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
+obj-$(CONFIG_ACPI) += acpi/
 obj-$(CONFIG_PM) += power/
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KEXEC) += kexec.o
diff --git a/kernel/acpi/Makefile b/kernel/acpi/Makefile
new file mode 100644
index 0000000..92a1f94
--- /dev/null
+++ b/kernel/acpi/Makefile
@@ -0,0 +1,26 @@
+#
+# Makefile for the Linux/ACPI
+#
+
+export ACPI_CFLAGS
+
+ACPI_CFLAGS	:= -Os
+
+ifdef CONFIG_ACPI_DEBUG
+  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
+endif
+
+EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
+
+obj-y				:= tables.o
+obj-$(CONFIG_X86)		+= x86/
+obj-y				+= osl.o utils.o reboot.o
+obj-y				+= bus.o glue.o
+obj-y				+= scan.o
+obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
+obj-y				+= power.o
+obj-y  				+= wakeup.o
+obj-y  				+= main.o
+obj-$(CONFIG_ACPI_SLEEP)                += proc.o
+
+obj-y				+= acpica/
diff --git a/kernel/acpi/acpica/Makefile b/kernel/acpi/acpica/Makefile
new file mode 100644
index 0000000..8d4e018
--- /dev/null
+++ b/kernel/acpi/acpica/Makefile
@@ -0,0 +1,52 @@
+#
+# Makefile for ACPICA Core interpreter
+#
+
+export ACPI_CFLAGS
+
+ACPI_CFLAGS	:= -Os
+
+ifdef CONFIG_ACPI_DEBUG
+  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
+endif
+
+EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
+
+
+obj-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
+	 dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
+	 dsinit.o
+
+obj-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
+	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
+	 evgpe.o    evgpeblk.o
+
+obj-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
+	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
+	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
+	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o
+
+obj-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o
+
+obj-$(ACPI_FUTURE_USAGE) += hwtimer.o
+
+obj-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
+	 nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
+	 nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
+	 nsparse.o   nspredef.o
+
+obj-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
+
+obj-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
+	 psopcode.o  psscope.o  psutils.o  psxface.o
+
+obj-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
+	 rscalc.o  rsirq.o  rsmemory.o  rsutils.o
+
+obj-$(ACPI_FUTURE_USAGE) += rsdump.o
+
+obj-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
+
+obj-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+		utstate.o utmutex.o utobject.o utcache.o utresrc.o
diff --git a/drivers/acpi/dispatcher/dsfield.c b/kernel/acpi/acpica/dsfield.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsfield.c
rename to kernel/acpi/acpica/dsfield.c
diff --git a/drivers/acpi/dispatcher/dsinit.c b/kernel/acpi/acpica/dsinit.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsinit.c
rename to kernel/acpi/acpica/dsinit.c
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsmethod.c
rename to kernel/acpi/acpica/dsmethod.c
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/kernel/acpi/acpica/dsmthdat.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsmthdat.c
rename to kernel/acpi/acpica/dsmthdat.c
diff --git a/drivers/acpi/dispatcher/dsobject.c b/kernel/acpi/acpica/dsobject.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsobject.c
rename to kernel/acpi/acpica/dsobject.c
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsopcode.c
rename to kernel/acpi/acpica/dsopcode.c
diff --git a/drivers/acpi/dispatcher/dsutils.c b/kernel/acpi/acpica/dsutils.c
similarity index 100%
rename from drivers/acpi/dispatcher/dsutils.c
rename to kernel/acpi/acpica/dsutils.c
diff --git a/drivers/acpi/dispatcher/dswexec.c b/kernel/acpi/acpica/dswexec.c
similarity index 100%
rename from drivers/acpi/dispatcher/dswexec.c
rename to kernel/acpi/acpica/dswexec.c
diff --git a/drivers/acpi/dispatcher/dswload.c b/kernel/acpi/acpica/dswload.c
similarity index 100%
rename from drivers/acpi/dispatcher/dswload.c
rename to kernel/acpi/acpica/dswload.c
diff --git a/drivers/acpi/dispatcher/dswscope.c b/kernel/acpi/acpica/dswscope.c
similarity index 100%
rename from drivers/acpi/dispatcher/dswscope.c
rename to kernel/acpi/acpica/dswscope.c
diff --git a/drivers/acpi/dispatcher/dswstate.c b/kernel/acpi/acpica/dswstate.c
similarity index 100%
rename from drivers/acpi/dispatcher/dswstate.c
rename to kernel/acpi/acpica/dswstate.c
diff --git a/drivers/acpi/events/evevent.c b/kernel/acpi/acpica/evevent.c
similarity index 100%
rename from drivers/acpi/events/evevent.c
rename to kernel/acpi/acpica/evevent.c
diff --git a/drivers/acpi/events/evgpe.c b/kernel/acpi/acpica/evgpe.c
similarity index 100%
rename from drivers/acpi/events/evgpe.c
rename to kernel/acpi/acpica/evgpe.c
diff --git a/drivers/acpi/events/evgpeblk.c b/kernel/acpi/acpica/evgpeblk.c
similarity index 100%
rename from drivers/acpi/events/evgpeblk.c
rename to kernel/acpi/acpica/evgpeblk.c
diff --git a/drivers/acpi/events/evmisc.c b/kernel/acpi/acpica/evmisc.c
similarity index 100%
rename from drivers/acpi/events/evmisc.c
rename to kernel/acpi/acpica/evmisc.c
diff --git a/drivers/acpi/events/evregion.c b/kernel/acpi/acpica/evregion.c
similarity index 100%
rename from drivers/acpi/events/evregion.c
rename to kernel/acpi/acpica/evregion.c
diff --git a/drivers/acpi/events/evrgnini.c b/kernel/acpi/acpica/evrgnini.c
similarity index 100%
rename from drivers/acpi/events/evrgnini.c
rename to kernel/acpi/acpica/evrgnini.c
diff --git a/drivers/acpi/events/evsci.c b/kernel/acpi/acpica/evsci.c
similarity index 100%
rename from drivers/acpi/events/evsci.c
rename to kernel/acpi/acpica/evsci.c
diff --git a/drivers/acpi/events/evxface.c b/kernel/acpi/acpica/evxface.c
similarity index 100%
rename from drivers/acpi/events/evxface.c
rename to kernel/acpi/acpica/evxface.c
diff --git a/drivers/acpi/events/evxfevnt.c b/kernel/acpi/acpica/evxfevnt.c
similarity index 100%
rename from drivers/acpi/events/evxfevnt.c
rename to kernel/acpi/acpica/evxfevnt.c
diff --git a/drivers/acpi/events/evxfregn.c b/kernel/acpi/acpica/evxfregn.c
similarity index 100%
rename from drivers/acpi/events/evxfregn.c
rename to kernel/acpi/acpica/evxfregn.c
diff --git a/drivers/acpi/executer/exconfig.c b/kernel/acpi/acpica/exconfig.c
similarity index 100%
rename from drivers/acpi/executer/exconfig.c
rename to kernel/acpi/acpica/exconfig.c
diff --git a/drivers/acpi/executer/exconvrt.c b/kernel/acpi/acpica/exconvrt.c
similarity index 100%
rename from drivers/acpi/executer/exconvrt.c
rename to kernel/acpi/acpica/exconvrt.c
diff --git a/drivers/acpi/executer/excreate.c b/kernel/acpi/acpica/excreate.c
similarity index 100%
rename from drivers/acpi/executer/excreate.c
rename to kernel/acpi/acpica/excreate.c
diff --git a/drivers/acpi/executer/exdump.c b/kernel/acpi/acpica/exdump.c
similarity index 100%
rename from drivers/acpi/executer/exdump.c
rename to kernel/acpi/acpica/exdump.c
diff --git a/drivers/acpi/executer/exfield.c b/kernel/acpi/acpica/exfield.c
similarity index 100%
rename from drivers/acpi/executer/exfield.c
rename to kernel/acpi/acpica/exfield.c
diff --git a/drivers/acpi/executer/exfldio.c b/kernel/acpi/acpica/exfldio.c
similarity index 100%
rename from drivers/acpi/executer/exfldio.c
rename to kernel/acpi/acpica/exfldio.c
diff --git a/drivers/acpi/executer/exmisc.c b/kernel/acpi/acpica/exmisc.c
similarity index 100%
rename from drivers/acpi/executer/exmisc.c
rename to kernel/acpi/acpica/exmisc.c
diff --git a/drivers/acpi/executer/exmutex.c b/kernel/acpi/acpica/exmutex.c
similarity index 100%
rename from drivers/acpi/executer/exmutex.c
rename to kernel/acpi/acpica/exmutex.c
diff --git a/drivers/acpi/executer/exnames.c b/kernel/acpi/acpica/exnames.c
similarity index 100%
rename from drivers/acpi/executer/exnames.c
rename to kernel/acpi/acpica/exnames.c
diff --git a/drivers/acpi/executer/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
similarity index 100%
rename from drivers/acpi/executer/exoparg1.c
rename to kernel/acpi/acpica/exoparg1.c
diff --git a/drivers/acpi/executer/exoparg2.c b/kernel/acpi/acpica/exoparg2.c
similarity index 100%
rename from drivers/acpi/executer/exoparg2.c
rename to kernel/acpi/acpica/exoparg2.c
diff --git a/drivers/acpi/executer/exoparg3.c b/kernel/acpi/acpica/exoparg3.c
similarity index 100%
rename from drivers/acpi/executer/exoparg3.c
rename to kernel/acpi/acpica/exoparg3.c
diff --git a/drivers/acpi/executer/exoparg6.c b/kernel/acpi/acpica/exoparg6.c
similarity index 100%
rename from drivers/acpi/executer/exoparg6.c
rename to kernel/acpi/acpica/exoparg6.c
diff --git a/drivers/acpi/executer/exprep.c b/kernel/acpi/acpica/exprep.c
similarity index 100%
rename from drivers/acpi/executer/exprep.c
rename to kernel/acpi/acpica/exprep.c
diff --git a/drivers/acpi/executer/exregion.c b/kernel/acpi/acpica/exregion.c
similarity index 100%
rename from drivers/acpi/executer/exregion.c
rename to kernel/acpi/acpica/exregion.c
diff --git a/drivers/acpi/executer/exresnte.c b/kernel/acpi/acpica/exresnte.c
similarity index 100%
rename from drivers/acpi/executer/exresnte.c
rename to kernel/acpi/acpica/exresnte.c
diff --git a/drivers/acpi/executer/exresolv.c b/kernel/acpi/acpica/exresolv.c
similarity index 100%
rename from drivers/acpi/executer/exresolv.c
rename to kernel/acpi/acpica/exresolv.c
diff --git a/drivers/acpi/executer/exresop.c b/kernel/acpi/acpica/exresop.c
similarity index 100%
rename from drivers/acpi/executer/exresop.c
rename to kernel/acpi/acpica/exresop.c
diff --git a/drivers/acpi/executer/exstore.c b/kernel/acpi/acpica/exstore.c
similarity index 100%
rename from drivers/acpi/executer/exstore.c
rename to kernel/acpi/acpica/exstore.c
diff --git a/drivers/acpi/executer/exstoren.c b/kernel/acpi/acpica/exstoren.c
similarity index 100%
rename from drivers/acpi/executer/exstoren.c
rename to kernel/acpi/acpica/exstoren.c
diff --git a/drivers/acpi/executer/exstorob.c b/kernel/acpi/acpica/exstorob.c
similarity index 100%
rename from drivers/acpi/executer/exstorob.c
rename to kernel/acpi/acpica/exstorob.c
diff --git a/drivers/acpi/executer/exsystem.c b/kernel/acpi/acpica/exsystem.c
similarity index 100%
rename from drivers/acpi/executer/exsystem.c
rename to kernel/acpi/acpica/exsystem.c
diff --git a/drivers/acpi/executer/exutils.c b/kernel/acpi/acpica/exutils.c
similarity index 100%
rename from drivers/acpi/executer/exutils.c
rename to kernel/acpi/acpica/exutils.c
diff --git a/drivers/acpi/hardware/hwacpi.c b/kernel/acpi/acpica/hwacpi.c
similarity index 100%
rename from drivers/acpi/hardware/hwacpi.c
rename to kernel/acpi/acpica/hwacpi.c
diff --git a/drivers/acpi/hardware/hwgpe.c b/kernel/acpi/acpica/hwgpe.c
similarity index 100%
rename from drivers/acpi/hardware/hwgpe.c
rename to kernel/acpi/acpica/hwgpe.c
diff --git a/drivers/acpi/hardware/hwregs.c b/kernel/acpi/acpica/hwregs.c
similarity index 100%
rename from drivers/acpi/hardware/hwregs.c
rename to kernel/acpi/acpica/hwregs.c
diff --git a/drivers/acpi/hardware/hwsleep.c b/kernel/acpi/acpica/hwsleep.c
similarity index 100%
rename from drivers/acpi/hardware/hwsleep.c
rename to kernel/acpi/acpica/hwsleep.c
diff --git a/drivers/acpi/hardware/hwtimer.c b/kernel/acpi/acpica/hwtimer.c
similarity index 100%
rename from drivers/acpi/hardware/hwtimer.c
rename to kernel/acpi/acpica/hwtimer.c
diff --git a/drivers/acpi/hardware/hwxface.c b/kernel/acpi/acpica/hwxface.c
similarity index 100%
rename from drivers/acpi/hardware/hwxface.c
rename to kernel/acpi/acpica/hwxface.c
diff --git a/drivers/acpi/namespace/nsaccess.c b/kernel/acpi/acpica/nsaccess.c
similarity index 100%
rename from drivers/acpi/namespace/nsaccess.c
rename to kernel/acpi/acpica/nsaccess.c
diff --git a/drivers/acpi/namespace/nsalloc.c b/kernel/acpi/acpica/nsalloc.c
similarity index 100%
rename from drivers/acpi/namespace/nsalloc.c
rename to kernel/acpi/acpica/nsalloc.c
diff --git a/drivers/acpi/namespace/nsdump.c b/kernel/acpi/acpica/nsdump.c
similarity index 100%
rename from drivers/acpi/namespace/nsdump.c
rename to kernel/acpi/acpica/nsdump.c
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/kernel/acpi/acpica/nsdumpdv.c
similarity index 100%
rename from drivers/acpi/namespace/nsdumpdv.c
rename to kernel/acpi/acpica/nsdumpdv.c
diff --git a/drivers/acpi/namespace/nseval.c b/kernel/acpi/acpica/nseval.c
similarity index 100%
rename from drivers/acpi/namespace/nseval.c
rename to kernel/acpi/acpica/nseval.c
diff --git a/drivers/acpi/namespace/nsinit.c b/kernel/acpi/acpica/nsinit.c
similarity index 100%
rename from drivers/acpi/namespace/nsinit.c
rename to kernel/acpi/acpica/nsinit.c
diff --git a/drivers/acpi/namespace/nsload.c b/kernel/acpi/acpica/nsload.c
similarity index 100%
rename from drivers/acpi/namespace/nsload.c
rename to kernel/acpi/acpica/nsload.c
diff --git a/drivers/acpi/namespace/nsnames.c b/kernel/acpi/acpica/nsnames.c
similarity index 100%
rename from drivers/acpi/namespace/nsnames.c
rename to kernel/acpi/acpica/nsnames.c
diff --git a/drivers/acpi/namespace/nsobject.c b/kernel/acpi/acpica/nsobject.c
similarity index 100%
rename from drivers/acpi/namespace/nsobject.c
rename to kernel/acpi/acpica/nsobject.c
diff --git a/drivers/acpi/namespace/nsparse.c b/kernel/acpi/acpica/nsparse.c
similarity index 100%
rename from drivers/acpi/namespace/nsparse.c
rename to kernel/acpi/acpica/nsparse.c
diff --git a/drivers/acpi/namespace/nspredef.c b/kernel/acpi/acpica/nspredef.c
similarity index 100%
rename from drivers/acpi/namespace/nspredef.c
rename to kernel/acpi/acpica/nspredef.c
diff --git a/drivers/acpi/namespace/nssearch.c b/kernel/acpi/acpica/nssearch.c
similarity index 100%
rename from drivers/acpi/namespace/nssearch.c
rename to kernel/acpi/acpica/nssearch.c
diff --git a/drivers/acpi/namespace/nsutils.c b/kernel/acpi/acpica/nsutils.c
similarity index 100%
rename from drivers/acpi/namespace/nsutils.c
rename to kernel/acpi/acpica/nsutils.c
diff --git a/drivers/acpi/namespace/nswalk.c b/kernel/acpi/acpica/nswalk.c
similarity index 100%
rename from drivers/acpi/namespace/nswalk.c
rename to kernel/acpi/acpica/nswalk.c
diff --git a/drivers/acpi/namespace/nsxfeval.c b/kernel/acpi/acpica/nsxfeval.c
similarity index 100%
rename from drivers/acpi/namespace/nsxfeval.c
rename to kernel/acpi/acpica/nsxfeval.c
diff --git a/drivers/acpi/namespace/nsxfname.c b/kernel/acpi/acpica/nsxfname.c
similarity index 100%
rename from drivers/acpi/namespace/nsxfname.c
rename to kernel/acpi/acpica/nsxfname.c
diff --git a/drivers/acpi/namespace/nsxfobj.c b/kernel/acpi/acpica/nsxfobj.c
similarity index 100%
rename from drivers/acpi/namespace/nsxfobj.c
rename to kernel/acpi/acpica/nsxfobj.c
diff --git a/drivers/acpi/parser/psargs.c b/kernel/acpi/acpica/psargs.c
similarity index 100%
rename from drivers/acpi/parser/psargs.c
rename to kernel/acpi/acpica/psargs.c
diff --git a/drivers/acpi/parser/psloop.c b/kernel/acpi/acpica/psloop.c
similarity index 100%
rename from drivers/acpi/parser/psloop.c
rename to kernel/acpi/acpica/psloop.c
diff --git a/drivers/acpi/parser/psopcode.c b/kernel/acpi/acpica/psopcode.c
similarity index 100%
rename from drivers/acpi/parser/psopcode.c
rename to kernel/acpi/acpica/psopcode.c
diff --git a/drivers/acpi/parser/psparse.c b/kernel/acpi/acpica/psparse.c
similarity index 100%
rename from drivers/acpi/parser/psparse.c
rename to kernel/acpi/acpica/psparse.c
diff --git a/drivers/acpi/parser/psscope.c b/kernel/acpi/acpica/psscope.c
similarity index 100%
rename from drivers/acpi/parser/psscope.c
rename to kernel/acpi/acpica/psscope.c
diff --git a/drivers/acpi/parser/pstree.c b/kernel/acpi/acpica/pstree.c
similarity index 100%
rename from drivers/acpi/parser/pstree.c
rename to kernel/acpi/acpica/pstree.c
diff --git a/drivers/acpi/parser/psutils.c b/kernel/acpi/acpica/psutils.c
similarity index 100%
rename from drivers/acpi/parser/psutils.c
rename to kernel/acpi/acpica/psutils.c
diff --git a/drivers/acpi/parser/pswalk.c b/kernel/acpi/acpica/pswalk.c
similarity index 100%
rename from drivers/acpi/parser/pswalk.c
rename to kernel/acpi/acpica/pswalk.c
diff --git a/drivers/acpi/parser/psxface.c b/kernel/acpi/acpica/psxface.c
similarity index 100%
rename from drivers/acpi/parser/psxface.c
rename to kernel/acpi/acpica/psxface.c
diff --git a/drivers/acpi/resources/rsaddr.c b/kernel/acpi/acpica/rsaddr.c
similarity index 100%
rename from drivers/acpi/resources/rsaddr.c
rename to kernel/acpi/acpica/rsaddr.c
diff --git a/drivers/acpi/resources/rscalc.c b/kernel/acpi/acpica/rscalc.c
similarity index 100%
rename from drivers/acpi/resources/rscalc.c
rename to kernel/acpi/acpica/rscalc.c
diff --git a/drivers/acpi/resources/rscreate.c b/kernel/acpi/acpica/rscreate.c
similarity index 100%
rename from drivers/acpi/resources/rscreate.c
rename to kernel/acpi/acpica/rscreate.c
diff --git a/drivers/acpi/resources/rsdump.c b/kernel/acpi/acpica/rsdump.c
similarity index 100%
rename from drivers/acpi/resources/rsdump.c
rename to kernel/acpi/acpica/rsdump.c
diff --git a/drivers/acpi/resources/rsinfo.c b/kernel/acpi/acpica/rsinfo.c
similarity index 100%
rename from drivers/acpi/resources/rsinfo.c
rename to kernel/acpi/acpica/rsinfo.c
diff --git a/drivers/acpi/resources/rsio.c b/kernel/acpi/acpica/rsio.c
similarity index 100%
rename from drivers/acpi/resources/rsio.c
rename to kernel/acpi/acpica/rsio.c
diff --git a/drivers/acpi/resources/rsirq.c b/kernel/acpi/acpica/rsirq.c
similarity index 100%
rename from drivers/acpi/resources/rsirq.c
rename to kernel/acpi/acpica/rsirq.c
diff --git a/drivers/acpi/resources/rslist.c b/kernel/acpi/acpica/rslist.c
similarity index 100%
rename from drivers/acpi/resources/rslist.c
rename to kernel/acpi/acpica/rslist.c
diff --git a/drivers/acpi/resources/rsmemory.c b/kernel/acpi/acpica/rsmemory.c
similarity index 100%
rename from drivers/acpi/resources/rsmemory.c
rename to kernel/acpi/acpica/rsmemory.c
diff --git a/drivers/acpi/resources/rsmisc.c b/kernel/acpi/acpica/rsmisc.c
similarity index 100%
rename from drivers/acpi/resources/rsmisc.c
rename to kernel/acpi/acpica/rsmisc.c
diff --git a/drivers/acpi/resources/rsutils.c b/kernel/acpi/acpica/rsutils.c
similarity index 100%
rename from drivers/acpi/resources/rsutils.c
rename to kernel/acpi/acpica/rsutils.c
diff --git a/drivers/acpi/resources/rsxface.c b/kernel/acpi/acpica/rsxface.c
similarity index 100%
rename from drivers/acpi/resources/rsxface.c
rename to kernel/acpi/acpica/rsxface.c
diff --git a/drivers/acpi/tables/tbfadt.c b/kernel/acpi/acpica/tbfadt.c
similarity index 100%
rename from drivers/acpi/tables/tbfadt.c
rename to kernel/acpi/acpica/tbfadt.c
diff --git a/drivers/acpi/tables/tbfind.c b/kernel/acpi/acpica/tbfind.c
similarity index 100%
rename from drivers/acpi/tables/tbfind.c
rename to kernel/acpi/acpica/tbfind.c
diff --git a/drivers/acpi/tables/tbinstal.c b/kernel/acpi/acpica/tbinstal.c
similarity index 100%
rename from drivers/acpi/tables/tbinstal.c
rename to kernel/acpi/acpica/tbinstal.c
diff --git a/drivers/acpi/tables/tbutils.c b/kernel/acpi/acpica/tbutils.c
similarity index 100%
rename from drivers/acpi/tables/tbutils.c
rename to kernel/acpi/acpica/tbutils.c
diff --git a/drivers/acpi/tables/tbxface.c b/kernel/acpi/acpica/tbxface.c
similarity index 100%
rename from drivers/acpi/tables/tbxface.c
rename to kernel/acpi/acpica/tbxface.c
diff --git a/drivers/acpi/tables/tbxfroot.c b/kernel/acpi/acpica/tbxfroot.c
similarity index 100%
rename from drivers/acpi/tables/tbxfroot.c
rename to kernel/acpi/acpica/tbxfroot.c
diff --git a/drivers/acpi/utilities/utalloc.c b/kernel/acpi/acpica/utalloc.c
similarity index 100%
rename from drivers/acpi/utilities/utalloc.c
rename to kernel/acpi/acpica/utalloc.c
diff --git a/drivers/acpi/utilities/utcache.c b/kernel/acpi/acpica/utcache.c
similarity index 100%
rename from drivers/acpi/utilities/utcache.c
rename to kernel/acpi/acpica/utcache.c
diff --git a/drivers/acpi/utilities/utcopy.c b/kernel/acpi/acpica/utcopy.c
similarity index 100%
rename from drivers/acpi/utilities/utcopy.c
rename to kernel/acpi/acpica/utcopy.c
diff --git a/drivers/acpi/utilities/utdebug.c b/kernel/acpi/acpica/utdebug.c
similarity index 100%
rename from drivers/acpi/utilities/utdebug.c
rename to kernel/acpi/acpica/utdebug.c
diff --git a/drivers/acpi/utilities/utdelete.c b/kernel/acpi/acpica/utdelete.c
similarity index 100%
rename from drivers/acpi/utilities/utdelete.c
rename to kernel/acpi/acpica/utdelete.c
diff --git a/drivers/acpi/utilities/uteval.c b/kernel/acpi/acpica/uteval.c
similarity index 100%
rename from drivers/acpi/utilities/uteval.c
rename to kernel/acpi/acpica/uteval.c
diff --git a/drivers/acpi/utilities/utglobal.c b/kernel/acpi/acpica/utglobal.c
similarity index 100%
rename from drivers/acpi/utilities/utglobal.c
rename to kernel/acpi/acpica/utglobal.c
diff --git a/drivers/acpi/utilities/utinit.c b/kernel/acpi/acpica/utinit.c
similarity index 100%
rename from drivers/acpi/utilities/utinit.c
rename to kernel/acpi/acpica/utinit.c
diff --git a/drivers/acpi/utilities/utmath.c b/kernel/acpi/acpica/utmath.c
similarity index 100%
rename from drivers/acpi/utilities/utmath.c
rename to kernel/acpi/acpica/utmath.c
diff --git a/drivers/acpi/utilities/utmisc.c b/kernel/acpi/acpica/utmisc.c
similarity index 100%
rename from drivers/acpi/utilities/utmisc.c
rename to kernel/acpi/acpica/utmisc.c
diff --git a/drivers/acpi/utilities/utmutex.c b/kernel/acpi/acpica/utmutex.c
similarity index 100%
rename from drivers/acpi/utilities/utmutex.c
rename to kernel/acpi/acpica/utmutex.c
diff --git a/drivers/acpi/utilities/utobject.c b/kernel/acpi/acpica/utobject.c
similarity index 100%
rename from drivers/acpi/utilities/utobject.c
rename to kernel/acpi/acpica/utobject.c
diff --git a/drivers/acpi/utilities/utresrc.c b/kernel/acpi/acpica/utresrc.c
similarity index 100%
rename from drivers/acpi/utilities/utresrc.c
rename to kernel/acpi/acpica/utresrc.c
diff --git a/drivers/acpi/utilities/utstate.c b/kernel/acpi/acpica/utstate.c
similarity index 100%
rename from drivers/acpi/utilities/utstate.c
rename to kernel/acpi/acpica/utstate.c
diff --git a/drivers/acpi/utilities/utxface.c b/kernel/acpi/acpica/utxface.c
similarity index 100%
rename from drivers/acpi/utilities/utxface.c
rename to kernel/acpi/acpica/utxface.c
diff --git a/drivers/acpi/bus.c b/kernel/acpi/bus.c
similarity index 100%
rename from drivers/acpi/bus.c
rename to kernel/acpi/bus.c
diff --git a/drivers/acpi/glue.c b/kernel/acpi/glue.c
similarity index 100%
rename from drivers/acpi/glue.c
rename to kernel/acpi/glue.c
diff --git a/drivers/acpi/sleep/main.c b/kernel/acpi/main.c
similarity index 100%
rename from drivers/acpi/sleep/main.c
rename to kernel/acpi/main.c
diff --git a/drivers/acpi/osl.c b/kernel/acpi/osl.c
similarity index 100%
rename from drivers/acpi/osl.c
rename to kernel/acpi/osl.c
diff --git a/drivers/acpi/pci_bind.c b/kernel/acpi/pci_bind.c
similarity index 100%
rename from drivers/acpi/pci_bind.c
rename to kernel/acpi/pci_bind.c
diff --git a/drivers/acpi/pci_irq.c b/kernel/acpi/pci_irq.c
similarity index 100%
rename from drivers/acpi/pci_irq.c
rename to kernel/acpi/pci_irq.c
diff --git a/drivers/acpi/pci_link.c b/kernel/acpi/pci_link.c
similarity index 100%
rename from drivers/acpi/pci_link.c
rename to kernel/acpi/pci_link.c
diff --git a/drivers/acpi/pci_root.c b/kernel/acpi/pci_root.c
similarity index 100%
rename from drivers/acpi/pci_root.c
rename to kernel/acpi/pci_root.c
diff --git a/drivers/acpi/power.c b/kernel/acpi/power.c
similarity index 100%
rename from drivers/acpi/power.c
rename to kernel/acpi/power.c
diff --git a/drivers/acpi/sleep/proc.c b/kernel/acpi/proc.c
similarity index 100%
rename from drivers/acpi/sleep/proc.c
rename to kernel/acpi/proc.c
diff --git a/drivers/acpi/reboot.c b/kernel/acpi/reboot.c
similarity index 100%
rename from drivers/acpi/reboot.c
rename to kernel/acpi/reboot.c
diff --git a/drivers/acpi/scan.c b/kernel/acpi/scan.c
similarity index 100%
rename from drivers/acpi/scan.c
rename to kernel/acpi/scan.c
diff --git a/drivers/acpi/sleep/sleep.h b/kernel/acpi/sleep.h
similarity index 100%
rename from drivers/acpi/sleep/sleep.h
rename to kernel/acpi/sleep.h
diff --git a/drivers/acpi/tables.c b/kernel/acpi/tables.c
similarity index 100%
rename from drivers/acpi/tables.c
rename to kernel/acpi/tables.c
diff --git a/drivers/acpi/utils.c b/kernel/acpi/utils.c
similarity index 100%
rename from drivers/acpi/utils.c
rename to kernel/acpi/utils.c
diff --git a/drivers/acpi/sleep/wakeup.c b/kernel/acpi/wakeup.c
similarity index 100%
rename from drivers/acpi/sleep/wakeup.c
rename to kernel/acpi/wakeup.c
diff --git a/kernel/acpi/x86/Makefile b/kernel/acpi/x86/Makefile
new file mode 100644
index 0000000..cc3f387
--- /dev/null
+++ b/kernel/acpi/x86/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Linux/ACPI x86 specific files
+#
+
+obj-y		+= blacklist.o
diff --git a/drivers/acpi/blacklist.c b/kernel/acpi/x86/blacklist.c
similarity index 100%
rename from drivers/acpi/blacklist.c
rename to kernel/acpi/x86/blacklist.c
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 02/15] ACPI: delete include/acpi/platform/
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:51   ` [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/ Len Brown
                     ` (13 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

The ACPICA tree has some additional non-Linux files in this dir,
but Linux doesn't bother with those, so keep things simple...

Signed-off-by: Len Brown <len.brown@intel.com>
---
 include/acpi/{platform => }/acenv.h   |    0 
 include/acpi/{platform => }/acgcc.h   |    0 
 include/acpi/{platform => }/aclinux.h |    0 
 include/acpi/acpi.h                   |    2 +-
 include/acpi/acpiosxf.h               |    2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename include/acpi/{platform => }/acenv.h (100%)
 rename include/acpi/{platform => }/acgcc.h (100%)
 rename include/acpi/{platform => }/aclinux.h (100%)

diff --git a/include/acpi/platform/acenv.h b/include/acpi/acenv.h
similarity index 100%
rename from include/acpi/platform/acenv.h
rename to include/acpi/acenv.h
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/acgcc.h
similarity index 100%
rename from include/acpi/platform/acgcc.h
rename to include/acpi/acgcc.h
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/aclinux.h
similarity index 100%
rename from include/acpi/platform/aclinux.h
rename to include/acpi/aclinux.h
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index 472b7bf..508a26b 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -53,7 +53,7 @@
  *
  * Note: The order of these include files is important.
  */
-#include "platform/acenv.h"	/* Environment-specific items */
+#include "acenv.h"		/* Environment-specific items */
 #include "acnames.h"		/* Common ACPI names and strings */
 #include "actypes.h"		/* ACPICA data types and structures */
 #include "acexcep.h"		/* ACPICA exceptions */
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index a62720a..a65f5a6 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -47,7 +47,7 @@
 #ifndef __ACPIOSXF_H__
 #define __ACPIOSXF_H__
 
-#include "platform/acenv.h"
+#include "acenv.h"
 #include "actypes.h"
 
 /* Types for acpi_os_execute */
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
  2008-12-31 10:51   ` [PATCH 02/15] ACPI: delete include/acpi/platform/ Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2009-01-02 19:14     ` Ingo Molnar
  2008-12-31 10:51   ` [PATCH 04/15] ACPICA: acdebug.h is private Len Brown
                     ` (12 subsequent siblings)
  14 siblings, 1 reply; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/accommon.h |    0 
 {include/acpi => kernel/acpi/acpica}/acconfig.h |    0 
 {include/acpi => kernel/acpi/acpica}/acglobal.h |    0 
 {include/acpi => kernel/acpi/acpica}/achware.h  |    0 
 {include/acpi => kernel/acpi/acpica}/aclocal.h  |    0 
 {include/acpi => kernel/acpi/acpica}/acmacros.h |    0 
 {include/acpi => kernel/acpi/acpica}/acobject.h |    0 
 {include/acpi => kernel/acpi/acpica}/acstruct.h |    0 
 {include/acpi => kernel/acpi/acpica}/acutils.h  |    0 
 kernel/acpi/acpica/dsfield.c                    |    2 +-
 kernel/acpi/acpica/dsinit.c                     |    2 +-
 kernel/acpi/acpica/dsmethod.c                   |    2 +-
 kernel/acpi/acpica/dsmthdat.c                   |    2 +-
 kernel/acpi/acpica/dsobject.c                   |    2 +-
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/dsutils.c                    |    2 +-
 kernel/acpi/acpica/dswexec.c                    |    2 +-
 kernel/acpi/acpica/dswload.c                    |    2 +-
 kernel/acpi/acpica/dswscope.c                   |    2 +-
 kernel/acpi/acpica/dswstate.c                   |    2 +-
 kernel/acpi/acpica/evevent.c                    |    2 +-
 kernel/acpi/acpica/evgpe.c                      |    2 +-
 kernel/acpi/acpica/evgpeblk.c                   |    2 +-
 kernel/acpi/acpica/evmisc.c                     |    2 +-
 kernel/acpi/acpica/evregion.c                   |    2 +-
 kernel/acpi/acpica/evrgnini.c                   |    2 +-
 kernel/acpi/acpica/evsci.c                      |    2 +-
 kernel/acpi/acpica/evxface.c                    |    2 +-
 kernel/acpi/acpica/evxfevnt.c                   |    2 +-
 kernel/acpi/acpica/evxfregn.c                   |    2 +-
 kernel/acpi/acpica/exconfig.c                   |    2 +-
 kernel/acpi/acpica/exconvrt.c                   |    2 +-
 kernel/acpi/acpica/excreate.c                   |    2 +-
 kernel/acpi/acpica/exdump.c                     |    2 +-
 kernel/acpi/acpica/exfield.c                    |    2 +-
 kernel/acpi/acpica/exfldio.c                    |    2 +-
 kernel/acpi/acpica/exmisc.c                     |    2 +-
 kernel/acpi/acpica/exmutex.c                    |    2 +-
 kernel/acpi/acpica/exnames.c                    |    2 +-
 kernel/acpi/acpica/exoparg1.c                   |    2 +-
 kernel/acpi/acpica/exoparg2.c                   |    2 +-
 kernel/acpi/acpica/exoparg3.c                   |    2 +-
 kernel/acpi/acpica/exoparg6.c                   |    2 +-
 kernel/acpi/acpica/exprep.c                     |    2 +-
 kernel/acpi/acpica/exregion.c                   |    2 +-
 kernel/acpi/acpica/exresnte.c                   |    2 +-
 kernel/acpi/acpica/exresolv.c                   |    2 +-
 kernel/acpi/acpica/exresop.c                    |    2 +-
 kernel/acpi/acpica/exstore.c                    |    2 +-
 kernel/acpi/acpica/exstoren.c                   |    2 +-
 kernel/acpi/acpica/exstorob.c                   |    2 +-
 kernel/acpi/acpica/exsystem.c                   |    2 +-
 kernel/acpi/acpica/exutils.c                    |    2 +-
 kernel/acpi/acpica/hwacpi.c                     |    2 +-
 kernel/acpi/acpica/hwgpe.c                      |    2 +-
 kernel/acpi/acpica/hwregs.c                     |    2 +-
 kernel/acpi/acpica/hwsleep.c                    |    2 +-
 kernel/acpi/acpica/hwtimer.c                    |    2 +-
 kernel/acpi/acpica/hwxface.c                    |    2 +-
 kernel/acpi/acpica/nsaccess.c                   |    2 +-
 kernel/acpi/acpica/nsalloc.c                    |    2 +-
 kernel/acpi/acpica/nsdump.c                     |    2 +-
 kernel/acpi/acpica/nsdumpdv.c                   |    2 +-
 kernel/acpi/acpica/nseval.c                     |    2 +-
 kernel/acpi/acpica/nsinit.c                     |    2 +-
 kernel/acpi/acpica/nsload.c                     |    2 +-
 kernel/acpi/acpica/nsnames.c                    |    2 +-
 kernel/acpi/acpica/nsobject.c                   |    2 +-
 kernel/acpi/acpica/nsparse.c                    |    2 +-
 kernel/acpi/acpica/nspredef.c                   |    2 +-
 kernel/acpi/acpica/nssearch.c                   |    2 +-
 kernel/acpi/acpica/nsutils.c                    |    2 +-
 kernel/acpi/acpica/nswalk.c                     |    2 +-
 kernel/acpi/acpica/nsxfeval.c                   |    2 +-
 kernel/acpi/acpica/nsxfname.c                   |    2 +-
 kernel/acpi/acpica/nsxfobj.c                    |    2 +-
 kernel/acpi/acpica/psargs.c                     |    2 +-
 kernel/acpi/acpica/psloop.c                     |    2 +-
 kernel/acpi/acpica/psopcode.c                   |    2 +-
 kernel/acpi/acpica/psparse.c                    |    2 +-
 kernel/acpi/acpica/psscope.c                    |    2 +-
 kernel/acpi/acpica/pstree.c                     |    2 +-
 kernel/acpi/acpica/psutils.c                    |    2 +-
 kernel/acpi/acpica/pswalk.c                     |    2 +-
 kernel/acpi/acpica/psxface.c                    |    2 +-
 kernel/acpi/acpica/rsaddr.c                     |    2 +-
 kernel/acpi/acpica/rscalc.c                     |    2 +-
 kernel/acpi/acpica/rscreate.c                   |    2 +-
 kernel/acpi/acpica/rsdump.c                     |    2 +-
 kernel/acpi/acpica/rsinfo.c                     |    2 +-
 kernel/acpi/acpica/rsio.c                       |    2 +-
 kernel/acpi/acpica/rsirq.c                      |    2 +-
 kernel/acpi/acpica/rslist.c                     |    2 +-
 kernel/acpi/acpica/rsmemory.c                   |    2 +-
 kernel/acpi/acpica/rsmisc.c                     |    2 +-
 kernel/acpi/acpica/rsutils.c                    |    2 +-
 kernel/acpi/acpica/rsxface.c                    |    2 +-
 kernel/acpi/acpica/tbfadt.c                     |    2 +-
 kernel/acpi/acpica/tbfind.c                     |    2 +-
 kernel/acpi/acpica/tbinstal.c                   |    2 +-
 kernel/acpi/acpica/tbutils.c                    |    2 +-
 kernel/acpi/acpica/tbxface.c                    |    2 +-
 kernel/acpi/acpica/tbxfroot.c                   |    2 +-
 kernel/acpi/acpica/utalloc.c                    |    2 +-
 kernel/acpi/acpica/utcache.c                    |    2 +-
 kernel/acpi/acpica/utcopy.c                     |    2 +-
 kernel/acpi/acpica/utdebug.c                    |    2 +-
 kernel/acpi/acpica/utdelete.c                   |    2 +-
 kernel/acpi/acpica/uteval.c                     |    2 +-
 kernel/acpi/acpica/utglobal.c                   |    2 +-
 kernel/acpi/acpica/utinit.c                     |    2 +-
 kernel/acpi/acpica/utmath.c                     |    2 +-
 kernel/acpi/acpica/utmisc.c                     |    2 +-
 kernel/acpi/acpica/utmutex.c                    |    2 +-
 kernel/acpi/acpica/utobject.c                   |    2 +-
 kernel/acpi/acpica/utresrc.c                    |    2 +-
 kernel/acpi/acpica/utstate.c                    |    2 +-
 kernel/acpi/acpica/utxface.c                    |    2 +-
 118 files changed, 109 insertions(+), 109 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/accommon.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/acconfig.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/acglobal.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/achware.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/aclocal.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/acmacros.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/acobject.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/acstruct.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/acutils.h (100%)

diff --git a/include/acpi/accommon.h b/kernel/acpi/acpica/accommon.h
similarity index 100%
rename from include/acpi/accommon.h
rename to kernel/acpi/acpica/accommon.h
diff --git a/include/acpi/acconfig.h b/kernel/acpi/acpica/acconfig.h
similarity index 100%
rename from include/acpi/acconfig.h
rename to kernel/acpi/acpica/acconfig.h
diff --git a/include/acpi/acglobal.h b/kernel/acpi/acpica/acglobal.h
similarity index 100%
rename from include/acpi/acglobal.h
rename to kernel/acpi/acpica/acglobal.h
diff --git a/include/acpi/achware.h b/kernel/acpi/acpica/achware.h
similarity index 100%
rename from include/acpi/achware.h
rename to kernel/acpi/acpica/achware.h
diff --git a/include/acpi/aclocal.h b/kernel/acpi/acpica/aclocal.h
similarity index 100%
rename from include/acpi/aclocal.h
rename to kernel/acpi/acpica/aclocal.h
diff --git a/include/acpi/acmacros.h b/kernel/acpi/acpica/acmacros.h
similarity index 100%
rename from include/acpi/acmacros.h
rename to kernel/acpi/acpica/acmacros.h
diff --git a/include/acpi/acobject.h b/kernel/acpi/acpica/acobject.h
similarity index 100%
rename from include/acpi/acobject.h
rename to kernel/acpi/acpica/acobject.h
diff --git a/include/acpi/acstruct.h b/kernel/acpi/acpica/acstruct.h
similarity index 100%
rename from include/acpi/acstruct.h
rename to kernel/acpi/acpica/acstruct.h
diff --git a/include/acpi/acutils.h b/kernel/acpi/acpica/acutils.h
similarity index 100%
rename from include/acpi/acutils.h
rename to kernel/acpi/acpica/acutils.h
diff --git a/kernel/acpi/acpica/dsfield.c b/kernel/acpi/acpica/dsfield.c
index 5fbc240..4c2288c 100644
--- a/kernel/acpi/acpica/dsfield.c
+++ b/kernel/acpi/acpica/dsfield.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/dsinit.c b/kernel/acpi/acpica/dsinit.c
index 4f1cdd8..d55d3eb 100644
--- a/kernel/acpi/acpica/dsinit.c
+++ b/kernel/acpi/acpica/dsinit.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdispat.h>
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
index 64ebccb..c468936 100644
--- a/kernel/acpi/acpica/dsmethod.c
+++ b/kernel/acpi/acpica/dsmethod.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/dsmthdat.c b/kernel/acpi/acpica/dsmthdat.c
index a1a1199..0d4135a 100644
--- a/kernel/acpi/acpica/dsmthdat.c
+++ b/kernel/acpi/acpica/dsmthdat.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdispat.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/dsobject.c b/kernel/acpi/acpica/dsobject.c
index 6e6c73c..e9efea0 100644
--- a/kernel/acpi/acpica/dsobject.c
+++ b/kernel/acpi/acpica/dsobject.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index cb8a0d3..a0850bb 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index 9c88846..876f7ae 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index 2482cbd..b3bd502 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index 2d71ced..35f901e 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/dswscope.c b/kernel/acpi/acpica/dswscope.c
index 8030541..7ddf845 100644
--- a/kernel/acpi/acpica/dswscope.c
+++ b/kernel/acpi/acpica/dswscope.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdispat.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dswstate.c b/kernel/acpi/acpica/dswstate.c
index a7543c4..0464cfd 100644
--- a/kernel/acpi/acpica/dswstate.c
+++ b/kernel/acpi/acpica/dswstate.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/evevent.c b/kernel/acpi/acpica/evevent.c
index 86bf083..d42d26c 100644
--- a/kernel/acpi/acpica/evevent.c
+++ b/kernel/acpi/acpica/evevent.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evgpe.c b/kernel/acpi/acpica/evgpe.c
index d977960..c1b2e71 100644
--- a/kernel/acpi/acpica/evgpe.c
+++ b/kernel/acpi/acpica/evgpe.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/evgpeblk.c b/kernel/acpi/acpica/evgpeblk.c
index 2a8d185..bdc53d4 100644
--- a/kernel/acpi/acpica/evgpeblk.c
+++ b/kernel/acpi/acpica/evgpeblk.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/evmisc.c b/kernel/acpi/acpica/evmisc.c
index 16f2c1a..da0e220 100644
--- a/kernel/acpi/acpica/evmisc.c
+++ b/kernel/acpi/acpica/evmisc.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/evregion.c b/kernel/acpi/acpica/evregion.c
index 7346093..10859f0 100644
--- a/kernel/acpi/acpica/evregion.c
+++ b/kernel/acpi/acpica/evregion.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/evrgnini.c b/kernel/acpi/acpica/evrgnini.c
index 1b7f9fd..5348a9e 100644
--- a/kernel/acpi/acpica/evrgnini.c
+++ b/kernel/acpi/acpica/evrgnini.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/evsci.c b/kernel/acpi/acpica/evsci.c
index 18dce10..a0e5800 100644
--- a/kernel/acpi/acpica/evsci.c
+++ b/kernel/acpi/acpica/evsci.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evxface.c b/kernel/acpi/acpica/evxface.c
index 3b6a069..5577671 100644
--- a/kernel/acpi/acpica/evxface.c
+++ b/kernel/acpi/acpica/evxface.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/evxfevnt.c b/kernel/acpi/acpica/evxfevnt.c
index f33cc30..11b79a3 100644
--- a/kernel/acpi/acpica/evxfevnt.c
+++ b/kernel/acpi/acpica/evxfevnt.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/evxfregn.c b/kernel/acpi/acpica/evxfregn.c
index b863394..6e5e277 100644
--- a/kernel/acpi/acpica/evxfregn.c
+++ b/kernel/acpi/acpica/evxfregn.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 
diff --git a/kernel/acpi/acpica/exconfig.c b/kernel/acpi/acpica/exconfig.c
index be32d01..533a8be 100644
--- a/kernel/acpi/acpica/exconfig.c
+++ b/kernel/acpi/acpica/exconfig.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/exconvrt.c b/kernel/acpi/acpica/exconvrt.c
index caeead4..0f1dffd 100644
--- a/kernel/acpi/acpica/exconvrt.c
+++ b/kernel/acpi/acpica/exconvrt.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/excreate.c b/kernel/acpi/acpica/excreate.c
index 5aa65a2..4f26a8a 100644
--- a/kernel/acpi/acpica/excreate.c
+++ b/kernel/acpi/acpica/excreate.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/exdump.c b/kernel/acpi/acpica/exdump.c
index 8241b9e..b2b8fd2 100644
--- a/kernel/acpi/acpica/exdump.c
+++ b/kernel/acpi/acpica/exdump.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/exfield.c b/kernel/acpi/acpica/exfield.c
index 7b6df03..81a6883 100644
--- a/kernel/acpi/acpica/exfield.c
+++ b/kernel/acpi/acpica/exfield.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/exfldio.c b/kernel/acpi/acpica/exfldio.c
index 33cd17a..ecb8b83 100644
--- a/kernel/acpi/acpica/exfldio.c
+++ b/kernel/acpi/acpica/exfldio.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acevents.h>
diff --git a/kernel/acpi/acpica/exmisc.c b/kernel/acpi/acpica/exmisc.c
index e445463..28d09e6 100644
--- a/kernel/acpi/acpica/exmisc.c
+++ b/kernel/acpi/acpica/exmisc.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/amlresrc.h>
diff --git a/kernel/acpi/acpica/exmutex.c b/kernel/acpi/acpica/exmutex.c
index f86bcee..eac86c0 100644
--- a/kernel/acpi/acpica/exmutex.c
+++ b/kernel/acpi/acpica/exmutex.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/acevents.h>
 
diff --git a/kernel/acpi/acpica/exnames.c b/kernel/acpi/acpica/exnames.c
index 12d3513..c1dee3b 100644
--- a/kernel/acpi/acpica/exnames.c
+++ b/kernel/acpi/acpica/exnames.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
index 52d78b8..f1daf0c 100644
--- a/kernel/acpi/acpica/exoparg1.c
+++ b/kernel/acpi/acpica/exoparg1.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/exoparg2.c b/kernel/acpi/acpica/exoparg2.c
index b01980d..83b2e59 100644
--- a/kernel/acpi/acpica/exoparg2.c
+++ b/kernel/acpi/acpica/exoparg2.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
 #include <acpi/acevents.h>
diff --git a/kernel/acpi/acpica/exoparg3.c b/kernel/acpi/acpica/exoparg3.c
index 26dbd5c..69a3fd2 100644
--- a/kernel/acpi/acpica/exoparg3.c
+++ b/kernel/acpi/acpica/exoparg3.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/exoparg6.c b/kernel/acpi/acpica/exoparg6.c
index bbbba50..9b5e0da 100644
--- a/kernel/acpi/acpica/exoparg6.c
+++ b/kernel/acpi/acpica/exoparg6.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/exprep.c b/kernel/acpi/acpica/exprep.c
index 8f2baa9..59f8410 100644
--- a/kernel/acpi/acpica/exprep.c
+++ b/kernel/acpi/acpica/exprep.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/exregion.c b/kernel/acpi/acpica/exregion.c
index ceb269e..bfff7f7 100644
--- a/kernel/acpi/acpica/exregion.c
+++ b/kernel/acpi/acpica/exregion.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exresnte.c b/kernel/acpi/acpica/exresnte.c
index 77df6e4..fb1f692 100644
--- a/kernel/acpi/acpica/exresnte.c
+++ b/kernel/acpi/acpica/exresnte.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/exresolv.c b/kernel/acpi/acpica/exresolv.c
index 42adde0..e8382f7 100644
--- a/kernel/acpi/acpica/exresolv.c
+++ b/kernel/acpi/acpica/exresolv.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/exresop.c b/kernel/acpi/acpica/exresop.c
index 7602eaf..8fbd5c2 100644
--- a/kernel/acpi/acpica/exresop.c
+++ b/kernel/acpi/acpica/exresop.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/exstore.c b/kernel/acpi/acpica/exstore.c
index 6f5647f..c09ae29 100644
--- a/kernel/acpi/acpica/exstore.c
+++ b/kernel/acpi/acpica/exstore.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/exstoren.c b/kernel/acpi/acpica/exstoren.c
index ad2047a..ea2c108 100644
--- a/kernel/acpi/acpica/exstoren.c
+++ b/kernel/acpi/acpica/exstoren.c
@@ -44,7 +44,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/exstorob.c b/kernel/acpi/acpica/exstorob.c
index a48d580..7254ccf 100644
--- a/kernel/acpi/acpica/exstorob.c
+++ b/kernel/acpi/acpica/exstorob.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exsystem.c b/kernel/acpi/acpica/exsystem.c
index a25b2c5..433f663 100644
--- a/kernel/acpi/acpica/exsystem.c
+++ b/kernel/acpi/acpica/exsystem.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exutils.c b/kernel/acpi/acpica/exutils.c
index 0ecdb70..1876c0e 100644
--- a/kernel/acpi/acpica/exutils.c
+++ b/kernel/acpi/acpica/exutils.c
@@ -59,7 +59,7 @@
 #define DEFINE_AML_GLOBALS
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/hwacpi.c b/kernel/acpi/acpica/hwacpi.c
index c76e3cd..a9d4fea 100644
--- a/kernel/acpi/acpica/hwacpi.c
+++ b/kernel/acpi/acpica/hwacpi.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwacpi")
diff --git a/kernel/acpi/acpica/hwgpe.c b/kernel/acpi/acpica/hwgpe.c
index 2b4a85a..04feb50 100644
--- a/kernel/acpi/acpica/hwgpe.c
+++ b/kernel/acpi/acpica/hwgpe.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_HARDWARE
diff --git a/kernel/acpi/acpica/hwregs.c b/kernel/acpi/acpica/hwregs.c
index 4bc3bbb..27fd268 100644
--- a/kernel/acpi/acpica/hwregs.c
+++ b/kernel/acpi/acpica/hwregs.c
@@ -44,7 +44,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 
diff --git a/kernel/acpi/acpica/hwsleep.c b/kernel/acpi/acpica/hwsleep.c
index 54dd3ee..f290376 100644
--- a/kernel/acpi/acpica/hwsleep.c
+++ b/kernel/acpi/acpica/hwsleep.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_HARDWARE
diff --git a/kernel/acpi/acpica/hwtimer.c b/kernel/acpi/acpica/hwtimer.c
index d1eac2a..b7f522c 100644
--- a/kernel/acpi/acpica/hwtimer.c
+++ b/kernel/acpi/acpica/hwtimer.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwtimer")
diff --git a/kernel/acpi/acpica/hwxface.c b/kernel/acpi/acpica/hwxface.c
index a4456fc..1b1e3a4 100644
--- a/kernel/acpi/acpica/hwxface.c
+++ b/kernel/acpi/acpica/hwxface.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_HARDWARE
diff --git a/kernel/acpi/acpica/nsaccess.c b/kernel/acpi/acpica/nsaccess.c
index 7954640..5ecc45b 100644
--- a/kernel/acpi/acpica/nsaccess.c
+++ b/kernel/acpi/acpica/nsaccess.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/nsalloc.c b/kernel/acpi/acpica/nsalloc.c
index cb2afbf..5bc78a6 100644
--- a/kernel/acpi/acpica/nsalloc.c
+++ b/kernel/acpi/acpica/nsalloc.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsdump.c b/kernel/acpi/acpica/nsdump.c
index 48f02e6..c15eb13 100644
--- a/kernel/acpi/acpica/nsdump.c
+++ b/kernel/acpi/acpica/nsdump.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsdumpdv.c b/kernel/acpi/acpica/nsdumpdv.c
index cc3df78..447948d 100644
--- a/kernel/acpi/acpica/nsdumpdv.c
+++ b/kernel/acpi/acpica/nsdumpdv.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 /* TBD: This entire module is apparently obsolete and should be removed */
 
diff --git a/kernel/acpi/acpica/nseval.c b/kernel/acpi/acpica/nseval.c
index a8d7764..543b0bb 100644
--- a/kernel/acpi/acpica/nseval.c
+++ b/kernel/acpi/acpica/nseval.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/nsinit.c b/kernel/acpi/acpica/nsinit.c
index fe470c4..40b3ed1 100644
--- a/kernel/acpi/acpica/nsinit.c
+++ b/kernel/acpi/acpica/nsinit.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/nsload.c b/kernel/acpi/acpica/nsload.c
index a6e92b3..f00a3ed 100644
--- a/kernel/acpi/acpica/nsload.c
+++ b/kernel/acpi/acpica/nsload.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acdispat.h>
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/nsnames.c b/kernel/acpi/acpica/nsnames.c
index b7e3018..36d79bd 100644
--- a/kernel/acpi/acpica/nsnames.c
+++ b/kernel/acpi/acpica/nsnames.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/nsobject.c b/kernel/acpi/acpica/nsobject.c
index ca9edee..3063da2 100644
--- a/kernel/acpi/acpica/nsobject.c
+++ b/kernel/acpi/acpica/nsobject.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsparse.c b/kernel/acpi/acpica/nsparse.c
index bcfcf42..5385a27 100644
--- a/kernel/acpi/acpica/nsparse.c
+++ b/kernel/acpi/acpica/nsparse.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
diff --git a/kernel/acpi/acpica/nspredef.c b/kernel/acpi/acpica/nspredef.c
index 1e682d0..842fadd 100644
--- a/kernel/acpi/acpica/nspredef.c
+++ b/kernel/acpi/acpica/nspredef.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acpredef.h>
 
diff --git a/kernel/acpi/acpica/nssearch.c b/kernel/acpi/acpica/nssearch.c
index a76c731..6414fc2 100644
--- a/kernel/acpi/acpica/nssearch.c
+++ b/kernel/acpi/acpica/nssearch.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsutils.c b/kernel/acpi/acpica/nsutils.c
index a443d28..0f01952 100644
--- a/kernel/acpi/acpica/nsutils.c
+++ b/kernel/acpi/acpica/nsutils.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/amlcode.h>
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/nswalk.c b/kernel/acpi/acpica/nswalk.c
index 71b83e9..9691644 100644
--- a/kernel/acpi/acpica/nswalk.c
+++ b/kernel/acpi/acpica/nswalk.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsxfeval.c b/kernel/acpi/acpica/nsxfeval.c
index 598393a..8117b9b 100644
--- a/kernel/acpi/acpica/nsxfeval.c
+++ b/kernel/acpi/acpica/nsxfeval.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/nsxfname.c b/kernel/acpi/acpica/nsxfname.c
index 7d5bfa9..648c947 100644
--- a/kernel/acpi/acpica/nsxfname.c
+++ b/kernel/acpi/acpica/nsxfname.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsxfobj.c b/kernel/acpi/acpica/nsxfobj.c
index 80e6322..5252001 100644
--- a/kernel/acpi/acpica/nsxfobj.c
+++ b/kernel/acpi/acpica/nsxfobj.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/psargs.c b/kernel/acpi/acpica/psargs.c
index 852f3a8..3594073 100644
--- a/kernel/acpi/acpica/psargs.c
+++ b/kernel/acpi/acpica/psargs.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/psloop.c b/kernel/acpi/acpica/psloop.c
index fd6648f..427161c 100644
--- a/kernel/acpi/acpica/psloop.c
+++ b/kernel/acpi/acpica/psloop.c
@@ -50,7 +50,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/psopcode.c b/kernel/acpi/acpica/psopcode.c
index 3693a12..b52e198 100644
--- a/kernel/acpi/acpica/psopcode.c
+++ b/kernel/acpi/acpica/psopcode.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acopcode.h>
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/psparse.c b/kernel/acpi/acpica/psparse.c
index 9da48fd..258df64 100644
--- a/kernel/acpi/acpica/psparse.c
+++ b/kernel/acpi/acpica/psparse.c
@@ -51,7 +51,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/psscope.c b/kernel/acpi/acpica/psscope.c
index 22929ca..dc26c4a 100644
--- a/kernel/acpi/acpica/psscope.c
+++ b/kernel/acpi/acpica/psscope.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/pstree.c b/kernel/acpi/acpica/pstree.c
index 8e73fbf..d355ba1 100644
--- a/kernel/acpi/acpica/pstree.c
+++ b/kernel/acpi/acpica/pstree.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/psutils.c b/kernel/acpi/acpica/psutils.c
index eec7d62..d71e180 100644
--- a/kernel/acpi/acpica/psutils.c
+++ b/kernel/acpi/acpica/psutils.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/pswalk.c b/kernel/acpi/acpica/pswalk.c
index dacc422..a0cf80c 100644
--- a/kernel/acpi/acpica/pswalk.c
+++ b/kernel/acpi/acpica/pswalk.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/psxface.c b/kernel/acpi/acpica/psxface.c
index 98c31a8..f5a3a28 100644
--- a/kernel/acpi/acpica/psxface.c
+++ b/kernel/acpi/acpica/psxface.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/rsaddr.c b/kernel/acpi/acpica/rsaddr.c
index b4aba3a..c8b9350 100644
--- a/kernel/acpi/acpica/rsaddr.c
+++ b/kernel/acpi/acpica/rsaddr.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rscalc.c b/kernel/acpi/acpica/rscalc.c
index 4f2b186..1300f94 100644
--- a/kernel/acpi/acpica/rscalc.c
+++ b/kernel/acpi/acpica/rscalc.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/rscreate.c b/kernel/acpi/acpica/rscreate.c
index 3ca6069..499985d 100644
--- a/kernel/acpi/acpica/rscreate.c
+++ b/kernel/acpi/acpica/rscreate.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/rsdump.c b/kernel/acpi/acpica/rsdump.c
index 936a59b..5dee59d 100644
--- a/kernel/acpi/acpica/rsdump.c
+++ b/kernel/acpi/acpica/rsdump.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsinfo.c b/kernel/acpi/acpica/rsinfo.c
index aac41cc..8cb1ef6 100644
--- a/kernel/acpi/acpica/rsinfo.c
+++ b/kernel/acpi/acpica/rsinfo.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsio.c b/kernel/acpi/acpica/rsio.c
index d31129a..7f8c205 100644
--- a/kernel/acpi/acpica/rsio.c
+++ b/kernel/acpi/acpica/rsio.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsirq.c b/kernel/acpi/acpica/rsirq.c
index 9a5a08d..b73b1ee 100644
--- a/kernel/acpi/acpica/rsirq.c
+++ b/kernel/acpi/acpica/rsirq.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rslist.c b/kernel/acpi/acpica/rslist.c
index 4833898..e253f37 100644
--- a/kernel/acpi/acpica/rslist.c
+++ b/kernel/acpi/acpica/rslist.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsmemory.c b/kernel/acpi/acpica/rsmemory.c
index 5fd3746..ac48921 100644
--- a/kernel/acpi/acpica/rsmemory.c
+++ b/kernel/acpi/acpica/rsmemory.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsmisc.c b/kernel/acpi/acpica/rsmisc.c
index 2cd6e8c..375c275 100644
--- a/kernel/acpi/acpica/rsmisc.c
+++ b/kernel/acpi/acpica/rsmisc.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsutils.c b/kernel/acpi/acpica/rsutils.c
index 7450105..da89892 100644
--- a/kernel/acpi/acpica/rsutils.c
+++ b/kernel/acpi/acpica/rsutils.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acresrc.h>
 
diff --git a/kernel/acpi/acpica/rsxface.c b/kernel/acpi/acpica/rsxface.c
index 0a27435..b95f65a 100644
--- a/kernel/acpi/acpica/rsxface.c
+++ b/kernel/acpi/acpica/rsxface.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acresrc.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/tbfadt.c b/kernel/acpi/acpica/tbfadt.c
index 87f22e6..9c6769e 100644
--- a/kernel/acpi/acpica/tbfadt.c
+++ b/kernel/acpi/acpica/tbfadt.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_TABLES
diff --git a/kernel/acpi/acpica/tbfind.c b/kernel/acpi/acpica/tbfind.c
index 9d20cb6..941e38c 100644
--- a/kernel/acpi/acpica/tbfind.c
+++ b/kernel/acpi/acpica/tbfind.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_TABLES
diff --git a/kernel/acpi/acpica/tbinstal.c b/kernel/acpi/acpica/tbinstal.c
index 019b0d8..6cb77be 100644
--- a/kernel/acpi/acpica/tbinstal.c
+++ b/kernel/acpi/acpica/tbinstal.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/tbutils.c b/kernel/acpi/acpica/tbutils.c
index 4eb7189..55627ee 100644
--- a/kernel/acpi/acpica/tbutils.c
+++ b/kernel/acpi/acpica/tbutils.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_TABLES
diff --git a/kernel/acpi/acpica/tbxface.c b/kernel/acpi/acpica/tbxface.c
index 1157966..b3edad1 100644
--- a/kernel/acpi/acpica/tbxface.c
+++ b/kernel/acpi/acpica/tbxface.c
@@ -43,7 +43,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/tbxfroot.c b/kernel/acpi/acpica/tbxfroot.c
index 3495dca..8954e01 100644
--- a/kernel/acpi/acpica/tbxfroot.c
+++ b/kernel/acpi/acpica/tbxfroot.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_TABLES
diff --git a/kernel/acpi/acpica/utalloc.c b/kernel/acpi/acpica/utalloc.c
index 2a017b2..b4736db 100644
--- a/kernel/acpi/acpica/utalloc.c
+++ b/kernel/acpi/acpica/utalloc.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acdebug.h>
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utcache.c b/kernel/acpi/acpica/utcache.c
index 1e549fd..b0e672f 100644
--- a/kernel/acpi/acpica/utcache.c
+++ b/kernel/acpi/acpica/utcache.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utcache")
diff --git a/kernel/acpi/acpica/utcopy.c b/kernel/acpi/acpica/utcopy.c
index e6f3002..9150073 100644
--- a/kernel/acpi/acpica/utcopy.c
+++ b/kernel/acpi/acpica/utcopy.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 
diff --git a/kernel/acpi/acpica/utdebug.c b/kernel/acpi/acpica/utdebug.c
index 9a3538c..38821f5 100644
--- a/kernel/acpi/acpica/utdebug.c
+++ b/kernel/acpi/acpica/utdebug.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
diff --git a/kernel/acpi/acpica/utdelete.c b/kernel/acpi/acpica/utdelete.c
index 5b4e3b1..c26e1bd 100644
--- a/kernel/acpi/acpica/utdelete.c
+++ b/kernel/acpi/acpica/utdelete.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
diff --git a/kernel/acpi/acpica/uteval.c b/kernel/acpi/acpica/uteval.c
index e1e438c..41ff26a 100644
--- a/kernel/acpi/acpica/uteval.c
+++ b/kernel/acpi/acpica/uteval.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/utglobal.c b/kernel/acpi/acpica/utglobal.c
index 3e28d8c..1bc2fa0 100644
--- a/kernel/acpi/acpica/utglobal.c
+++ b/kernel/acpi/acpica/utglobal.c
@@ -44,7 +44,7 @@
 #define DEFINE_ACPI_GLOBALS
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utinit.c b/kernel/acpi/acpica/utinit.c
index 9316ec3..4d07002 100644
--- a/kernel/acpi/acpica/utinit.c
+++ b/kernel/acpi/acpica/utinit.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/utmath.c b/kernel/acpi/acpica/utmath.c
index 616d7b2..c9f682d 100644
--- a/kernel/acpi/acpica/utmath.c
+++ b/kernel/acpi/acpica/utmath.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmath")
diff --git a/kernel/acpi/acpica/utmisc.c b/kernel/acpi/acpica/utmisc.c
index 8f8b407..95c991d 100644
--- a/kernel/acpi/acpica/utmisc.c
+++ b/kernel/acpi/acpica/utmisc.c
@@ -44,7 +44,7 @@
 #include <linux/module.h>
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utmutex.c b/kernel/acpi/acpica/utmutex.c
index 7b48ba3..14eb52c 100644
--- a/kernel/acpi/acpica/utmutex.c
+++ b/kernel/acpi/acpica/utmutex.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmutex")
diff --git a/kernel/acpi/acpica/utobject.c b/kernel/acpi/acpica/utobject.c
index 964b23c..9dd272a 100644
--- a/kernel/acpi/acpica/utobject.c
+++ b/kernel/acpi/acpica/utobject.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utresrc.c b/kernel/acpi/acpica/utresrc.c
index 0755c5c..118ae85 100644
--- a/kernel/acpi/acpica/utresrc.c
+++ b/kernel/acpi/acpica/utresrc.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/amlresrc.h>
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utstate.c b/kernel/acpi/acpica/utstate.c
index 54c3461..0440c95 100644
--- a/kernel/acpi/acpica/utstate.c
+++ b/kernel/acpi/acpica/utstate.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utstate")
diff --git a/kernel/acpi/acpica/utxface.c b/kernel/acpi/acpica/utxface.c
index 5b27724..1c776d3 100644
--- a/kernel/acpi/acpica/utxface.c
+++ b/kernel/acpi/acpica/utxface.c
@@ -42,7 +42,7 @@
  */
 
 #include <acpi/acpi.h>
-#include <acpi/accommon.h>
+#include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acdebug.h>
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 04/15] ACPICA: acdebug.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
  2008-12-31 10:51   ` [PATCH 02/15] ACPI: delete include/acpi/platform/ Len Brown
  2008-12-31 10:51   ` [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/ Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:51   ` [PATCH 05/15] ACPICA: delete acdisasm.h Len Brown
                     ` (11 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acdebug.h |    0 
 kernel/acpi/acpica/dsutils.c                   |    2 +-
 kernel/acpi/acpica/dswexec.c                   |    2 +-
 kernel/acpi/acpica/utalloc.c                   |    2 +-
 kernel/acpi/acpica/utxface.c                   |    2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acdebug.h (100%)

diff --git a/include/acpi/acdebug.h b/kernel/acpi/acpica/acdebug.h
similarity index 100%
rename from include/acpi/acdebug.h
rename to kernel/acpi/acpica/acdebug.h
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index 876f7ae..7f7f59e 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -48,7 +48,7 @@
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acdebug.h>
+#include "acdebug.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsutils")
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index b3bd502..696f54b 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -49,7 +49,7 @@
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acdebug.h>
+#include "acdebug.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswexec")
diff --git a/kernel/acpi/acpica/utalloc.c b/kernel/acpi/acpica/utalloc.c
index b4736db..7580f6b 100644
--- a/kernel/acpi/acpica/utalloc.c
+++ b/kernel/acpi/acpica/utalloc.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdebug.h>
+#include "acdebug.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utalloc")
diff --git a/kernel/acpi/acpica/utxface.c b/kernel/acpi/acpica/utxface.c
index 1c776d3..8e2dfab 100644
--- a/kernel/acpi/acpica/utxface.c
+++ b/kernel/acpi/acpica/utxface.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acdebug.h>
+#include "acdebug.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_UTILITIES
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 05/15] ACPICA: delete acdisasm.h
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (2 preceding siblings ...)
  2008-12-31 10:51   ` [PATCH 04/15] ACPICA: acdebug.h is private Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:51   ` [PATCH 06/15] ACPICA: acdispat.h is private Len Brown
                     ` (10 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

it is used only #ifdef ACPI_DISASSEMBLER,
which is never set in the kernel.

Signed-off-by: Len Brown <len.brown@intel.com>
---
 include/acpi/acdisasm.h       |  453 -----------------------------------------
 kernel/acpi/acpica/dsmethod.c |    2 +
 2 files changed, 2 insertions(+), 453 deletions(-)
 delete mode 100644 include/acpi/acdisasm.h

diff --git a/include/acpi/acdisasm.h b/include/acpi/acdisasm.h
deleted file mode 100644
index 8eb1d48..0000000
--- a/include/acpi/acdisasm.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/******************************************************************************
- *
- * Name: acdisasm.h - AML disassembler
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2008, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#ifndef __ACDISASM_H__
-#define __ACDISASM_H__
-
-#include "amlresrc.h"
-
-#define BLOCK_NONE              0
-#define BLOCK_PAREN             1
-#define BLOCK_BRACE             2
-#define BLOCK_COMMA_LIST        4
-#define ACPI_DEFAULT_RESNAME    *(u32 *) "__RD"
-
-struct acpi_external_list {
-	char *path;
-	char *internal_path;
-	struct acpi_external_list *next;
-	u32 value;
-	u16 length;
-	u8 type;
-};
-
-extern struct acpi_external_list *acpi_gbl_external_list;
-
-typedef const struct acpi_dmtable_info {
-	u8 opcode;
-	u8 offset;
-	char *name;
-
-} acpi_dmtable_info;
-
-/*
- * Values for Opcode above.
- * Note: 0-7 must not change, used as a flag shift value
- */
-#define ACPI_DMT_FLAG0                  0
-#define ACPI_DMT_FLAG1                  1
-#define ACPI_DMT_FLAG2                  2
-#define ACPI_DMT_FLAG3                  3
-#define ACPI_DMT_FLAG4                  4
-#define ACPI_DMT_FLAG5                  5
-#define ACPI_DMT_FLAG6                  6
-#define ACPI_DMT_FLAG7                  7
-#define ACPI_DMT_FLAGS0                 8
-#define ACPI_DMT_FLAGS2                 9
-#define ACPI_DMT_UINT8                  10
-#define ACPI_DMT_UINT16                 11
-#define ACPI_DMT_UINT24                 12
-#define ACPI_DMT_UINT32                 13
-#define ACPI_DMT_UINT56                 14
-#define ACPI_DMT_UINT64                 15
-#define ACPI_DMT_STRING                 16
-#define ACPI_DMT_NAME4                  17
-#define ACPI_DMT_NAME6                  18
-#define ACPI_DMT_NAME8                  19
-#define ACPI_DMT_CHKSUM                 20
-#define ACPI_DMT_SPACEID                21
-#define ACPI_DMT_GAS                    22
-#define ACPI_DMT_ASF                    23
-#define ACPI_DMT_DMAR                   24
-#define ACPI_DMT_HEST                   25
-#define ACPI_DMT_HESTNTFY               26
-#define ACPI_DMT_HESTNTYP               27
-#define ACPI_DMT_MADT                   28
-#define ACPI_DMT_SRAT                   29
-#define ACPI_DMT_EXIT                   30
-#define ACPI_DMT_SIG                    31
-
-typedef
-void (*acpi_dmtable_handler) (struct acpi_table_header * table);
-
-struct acpi_dmtable_data {
-	char *signature;
-	struct acpi_dmtable_info *table_info;
-	acpi_dmtable_handler table_handler;
-	char *name;
-};
-
-struct acpi_op_walk_info {
-	u32 level;
-	u32 last_level;
-	u32 count;
-	u32 bit_offset;
-	u32 flags;
-	struct acpi_walk_state *walk_state;
-};
-
-typedef
-acpi_status(*asl_walk_callback) (union acpi_parse_object * op,
-				 u32 level, void *context);
-
-struct acpi_resource_tag {
-	u32 bit_index;
-	char *tag;
-};
-
-/* Strings used for decoding flags to ASL keywords */
-
-extern const char *acpi_gbl_word_decode[];
-extern const char *acpi_gbl_irq_decode[];
-extern const char *acpi_gbl_lock_rule[];
-extern const char *acpi_gbl_access_types[];
-extern const char *acpi_gbl_update_rules[];
-extern const char *acpi_gbl_match_ops[];
-
-extern struct acpi_dmtable_info acpi_dm_table_info_asf0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf1a[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf2[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf2a[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf3[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf4[];
-extern struct acpi_dmtable_info acpi_dm_table_info_asf_hdr[];
-extern struct acpi_dmtable_info acpi_dm_table_info_boot[];
-extern struct acpi_dmtable_info acpi_dm_table_info_bert[];
-extern struct acpi_dmtable_info acpi_dm_table_info_cpep[];
-extern struct acpi_dmtable_info acpi_dm_table_info_cpep0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dbgp[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dmar[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dmar_hdr[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dmar_scope[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dmar0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dmar1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_dmar2[];
-extern struct acpi_dmtable_info acpi_dm_table_info_ecdt[];
-extern struct acpi_dmtable_info acpi_dm_table_info_einj[];
-extern struct acpi_dmtable_info acpi_dm_table_info_einj0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_erst[];
-extern struct acpi_dmtable_info acpi_dm_table_info_facs[];
-extern struct acpi_dmtable_info acpi_dm_table_info_fadt1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_fadt2[];
-extern struct acpi_dmtable_info acpi_dm_table_info_gas[];
-extern struct acpi_dmtable_info acpi_dm_table_info_header[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest3[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest4[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest5[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest6[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest7[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest8[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest9[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hest_notify[];
-extern struct acpi_dmtable_info acpi_dm_table_info_hpet[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt2[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt3[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt4[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt5[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt6[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt7[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt8[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt9[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt10[];
-extern struct acpi_dmtable_info acpi_dm_table_info_madt_hdr[];
-extern struct acpi_dmtable_info acpi_dm_table_info_mcfg[];
-extern struct acpi_dmtable_info acpi_dm_table_info_mcfg0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_rsdp1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_rsdp2[];
-extern struct acpi_dmtable_info acpi_dm_table_info_sbst[];
-extern struct acpi_dmtable_info acpi_dm_table_info_slic[];
-extern struct acpi_dmtable_info acpi_dm_table_info_slit[];
-extern struct acpi_dmtable_info acpi_dm_table_info_spcr[];
-extern struct acpi_dmtable_info acpi_dm_table_info_spmi[];
-extern struct acpi_dmtable_info acpi_dm_table_info_srat[];
-extern struct acpi_dmtable_info acpi_dm_table_info_srat_hdr[];
-extern struct acpi_dmtable_info acpi_dm_table_info_srat0[];
-extern struct acpi_dmtable_info acpi_dm_table_info_srat1[];
-extern struct acpi_dmtable_info acpi_dm_table_info_srat2[];
-extern struct acpi_dmtable_info acpi_dm_table_info_tcpa[];
-extern struct acpi_dmtable_info acpi_dm_table_info_wdrt[];
-
-/*
- * dmtable
- */
-void acpi_dm_dump_data_table(struct acpi_table_header *table);
-
-acpi_status
-acpi_dm_dump_table(u32 table_length,
-		   u32 table_offset,
-		   void *table,
-		   u32 sub_table_length, struct acpi_dmtable_info *info);
-
-void acpi_dm_line_header(u32 offset, u32 byte_length, char *name);
-
-void acpi_dm_line_header2(u32 offset, u32 byte_length, char *name, u32 value);
-
-/*
- * dmtbdump
- */
-void acpi_dm_dump_asf(struct acpi_table_header *table);
-
-void acpi_dm_dump_cpep(struct acpi_table_header *table);
-
-void acpi_dm_dump_dmar(struct acpi_table_header *table);
-
-void acpi_dm_dump_einj(struct acpi_table_header *table);
-
-void acpi_dm_dump_erst(struct acpi_table_header *table);
-
-void acpi_dm_dump_fadt(struct acpi_table_header *table);
-
-void acpi_dm_dump_hest(struct acpi_table_header *table);
-
-void acpi_dm_dump_mcfg(struct acpi_table_header *table);
-
-void acpi_dm_dump_madt(struct acpi_table_header *table);
-
-u32 acpi_dm_dump_rsdp(struct acpi_table_header *table);
-
-void acpi_dm_dump_rsdt(struct acpi_table_header *table);
-
-void acpi_dm_dump_slit(struct acpi_table_header *table);
-
-void acpi_dm_dump_srat(struct acpi_table_header *table);
-
-void acpi_dm_dump_xsdt(struct acpi_table_header *table);
-
-/*
- * dmwalk
- */
-void
-acpi_dm_disassemble(struct acpi_walk_state *walk_state,
-		    union acpi_parse_object *origin, u32 num_opcodes);
-
-void
-acpi_dm_walk_parse_tree(union acpi_parse_object *op,
-			asl_walk_callback descending_callback,
-			asl_walk_callback ascending_callback, void *context);
-
-/*
- * dmopcode
- */
-void
-acpi_dm_disassemble_one_op(struct acpi_walk_state *walk_state,
-			   struct acpi_op_walk_info *info,
-			   union acpi_parse_object *op);
-
-void acpi_dm_decode_internal_object(union acpi_operand_object *obj_desc);
-
-u32 acpi_dm_list_type(union acpi_parse_object *op);
-
-void acpi_dm_method_flags(union acpi_parse_object *op);
-
-void acpi_dm_field_flags(union acpi_parse_object *op);
-
-void acpi_dm_address_space(u8 space_id);
-
-void acpi_dm_region_flags(union acpi_parse_object *op);
-
-void acpi_dm_match_op(union acpi_parse_object *op);
-
-u8 acpi_dm_comma_if_list_member(union acpi_parse_object *op);
-
-void acpi_dm_comma_if_field_member(union acpi_parse_object *op);
-
-/*
- * dmnames
- */
-u32 acpi_dm_dump_name(char *name);
-
-acpi_status
-acpi_ps_display_object_pathname(struct acpi_walk_state *walk_state,
-				union acpi_parse_object *op);
-
-void acpi_dm_namestring(char *name);
-
-/*
- * dmobject
- */
-void
-acpi_dm_display_internal_object(union acpi_operand_object *obj_desc,
-				struct acpi_walk_state *walk_state);
-
-void acpi_dm_display_arguments(struct acpi_walk_state *walk_state);
-
-void acpi_dm_display_locals(struct acpi_walk_state *walk_state);
-
-void
-acpi_dm_dump_method_info(acpi_status status,
-			 struct acpi_walk_state *walk_state,
-			 union acpi_parse_object *op);
-
-/*
- * dmbuffer
- */
-void acpi_dm_disasm_byte_list(u32 level, u8 * byte_data, u32 byte_count);
-
-void
-acpi_dm_byte_list(struct acpi_op_walk_info *info, union acpi_parse_object *op);
-
-void acpi_dm_is_eisa_id(union acpi_parse_object *op);
-
-void acpi_dm_eisa_id(u32 encoded_id);
-
-u8 acpi_dm_is_unicode_buffer(union acpi_parse_object *op);
-
-u8 acpi_dm_is_string_buffer(union acpi_parse_object *op);
-
-/*
- * dmresrc
- */
-void acpi_dm_dump_integer8(u8 value, char *name);
-
-void acpi_dm_dump_integer16(u16 value, char *name);
-
-void acpi_dm_dump_integer32(u32 value, char *name);
-
-void acpi_dm_dump_integer64(u64 value, char *name);
-
-void
-acpi_dm_resource_template(struct acpi_op_walk_info *info,
-			  union acpi_parse_object *op,
-			  u8 * byte_data, u32 byte_count);
-
-acpi_status acpi_dm_is_resource_template(union acpi_parse_object *op);
-
-void acpi_dm_indent(u32 level);
-
-void acpi_dm_bit_list(u16 mask);
-
-void acpi_dm_decode_attribute(u8 attribute);
-
-void acpi_dm_descriptor_name(void);
-
-/*
- * dmresrcl
- */
-void
-acpi_dm_word_descriptor(union aml_resource *resource, u32 length, u32 level);
-
-void
-acpi_dm_dword_descriptor(union aml_resource *resource, u32 length, u32 level);
-
-void
-acpi_dm_extended_descriptor(union aml_resource *resource,
-			    u32 length, u32 level);
-
-void
-acpi_dm_qword_descriptor(union aml_resource *resource, u32 length, u32 level);
-
-void
-acpi_dm_memory24_descriptor(union aml_resource *resource,
-			    u32 length, u32 level);
-
-void
-acpi_dm_memory32_descriptor(union aml_resource *resource,
-			    u32 length, u32 level);
-
-void
-acpi_dm_fixed_memory32_descriptor(union aml_resource *resource,
-				  u32 length, u32 level);
-
-void
-acpi_dm_generic_register_descriptor(union aml_resource *resource,
-				    u32 length, u32 level);
-
-void
-acpi_dm_interrupt_descriptor(union aml_resource *resource,
-			     u32 length, u32 level);
-
-void
-acpi_dm_vendor_large_descriptor(union aml_resource *resource,
-				u32 length, u32 level);
-
-void acpi_dm_vendor_common(char *name, u8 * byte_data, u32 length, u32 level);
-
-/*
- * dmresrcs
- */
-void
-acpi_dm_irq_descriptor(union aml_resource *resource, u32 length, u32 level);
-
-void
-acpi_dm_dma_descriptor(union aml_resource *resource, u32 length, u32 level);
-
-void acpi_dm_io_descriptor(union aml_resource *resource, u32 length, u32 level);
-
-void
-acpi_dm_fixed_io_descriptor(union aml_resource *resource,
-			    u32 length, u32 level);
-
-void
-acpi_dm_start_dependent_descriptor(union aml_resource *resource,
-				   u32 length, u32 level);
-
-void
-acpi_dm_end_dependent_descriptor(union aml_resource *resource,
-				 u32 length, u32 level);
-
-void
-acpi_dm_vendor_small_descriptor(union aml_resource *resource,
-				u32 length, u32 level);
-
-/*
- * dmutils
- */
-void acpi_dm_add_to_external_list(char *path, u8 type, u32 value);
-
-/*
- * dmrestag
- */
-void acpi_dm_find_resources(union acpi_parse_object *root);
-
-void
-acpi_dm_check_resource_reference(union acpi_parse_object *op,
-				 struct acpi_walk_state *walk_state);
-
-#endif				/* __ACDISASM_H__ */
diff --git a/kernel/acpi/acpica/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
index c468936..ae734d0 100644
--- a/kernel/acpi/acpica/dsmethod.c
+++ b/kernel/acpi/acpica/dsmethod.c
@@ -47,7 +47,9 @@
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
+#ifdef ACPI_DISASSEMBLER
 #include <acpi/acdisasm.h>
+#endif
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsmethod")
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 06/15] ACPICA: acdispat.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (3 preceding siblings ...)
  2008-12-31 10:51   ` [PATCH 05/15] ACPICA: delete acdisasm.h Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:51   ` [PATCH 07/15] ACPICA: acevents.h " Len Brown
                     ` (9 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acdispat.h |    0 
 kernel/acpi/acpica/dsfield.c                    |    2 +-
 kernel/acpi/acpica/dsinit.c                     |    2 +-
 kernel/acpi/acpica/dsmethod.c                   |    2 +-
 kernel/acpi/acpica/dsmthdat.c                   |    2 +-
 kernel/acpi/acpica/dsobject.c                   |    2 +-
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/dsutils.c                    |    2 +-
 kernel/acpi/acpica/dswexec.c                    |    2 +-
 kernel/acpi/acpica/dswload.c                    |    2 +-
 kernel/acpi/acpica/dswscope.c                   |    2 +-
 kernel/acpi/acpica/dswstate.c                   |    2 +-
 kernel/acpi/acpica/exconfig.c                   |    2 +-
 kernel/acpi/acpica/exfield.c                    |    2 +-
 kernel/acpi/acpica/exfldio.c                    |    2 +-
 kernel/acpi/acpica/exoparg1.c                   |    2 +-
 kernel/acpi/acpica/exresnte.c                   |    2 +-
 kernel/acpi/acpica/exresolv.c                   |    2 +-
 kernel/acpi/acpica/exstore.c                    |    2 +-
 kernel/acpi/acpica/nsaccess.c                   |    2 +-
 kernel/acpi/acpica/nsinit.c                     |    2 +-
 kernel/acpi/acpica/nsload.c                     |    2 +-
 kernel/acpi/acpica/nsparse.c                    |    2 +-
 kernel/acpi/acpica/psargs.c                     |    2 +-
 kernel/acpi/acpica/psloop.c                     |    2 +-
 kernel/acpi/acpica/psparse.c                    |    2 +-
 kernel/acpi/acpica/psxface.c                    |    2 +-
 27 files changed, 26 insertions(+), 26 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acdispat.h (100%)

diff --git a/include/acpi/acdispat.h b/kernel/acpi/acpica/acdispat.h
similarity index 100%
rename from include/acpi/acdispat.h
rename to kernel/acpi/acpica/acdispat.h
diff --git a/kernel/acpi/acpica/dsfield.c b/kernel/acpi/acpica/dsfield.c
index 4c2288c..7da22b0 100644
--- a/kernel/acpi/acpica/dsfield.c
+++ b/kernel/acpi/acpica/dsfield.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acparser.h>
diff --git a/kernel/acpi/acpica/dsinit.c b/kernel/acpi/acpica/dsinit.c
index d55d3eb..cc8f5c5 100644
--- a/kernel/acpi/acpica/dsinit.c
+++ b/kernel/acpi/acpica/dsinit.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
index ae734d0..3dc6def 100644
--- a/kernel/acpi/acpica/dsmethod.c
+++ b/kernel/acpi/acpica/dsmethod.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #ifdef ACPI_DISASSEMBLER
diff --git a/kernel/acpi/acpica/dsmthdat.c b/kernel/acpi/acpica/dsmthdat.c
index 0d4135a..e485f63 100644
--- a/kernel/acpi/acpica/dsmthdat.c
+++ b/kernel/acpi/acpica/dsmthdat.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/dsobject.c b/kernel/acpi/acpica/dsobject.c
index e9efea0..e0194d9 100644
--- a/kernel/acpi/acpica/dsobject.c
+++ b/kernel/acpi/acpica/dsobject.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index a0850bb..ed85e8c 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index 7f7f59e..07419d2 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include "acdebug.h"
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index 696f54b..9be469b 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include "acdebug.h"
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index 35f901e..c885c89 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
diff --git a/kernel/acpi/acpica/dswscope.c b/kernel/acpi/acpica/dswscope.c
index 7ddf845..908645e 100644
--- a/kernel/acpi/acpica/dswscope.c
+++ b/kernel/acpi/acpica/dswscope.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswscope")
diff --git a/kernel/acpi/acpica/dswstate.c b/kernel/acpi/acpica/dswstate.c
index 0464cfd..c65aae5 100644
--- a/kernel/acpi/acpica/dswstate.c
+++ b/kernel/acpi/acpica/dswstate.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/exconfig.c b/kernel/acpi/acpica/exconfig.c
index 533a8be..9970930 100644
--- a/kernel/acpi/acpica/exconfig.c
+++ b/kernel/acpi/acpica/exconfig.c
@@ -46,7 +46,7 @@
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exconfig")
diff --git a/kernel/acpi/acpica/exfield.c b/kernel/acpi/acpica/exfield.c
index 81a6883..9ed3bd7 100644
--- a/kernel/acpi/acpica/exfield.c
+++ b/kernel/acpi/acpica/exfield.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exfldio.c b/kernel/acpi/acpica/exfldio.c
index ecb8b83..6a1ba49 100644
--- a/kernel/acpi/acpica/exfldio.c
+++ b/kernel/acpi/acpica/exfldio.c
@@ -46,7 +46,7 @@
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acevents.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exfldio")
diff --git a/kernel/acpi/acpica/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
index f1daf0c..872f7dd 100644
--- a/kernel/acpi/acpica/exoparg1.c
+++ b/kernel/acpi/acpica/exoparg1.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/exresnte.c b/kernel/acpi/acpica/exresnte.c
index fb1f692..d66c21b 100644
--- a/kernel/acpi/acpica/exresnte.c
+++ b/kernel/acpi/acpica/exresnte.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exresolv.c b/kernel/acpi/acpica/exresolv.c
index e8382f7..f1da91a 100644
--- a/kernel/acpi/acpica/exresolv.c
+++ b/kernel/acpi/acpica/exresolv.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/amlcode.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exstore.c b/kernel/acpi/acpica/exstore.c
index c09ae29..742261c 100644
--- a/kernel/acpi/acpica/exstore.c
+++ b/kernel/acpi/acpica/exstore.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
diff --git a/kernel/acpi/acpica/nsaccess.c b/kernel/acpi/acpica/nsaccess.c
index 5ecc45b..d811edc 100644
--- a/kernel/acpi/acpica/nsaccess.c
+++ b/kernel/acpi/acpica/nsaccess.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsaccess")
diff --git a/kernel/acpi/acpica/nsinit.c b/kernel/acpi/acpica/nsinit.c
index 40b3ed1..f2200f1 100644
--- a/kernel/acpi/acpica/nsinit.c
+++ b/kernel/acpi/acpica/nsinit.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <linux/nmi.h>
 
diff --git a/kernel/acpi/acpica/nsload.c b/kernel/acpi/acpica/nsload.c
index f00a3ed..cbc673c 100644
--- a/kernel/acpi/acpica/nsload.c
+++ b/kernel/acpi/acpica/nsload.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsparse.c b/kernel/acpi/acpica/nsparse.c
index 5385a27..f509df8 100644
--- a/kernel/acpi/acpica/nsparse.c
+++ b/kernel/acpi/acpica/nsparse.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acparser.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/psargs.c b/kernel/acpi/acpica/psargs.c
index 3594073..ec7941b 100644
--- a/kernel/acpi/acpica/psargs.c
+++ b/kernel/acpi/acpica/psargs.c
@@ -46,7 +46,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psargs")
diff --git a/kernel/acpi/acpica/psloop.c b/kernel/acpi/acpica/psloop.c
index 427161c..d4f0f65 100644
--- a/kernel/acpi/acpica/psloop.c
+++ b/kernel/acpi/acpica/psloop.c
@@ -52,7 +52,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/psparse.c b/kernel/acpi/acpica/psparse.c
index 258df64..113697f 100644
--- a/kernel/acpi/acpica/psparse.c
+++ b/kernel/acpi/acpica/psparse.c
@@ -53,7 +53,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
diff --git a/kernel/acpi/acpica/psxface.c b/kernel/acpi/acpica/psxface.c
index f5a3a28..efeb80e 100644
--- a/kernel/acpi/acpica/psxface.c
+++ b/kernel/acpi/acpica/psxface.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acdispat.h>
+#include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
 
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 07/15] ACPICA: acevents.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (4 preceding siblings ...)
  2008-12-31 10:51   ` [PATCH 06/15] ACPICA: acdispat.h is private Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:51   ` [PATCH 08/15] ACPICA: acinterp.h " Len Brown
                     ` (8 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acevents.h |    0 
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/dswload.c                    |    2 +-
 kernel/acpi/acpica/evevent.c                    |    2 +-
 kernel/acpi/acpica/evgpe.c                      |    2 +-
 kernel/acpi/acpica/evgpeblk.c                   |    2 +-
 kernel/acpi/acpica/evmisc.c                     |    2 +-
 kernel/acpi/acpica/evregion.c                   |    2 +-
 kernel/acpi/acpica/evrgnini.c                   |    2 +-
 kernel/acpi/acpica/evsci.c                      |    2 +-
 kernel/acpi/acpica/evxface.c                    |    2 +-
 kernel/acpi/acpica/evxfevnt.c                   |    2 +-
 kernel/acpi/acpica/evxfregn.c                   |    2 +-
 kernel/acpi/acpica/exfldio.c                    |    2 +-
 kernel/acpi/acpica/exmutex.c                    |    2 +-
 kernel/acpi/acpica/exoparg2.c                   |    2 +-
 kernel/acpi/acpica/hwgpe.c                      |    2 +-
 kernel/acpi/acpica/hwregs.c                     |    2 +-
 kernel/acpi/acpica/utdelete.c                   |    2 +-
 kernel/acpi/acpica/utinit.c                     |    2 +-
 kernel/acpi/acpica/utxface.c                    |    2 +-
 21 files changed, 20 insertions(+), 20 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acevents.h (100%)

diff --git a/include/acpi/acevents.h b/kernel/acpi/acpica/acevents.h
similarity index 100%
rename from include/acpi/acevents.h
rename to kernel/acpi/acpica/acevents.h
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index ed85e8c..ab7ff9a 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -49,7 +49,7 @@
 #include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index c885c89..32d9d4f 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -48,7 +48,7 @@
 #include "acdispat.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #ifdef ACPI_ASL_COMPILER
 #include <acpi/acdisasm.h>
diff --git a/kernel/acpi/acpica/evevent.c b/kernel/acpi/acpica/evevent.c
index d42d26c..803edd9 100644
--- a/kernel/acpi/acpica/evevent.c
+++ b/kernel/acpi/acpica/evevent.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evevent")
diff --git a/kernel/acpi/acpica/evgpe.c b/kernel/acpi/acpica/evgpe.c
index c1b2e71..83079e9 100644
--- a/kernel/acpi/acpica/evgpe.c
+++ b/kernel/acpi/acpica/evgpe.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evgpeblk.c b/kernel/acpi/acpica/evgpeblk.c
index bdc53d4..638b3a8 100644
--- a/kernel/acpi/acpica/evgpeblk.c
+++ b/kernel/acpi/acpica/evgpeblk.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evmisc.c b/kernel/acpi/acpica/evmisc.c
index da0e220..2f94a40 100644
--- a/kernel/acpi/acpica/evmisc.c
+++ b/kernel/acpi/acpica/evmisc.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/evregion.c b/kernel/acpi/acpica/evregion.c
index 10859f0..24628d3 100644
--- a/kernel/acpi/acpica/evregion.c
+++ b/kernel/acpi/acpica/evregion.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acinterp.h>
 
diff --git a/kernel/acpi/acpica/evrgnini.c b/kernel/acpi/acpica/evrgnini.c
index 5348a9e..7dae903 100644
--- a/kernel/acpi/acpica/evrgnini.c
+++ b/kernel/acpi/acpica/evrgnini.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evsci.c b/kernel/acpi/acpica/evsci.c
index a0e5800..567b356 100644
--- a/kernel/acpi/acpica/evsci.c
+++ b/kernel/acpi/acpica/evsci.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evsci")
diff --git a/kernel/acpi/acpica/evxface.c b/kernel/acpi/acpica/evxface.c
index 5577671..fb1f13a 100644
--- a/kernel/acpi/acpica/evxface.c
+++ b/kernel/acpi/acpica/evxface.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acinterp.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evxfevnt.c b/kernel/acpi/acpica/evxfevnt.c
index 11b79a3..feb7eb9 100644
--- a/kernel/acpi/acpica/evxfevnt.c
+++ b/kernel/acpi/acpica/evxfevnt.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/evxfregn.c b/kernel/acpi/acpica/evxfregn.c
index 6e5e277..7a9348a 100644
--- a/kernel/acpi/acpica/evxfregn.c
+++ b/kernel/acpi/acpica/evxfregn.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfregn")
diff --git a/kernel/acpi/acpica/exfldio.c b/kernel/acpi/acpica/exfldio.c
index 6a1ba49..09812be 100644
--- a/kernel/acpi/acpica/exfldio.c
+++ b/kernel/acpi/acpica/exfldio.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exmutex.c b/kernel/acpi/acpica/exmutex.c
index eac86c0..5919c8a 100644
--- a/kernel/acpi/acpica/exmutex.c
+++ b/kernel/acpi/acpica/exmutex.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acinterp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmutex")
diff --git a/kernel/acpi/acpica/exoparg2.c b/kernel/acpi/acpica/exoparg2.c
index 83b2e59..a63ab5d 100644
--- a/kernel/acpi/acpica/exoparg2.c
+++ b/kernel/acpi/acpica/exoparg2.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/hwgpe.c b/kernel/acpi/acpica/hwgpe.c
index 04feb50..2013b66 100644
--- a/kernel/acpi/acpica/hwgpe.c
+++ b/kernel/acpi/acpica/hwgpe.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwgpe")
diff --git a/kernel/acpi/acpica/hwregs.c b/kernel/acpi/acpica/hwregs.c
index 27fd268..73fefc1 100644
--- a/kernel/acpi/acpica/hwregs.c
+++ b/kernel/acpi/acpica/hwregs.c
@@ -46,7 +46,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwregs")
diff --git a/kernel/acpi/acpica/utdelete.c b/kernel/acpi/acpica/utdelete.c
index c26e1bd..5b57fea 100644
--- a/kernel/acpi/acpica/utdelete.c
+++ b/kernel/acpi/acpica/utdelete.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdelete")
diff --git a/kernel/acpi/acpica/utinit.c b/kernel/acpi/acpica/utinit.c
index 4d07002..97d9305 100644
--- a/kernel/acpi/acpica/utinit.c
+++ b/kernel/acpi/acpica/utinit.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utxface.c b/kernel/acpi/acpica/utxface.c
index 8e2dfab..57b0c02 100644
--- a/kernel/acpi/acpica/utxface.c
+++ b/kernel/acpi/acpica/utxface.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acevents.h>
+#include "acevents.h"
 #include <acpi/acnamesp.h>
 #include "acdebug.h"
 #include <acpi/actables.h>
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 08/15] ACPICA: acinterp.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (5 preceding siblings ...)
  2008-12-31 10:51   ` [PATCH 07/15] ACPICA: acevents.h " Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:51   ` [PATCH 09/15] ACPICA: acnamesp.h " Len Brown
                     ` (7 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acinterp.h |    0 
 kernel/acpi/acpica/dsfield.c                    |    2 +-
 kernel/acpi/acpica/dsmethod.c                   |    2 +-
 kernel/acpi/acpica/dsmthdat.c                   |    2 +-
 kernel/acpi/acpica/dsobject.c                   |    2 +-
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/dsutils.c                    |    2 +-
 kernel/acpi/acpica/dswexec.c                    |    2 +-
 kernel/acpi/acpica/dswload.c                    |    2 +-
 kernel/acpi/acpica/evmisc.c                     |    2 +-
 kernel/acpi/acpica/evregion.c                   |    2 +-
 kernel/acpi/acpica/evxface.c                    |    2 +-
 kernel/acpi/acpica/exconfig.c                   |    2 +-
 kernel/acpi/acpica/exconvrt.c                   |    2 +-
 kernel/acpi/acpica/excreate.c                   |    2 +-
 kernel/acpi/acpica/exdump.c                     |    2 +-
 kernel/acpi/acpica/exfield.c                    |    2 +-
 kernel/acpi/acpica/exfldio.c                    |    2 +-
 kernel/acpi/acpica/exmisc.c                     |    2 +-
 kernel/acpi/acpica/exmutex.c                    |    2 +-
 kernel/acpi/acpica/exnames.c                    |    2 +-
 kernel/acpi/acpica/exoparg1.c                   |    2 +-
 kernel/acpi/acpica/exoparg2.c                   |    2 +-
 kernel/acpi/acpica/exoparg3.c                   |    2 +-
 kernel/acpi/acpica/exoparg6.c                   |    2 +-
 kernel/acpi/acpica/exprep.c                     |    2 +-
 kernel/acpi/acpica/exregion.c                   |    2 +-
 kernel/acpi/acpica/exresnte.c                   |    2 +-
 kernel/acpi/acpica/exresolv.c                   |    2 +-
 kernel/acpi/acpica/exresop.c                    |    2 +-
 kernel/acpi/acpica/exstore.c                    |    2 +-
 kernel/acpi/acpica/exstoren.c                   |    2 +-
 kernel/acpi/acpica/exstorob.c                   |    2 +-
 kernel/acpi/acpica/exsystem.c                   |    2 +-
 kernel/acpi/acpica/exutils.c                    |    2 +-
 kernel/acpi/acpica/nseval.c                     |    2 +-
 kernel/acpi/acpica/nsinit.c                     |    2 +-
 kernel/acpi/acpica/nsxfeval.c                   |    2 +-
 kernel/acpi/acpica/psparse.c                    |    2 +-
 kernel/acpi/acpica/psxface.c                    |    2 +-
 kernel/acpi/acpica/utdelete.c                   |    2 +-
 kernel/acpi/acpica/uteval.c                     |    2 +-
 42 files changed, 41 insertions(+), 41 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acinterp.h (100%)

diff --git a/include/acpi/acinterp.h b/kernel/acpi/acpica/acinterp.h
similarity index 100%
rename from include/acpi/acinterp.h
rename to kernel/acpi/acpica/acinterp.h
diff --git a/kernel/acpi/acpica/dsfield.c b/kernel/acpi/acpica/dsfield.c
index 7da22b0..02e90dd 100644
--- a/kernel/acpi/acpica/dsfield.c
+++ b/kernel/acpi/acpica/dsfield.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include <acpi/acparser.h>
 
diff --git a/kernel/acpi/acpica/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
index 3dc6def..7172036 100644
--- a/kernel/acpi/acpica/dsmethod.c
+++ b/kernel/acpi/acpica/dsmethod.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #ifdef ACPI_DISASSEMBLER
 #include <acpi/acdisasm.h>
diff --git a/kernel/acpi/acpica/dsmthdat.c b/kernel/acpi/acpica/dsmthdat.c
index e485f63..ce677b7 100644
--- a/kernel/acpi/acpica/dsmthdat.c
+++ b/kernel/acpi/acpica/dsmthdat.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acdispat.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsmthdat")
diff --git a/kernel/acpi/acpica/dsobject.c b/kernel/acpi/acpica/dsobject.c
index e0194d9..77faceb 100644
--- a/kernel/acpi/acpica/dsobject.c
+++ b/kernel/acpi/acpica/dsobject.c
@@ -47,7 +47,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsobject")
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index ab7ff9a..30f02d5 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -47,7 +47,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include "acevents.h"
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index 07419d2..f763142 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -46,7 +46,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include "acdebug.h"
 
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index 9be469b..94dfc1d 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -47,7 +47,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include "acdebug.h"
 
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index 32d9d4f..0a1c260 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -46,7 +46,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include "acevents.h"
 
diff --git a/kernel/acpi/acpica/evmisc.c b/kernel/acpi/acpica/evmisc.c
index 2f94a40..b864c73 100644
--- a/kernel/acpi/acpica/evmisc.c
+++ b/kernel/acpi/acpica/evmisc.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acevents.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evmisc")
diff --git a/kernel/acpi/acpica/evregion.c b/kernel/acpi/acpica/evregion.c
index 24628d3..ee9ee30 100644
--- a/kernel/acpi/acpica/evregion.c
+++ b/kernel/acpi/acpica/evregion.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acevents.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evregion")
diff --git a/kernel/acpi/acpica/evxface.c b/kernel/acpi/acpica/evxface.c
index fb1f13a..5b1d72d 100644
--- a/kernel/acpi/acpica/evxface.c
+++ b/kernel/acpi/acpica/evxface.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acnamesp.h>
 #include "acevents.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxface")
diff --git a/kernel/acpi/acpica/exconfig.c b/kernel/acpi/acpica/exconfig.c
index 9970930..05727e6 100644
--- a/kernel/acpi/acpica/exconfig.c
+++ b/kernel/acpi/acpica/exconfig.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include <acpi/actables.h>
 #include "acdispat.h"
diff --git a/kernel/acpi/acpica/exconvrt.c b/kernel/acpi/acpica/exconvrt.c
index 0f1dffd..49dd801 100644
--- a/kernel/acpi/acpica/exconvrt.c
+++ b/kernel/acpi/acpica/exconvrt.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/excreate.c b/kernel/acpi/acpica/excreate.c
index 4f26a8a..fc50a93 100644
--- a/kernel/acpi/acpica/excreate.c
+++ b/kernel/acpi/acpica/excreate.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exdump.c b/kernel/acpi/acpica/exdump.c
index b2b8fd2..34b105c 100644
--- a/kernel/acpi/acpica/exdump.c
+++ b/kernel/acpi/acpica/exdump.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exfield.c b/kernel/acpi/acpica/exfield.c
index 9ed3bd7..a352d02 100644
--- a/kernel/acpi/acpica/exfield.c
+++ b/kernel/acpi/acpica/exfield.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exfield")
diff --git a/kernel/acpi/acpica/exfldio.c b/kernel/acpi/acpica/exfldio.c
index 09812be..d66cd4c 100644
--- a/kernel/acpi/acpica/exfldio.c
+++ b/kernel/acpi/acpica/exfldio.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include "acevents.h"
 #include "acdispat.h"
diff --git a/kernel/acpi/acpica/exmisc.c b/kernel/acpi/acpica/exmisc.c
index 28d09e6..9c8c622 100644
--- a/kernel/acpi/acpica/exmisc.c
+++ b/kernel/acpi/acpica/exmisc.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include <acpi/amlresrc.h>
 
diff --git a/kernel/acpi/acpica/exmutex.c b/kernel/acpi/acpica/exmutex.c
index 5919c8a..d301c1f 100644
--- a/kernel/acpi/acpica/exmutex.c
+++ b/kernel/acpi/acpica/exmutex.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include "acevents.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exnames.c b/kernel/acpi/acpica/exnames.c
index c1dee3b..918fbac 100644
--- a/kernel/acpi/acpica/exnames.c
+++ b/kernel/acpi/acpica/exnames.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
index 872f7dd..cfeafa7 100644
--- a/kernel/acpi/acpica/exoparg1.c
+++ b/kernel/acpi/acpica/exoparg1.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exoparg2.c b/kernel/acpi/acpica/exoparg2.c
index a63ab5d..4eda2e1 100644
--- a/kernel/acpi/acpica/exoparg2.c
+++ b/kernel/acpi/acpica/exoparg2.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include "acevents.h"
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/exoparg3.c b/kernel/acpi/acpica/exoparg3.c
index 69a3fd2..6405c24 100644
--- a/kernel/acpi/acpica/exoparg3.c
+++ b/kernel/acpi/acpica/exoparg3.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/exoparg6.c b/kernel/acpi/acpica/exoparg6.c
index 9b5e0da..74eb341 100644
--- a/kernel/acpi/acpica/exoparg6.c
+++ b/kernel/acpi/acpica/exoparg6.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/exprep.c b/kernel/acpi/acpica/exprep.c
index 59f8410..88f78c7 100644
--- a/kernel/acpi/acpica/exprep.c
+++ b/kernel/acpi/acpica/exprep.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exregion.c b/kernel/acpi/acpica/exregion.c
index bfff7f7..76ec8ff 100644
--- a/kernel/acpi/acpica/exregion.c
+++ b/kernel/acpi/acpica/exregion.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exregion")
diff --git a/kernel/acpi/acpica/exresnte.c b/kernel/acpi/acpica/exresnte.c
index d66c21b..d6a0ccf 100644
--- a/kernel/acpi/acpica/exresnte.c
+++ b/kernel/acpi/acpica/exresnte.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exresolv.c b/kernel/acpi/acpica/exresolv.c
index f1da91a..f3f71a7 100644
--- a/kernel/acpi/acpica/exresolv.c
+++ b/kernel/acpi/acpica/exresolv.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exresop.c b/kernel/acpi/acpica/exresop.c
index 8fbd5c2..5748ff9 100644
--- a/kernel/acpi/acpica/exresop.c
+++ b/kernel/acpi/acpica/exresop.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include <acpi/amlcode.h>
 #include <acpi/acparser.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exstore.c b/kernel/acpi/acpica/exstore.c
index 742261c..0786ef1 100644
--- a/kernel/acpi/acpica/exstore.c
+++ b/kernel/acpi/acpica/exstore.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
 
diff --git a/kernel/acpi/acpica/exstoren.c b/kernel/acpi/acpica/exstoren.c
index ea2c108..1189dca 100644
--- a/kernel/acpi/acpica/exstoren.c
+++ b/kernel/acpi/acpica/exstoren.c
@@ -45,7 +45,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exstorob.c b/kernel/acpi/acpica/exstorob.c
index 7254ccf..67340cc 100644
--- a/kernel/acpi/acpica/exstorob.c
+++ b/kernel/acpi/acpica/exstorob.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exstorob")
diff --git a/kernel/acpi/acpica/exsystem.c b/kernel/acpi/acpica/exsystem.c
index 433f663..3d00b93 100644
--- a/kernel/acpi/acpica/exsystem.c
+++ b/kernel/acpi/acpica/exsystem.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exsystem")
diff --git a/kernel/acpi/acpica/exutils.c b/kernel/acpi/acpica/exutils.c
index 1876c0e..75f699e 100644
--- a/kernel/acpi/acpica/exutils.c
+++ b/kernel/acpi/acpica/exutils.c
@@ -60,7 +60,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/nseval.c b/kernel/acpi/acpica/nseval.c
index 543b0bb..1e438b8 100644
--- a/kernel/acpi/acpica/nseval.c
+++ b/kernel/acpi/acpica/nseval.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsinit.c b/kernel/acpi/acpica/nsinit.c
index f2200f1..6a1dfd7 100644
--- a/kernel/acpi/acpica/nsinit.c
+++ b/kernel/acpi/acpica/nsinit.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acnamesp.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <linux/nmi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsxfeval.c b/kernel/acpi/acpica/nsxfeval.c
index 8117b9b..1ed9295 100644
--- a/kernel/acpi/acpica/nsxfeval.c
+++ b/kernel/acpi/acpica/nsxfeval.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfeval")
diff --git a/kernel/acpi/acpica/psparse.c b/kernel/acpi/acpica/psparse.c
index 113697f..f6cdcfe 100644
--- a/kernel/acpi/acpica/psparse.c
+++ b/kernel/acpi/acpica/psparse.c
@@ -56,7 +56,7 @@
 #include "acdispat.h"
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psparse")
diff --git a/kernel/acpi/acpica/psxface.c b/kernel/acpi/acpica/psxface.c
index efeb80e..ae30135 100644
--- a/kernel/acpi/acpica/psxface.c
+++ b/kernel/acpi/acpica/psxface.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include "acdispat.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/utdelete.c b/kernel/acpi/acpica/utdelete.c
index 5b57fea..cbb6813 100644
--- a/kernel/acpi/acpica/utdelete.c
+++ b/kernel/acpi/acpica/utdelete.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 #include <acpi/acnamesp.h>
 #include "acevents.h"
 
diff --git a/kernel/acpi/acpica/uteval.c b/kernel/acpi/acpica/uteval.c
index 41ff26a..f2a9fe0 100644
--- a/kernel/acpi/acpica/uteval.c
+++ b/kernel/acpi/acpica/uteval.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acnamesp.h>
-#include <acpi/acinterp.h>
+#include "acinterp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("uteval")
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 09/15] ACPICA: acnamesp.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (6 preceding siblings ...)
  2008-12-31 10:51   ` [PATCH 08/15] ACPICA: acinterp.h " Len Brown
@ 2008-12-31 10:51   ` Len Brown
  2008-12-31 10:52   ` [PATCH 10/15] ACPICA: acopcode.h " Len Brown
                     ` (6 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:51 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acnamesp.h |    0 
 kernel/acpi/acpica/dsfield.c                    |    2 +-
 kernel/acpi/acpica/dsinit.c                     |    2 +-
 kernel/acpi/acpica/dsmethod.c                   |    2 +-
 kernel/acpi/acpica/dsmthdat.c                   |    2 +-
 kernel/acpi/acpica/dsobject.c                   |    2 +-
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/dsutils.c                    |    2 +-
 kernel/acpi/acpica/dswexec.c                    |    2 +-
 kernel/acpi/acpica/dswload.c                    |    2 +-
 kernel/acpi/acpica/dswstate.c                   |    2 +-
 kernel/acpi/acpica/evgpe.c                      |    2 +-
 kernel/acpi/acpica/evgpeblk.c                   |    2 +-
 kernel/acpi/acpica/evmisc.c                     |    2 +-
 kernel/acpi/acpica/evregion.c                   |    2 +-
 kernel/acpi/acpica/evrgnini.c                   |    2 +-
 kernel/acpi/acpica/evxface.c                    |    2 +-
 kernel/acpi/acpica/evxfevnt.c                   |    2 +-
 kernel/acpi/acpica/evxfregn.c                   |    2 +-
 kernel/acpi/acpica/exconfig.c                   |    2 +-
 kernel/acpi/acpica/excreate.c                   |    2 +-
 kernel/acpi/acpica/exdump.c                     |    2 +-
 kernel/acpi/acpica/exoparg1.c                   |    2 +-
 kernel/acpi/acpica/exprep.c                     |    2 +-
 kernel/acpi/acpica/exresnte.c                   |    2 +-
 kernel/acpi/acpica/exresolv.c                   |    2 +-
 kernel/acpi/acpica/exresop.c                    |    2 +-
 kernel/acpi/acpica/exstore.c                    |    2 +-
 kernel/acpi/acpica/hwregs.c                     |    2 +-
 kernel/acpi/acpica/hwxface.c                    |    2 +-
 kernel/acpi/acpica/nsaccess.c                   |    2 +-
 kernel/acpi/acpica/nsalloc.c                    |    2 +-
 kernel/acpi/acpica/nsdump.c                     |    2 +-
 kernel/acpi/acpica/nsdumpdv.c                   |    2 +-
 kernel/acpi/acpica/nseval.c                     |    2 +-
 kernel/acpi/acpica/nsinit.c                     |    2 +-
 kernel/acpi/acpica/nsload.c                     |    2 +-
 kernel/acpi/acpica/nsnames.c                    |    2 +-
 kernel/acpi/acpica/nsobject.c                   |    2 +-
 kernel/acpi/acpica/nsparse.c                    |    2 +-
 kernel/acpi/acpica/nspredef.c                   |    2 +-
 kernel/acpi/acpica/nssearch.c                   |    2 +-
 kernel/acpi/acpica/nsutils.c                    |    2 +-
 kernel/acpi/acpica/nswalk.c                     |    2 +-
 kernel/acpi/acpica/nsxfeval.c                   |    2 +-
 kernel/acpi/acpica/nsxfname.c                   |    2 +-
 kernel/acpi/acpica/nsxfobj.c                    |    2 +-
 kernel/acpi/acpica/psargs.c                     |    2 +-
 kernel/acpi/acpica/psparse.c                    |    2 +-
 kernel/acpi/acpica/rscalc.c                     |    2 +-
 kernel/acpi/acpica/rscreate.c                   |    2 +-
 kernel/acpi/acpica/rsutils.c                    |    2 +-
 kernel/acpi/acpica/rsxface.c                    |    2 +-
 kernel/acpi/acpica/tbinstal.c                   |    2 +-
 kernel/acpi/acpica/tbxface.c                    |    2 +-
 kernel/acpi/acpica/utcopy.c                     |    2 +-
 kernel/acpi/acpica/utdelete.c                   |    2 +-
 kernel/acpi/acpica/uteval.c                     |    2 +-
 kernel/acpi/acpica/utglobal.c                   |    2 +-
 kernel/acpi/acpica/utinit.c                     |    2 +-
 kernel/acpi/acpica/utmisc.c                     |    2 +-
 kernel/acpi/acpica/utobject.c                   |    2 +-
 kernel/acpi/acpica/utxface.c                    |    2 +-
 63 files changed, 62 insertions(+), 62 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acnamesp.h (100%)

diff --git a/include/acpi/acnamesp.h b/kernel/acpi/acpica/acnamesp.h
similarity index 100%
rename from include/acpi/acnamesp.h
rename to kernel/acpi/acpica/acnamesp.h
diff --git a/kernel/acpi/acpica/dsfield.c b/kernel/acpi/acpica/dsfield.c
index 02e90dd..73a85c8 100644
--- a/kernel/acpi/acpica/dsfield.c
+++ b/kernel/acpi/acpica/dsfield.c
@@ -46,7 +46,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/acparser.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dsinit.c b/kernel/acpi/acpica/dsinit.c
index cc8f5c5..c063e81 100644
--- a/kernel/acpi/acpica/dsinit.c
+++ b/kernel/acpi/acpica/dsinit.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acdispat.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
index 7172036..cae673e 100644
--- a/kernel/acpi/acpica/dsmethod.c
+++ b/kernel/acpi/acpica/dsmethod.c
@@ -46,7 +46,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #ifdef ACPI_DISASSEMBLER
 #include <acpi/acdisasm.h>
 #endif
diff --git a/kernel/acpi/acpica/dsmthdat.c b/kernel/acpi/acpica/dsmthdat.c
index ce677b7..da0f546 100644
--- a/kernel/acpi/acpica/dsmthdat.c
+++ b/kernel/acpi/acpica/dsmthdat.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acdispat.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dsobject.c b/kernel/acpi/acpica/dsobject.c
index 77faceb..8ed96dc 100644
--- a/kernel/acpi/acpica/dsobject.c
+++ b/kernel/acpi/acpica/dsobject.c
@@ -46,7 +46,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include "acdispat.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index 30f02d5..e2732fe 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -48,7 +48,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index f763142..bb302ca 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -47,7 +47,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdebug.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index 94dfc1d..dc7d87c 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -48,7 +48,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdebug.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index 0a1c260..35b56e7 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -47,7 +47,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 
 #ifdef ACPI_ASL_COMPILER
diff --git a/kernel/acpi/acpica/dswstate.c b/kernel/acpi/acpica/dswstate.c
index c65aae5..f04912f 100644
--- a/kernel/acpi/acpica/dswstate.c
+++ b/kernel/acpi/acpica/dswstate.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include "acdispat.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dswstate")
diff --git a/kernel/acpi/acpica/evgpe.c b/kernel/acpi/acpica/evgpe.c
index 83079e9..f345ced 100644
--- a/kernel/acpi/acpica/evgpe.c
+++ b/kernel/acpi/acpica/evgpe.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpe")
diff --git a/kernel/acpi/acpica/evgpeblk.c b/kernel/acpi/acpica/evgpeblk.c
index 638b3a8..484cc05 100644
--- a/kernel/acpi/acpica/evgpeblk.c
+++ b/kernel/acpi/acpica/evgpeblk.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeblk")
diff --git a/kernel/acpi/acpica/evmisc.c b/kernel/acpi/acpica/evmisc.c
index b864c73..5f89305 100644
--- a/kernel/acpi/acpica/evmisc.c
+++ b/kernel/acpi/acpica/evmisc.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evregion.c b/kernel/acpi/acpica/evregion.c
index ee9ee30..665c088 100644
--- a/kernel/acpi/acpica/evregion.c
+++ b/kernel/acpi/acpica/evregion.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evrgnini.c b/kernel/acpi/acpica/evrgnini.c
index 7dae903..f3f1fb4 100644
--- a/kernel/acpi/acpica/evrgnini.c
+++ b/kernel/acpi/acpica/evrgnini.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evrgnini")
diff --git a/kernel/acpi/acpica/evxface.c b/kernel/acpi/acpica/evxface.c
index 5b1d72d..3aca901 100644
--- a/kernel/acpi/acpica/evxface.c
+++ b/kernel/acpi/acpica/evxface.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 #include "acinterp.h"
 
diff --git a/kernel/acpi/acpica/evxfevnt.c b/kernel/acpi/acpica/evxfevnt.c
index feb7eb9..b3f8caa 100644
--- a/kernel/acpi/acpica/evxfevnt.c
+++ b/kernel/acpi/acpica/evxfevnt.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/evxfregn.c b/kernel/acpi/acpica/evxfregn.c
index 7a9348a..479e7a3 100644
--- a/kernel/acpi/acpica/evxfregn.c
+++ b/kernel/acpi/acpica/evxfregn.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 
 #define _COMPONENT          ACPI_EVENTS
diff --git a/kernel/acpi/acpica/exconfig.c b/kernel/acpi/acpica/exconfig.c
index 05727e6..fb8e36d 100644
--- a/kernel/acpi/acpica/exconfig.c
+++ b/kernel/acpi/acpica/exconfig.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/actables.h>
 #include "acdispat.h"
 
diff --git a/kernel/acpi/acpica/excreate.c b/kernel/acpi/acpica/excreate.c
index fc50a93..a3f62fc 100644
--- a/kernel/acpi/acpica/excreate.c
+++ b/kernel/acpi/acpica/excreate.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
diff --git a/kernel/acpi/acpica/exdump.c b/kernel/acpi/acpica/exdump.c
index 34b105c..26cf1df 100644
--- a/kernel/acpi/acpica/exdump.c
+++ b/kernel/acpi/acpica/exdump.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exdump")
diff --git a/kernel/acpi/acpica/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
index cfeafa7..7a2d7e2 100644
--- a/kernel/acpi/acpica/exoparg1.c
+++ b/kernel/acpi/acpica/exoparg1.c
@@ -48,7 +48,7 @@
 #include "acdispat.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg1")
diff --git a/kernel/acpi/acpica/exprep.c b/kernel/acpi/acpica/exprep.c
index 88f78c7..4f17019 100644
--- a/kernel/acpi/acpica/exprep.c
+++ b/kernel/acpi/acpica/exprep.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exprep")
diff --git a/kernel/acpi/acpica/exresnte.c b/kernel/acpi/acpica/exresnte.c
index d6a0ccf..a063a74 100644
--- a/kernel/acpi/acpica/exresnte.c
+++ b/kernel/acpi/acpica/exresnte.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresnte")
diff --git a/kernel/acpi/acpica/exresolv.c b/kernel/acpi/acpica/exresolv.c
index f3f71a7..0cb0e9d 100644
--- a/kernel/acpi/acpica/exresolv.c
+++ b/kernel/acpi/acpica/exresolv.c
@@ -47,7 +47,7 @@
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresolv")
diff --git a/kernel/acpi/acpica/exresop.c b/kernel/acpi/acpica/exresop.c
index 5748ff9..68b9577 100644
--- a/kernel/acpi/acpica/exresop.c
+++ b/kernel/acpi/acpica/exresop.c
@@ -47,7 +47,7 @@
 #include <acpi/amlcode.h>
 #include <acpi/acparser.h>
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresop")
diff --git a/kernel/acpi/acpica/exstore.c b/kernel/acpi/acpica/exstore.c
index 0786ef1..7bb405b 100644
--- a/kernel/acpi/acpica/exstore.c
+++ b/kernel/acpi/acpica/exstore.c
@@ -47,7 +47,7 @@
 #include "acdispat.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exstore")
diff --git a/kernel/acpi/acpica/hwregs.c b/kernel/acpi/acpica/hwregs.c
index 73fefc1..4dc43b0 100644
--- a/kernel/acpi/acpica/hwregs.c
+++ b/kernel/acpi/acpica/hwregs.c
@@ -45,7 +45,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 
 #define _COMPONENT          ACPI_HARDWARE
diff --git a/kernel/acpi/acpica/hwxface.c b/kernel/acpi/acpica/hwxface.c
index 1b1e3a4..ae597c0 100644
--- a/kernel/acpi/acpica/hwxface.c
+++ b/kernel/acpi/acpica/hwxface.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwxface")
diff --git a/kernel/acpi/acpica/nsaccess.c b/kernel/acpi/acpica/nsaccess.c
index d811edc..c7addfe 100644
--- a/kernel/acpi/acpica/nsaccess.c
+++ b/kernel/acpi/acpica/nsaccess.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdispat.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsalloc.c b/kernel/acpi/acpica/nsalloc.c
index 5bc78a6..f976d84 100644
--- a/kernel/acpi/acpica/nsalloc.c
+++ b/kernel/acpi/acpica/nsalloc.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsalloc")
diff --git a/kernel/acpi/acpica/nsdump.c b/kernel/acpi/acpica/nsdump.c
index c15eb13..0da33c8 100644
--- a/kernel/acpi/acpica/nsdump.c
+++ b/kernel/acpi/acpica/nsdump.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsdump")
diff --git a/kernel/acpi/acpica/nsdumpdv.c b/kernel/acpi/acpica/nsdumpdv.c
index 447948d..41994fe 100644
--- a/kernel/acpi/acpica/nsdumpdv.c
+++ b/kernel/acpi/acpica/nsdumpdv.c
@@ -50,7 +50,7 @@
 ACPI_MODULE_NAME("nsdumpdv")
 #ifdef ACPI_OBSOLETE_FUNCTIONS
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_dump_one_device
diff --git a/kernel/acpi/acpica/nseval.c b/kernel/acpi/acpica/nseval.c
index 1e438b8..07560e7 100644
--- a/kernel/acpi/acpica/nseval.c
+++ b/kernel/acpi/acpica/nseval.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nseval")
diff --git a/kernel/acpi/acpica/nsinit.c b/kernel/acpi/acpica/nsinit.c
index 6a1dfd7..13501cb 100644
--- a/kernel/acpi/acpica/nsinit.c
+++ b/kernel/acpi/acpica/nsinit.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include <linux/nmi.h>
diff --git a/kernel/acpi/acpica/nsload.c b/kernel/acpi/acpica/nsload.c
index cbc673c..32e530d 100644
--- a/kernel/acpi/acpica/nsload.c
+++ b/kernel/acpi/acpica/nsload.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdispat.h"
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/nsnames.c b/kernel/acpi/acpica/nsnames.c
index 36d79bd..558fba3 100644
--- a/kernel/acpi/acpica/nsnames.c
+++ b/kernel/acpi/acpica/nsnames.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsnames")
diff --git a/kernel/acpi/acpica/nsobject.c b/kernel/acpi/acpica/nsobject.c
index 3063da2..08a97a5 100644
--- a/kernel/acpi/acpica/nsobject.c
+++ b/kernel/acpi/acpica/nsobject.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsobject")
diff --git a/kernel/acpi/acpica/nsparse.c b/kernel/acpi/acpica/nsparse.c
index f509df8..eae2c46 100644
--- a/kernel/acpi/acpica/nsparse.c
+++ b/kernel/acpi/acpica/nsparse.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/acparser.h>
 #include "acdispat.h"
 #include <acpi/actables.h>
diff --git a/kernel/acpi/acpica/nspredef.c b/kernel/acpi/acpica/nspredef.c
index 842fadd..b03a27b 100644
--- a/kernel/acpi/acpica/nspredef.c
+++ b/kernel/acpi/acpica/nspredef.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/acpredef.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nssearch.c b/kernel/acpi/acpica/nssearch.c
index 6414fc2..6fea13f 100644
--- a/kernel/acpi/acpica/nssearch.c
+++ b/kernel/acpi/acpica/nssearch.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nssearch")
diff --git a/kernel/acpi/acpica/nsutils.c b/kernel/acpi/acpica/nsutils.c
index 0f01952..ac83061 100644
--- a/kernel/acpi/acpica/nsutils.c
+++ b/kernel/acpi/acpica/nsutils.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/amlcode.h>
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/nswalk.c b/kernel/acpi/acpica/nswalk.c
index 9691644..200895f 100644
--- a/kernel/acpi/acpica/nswalk.c
+++ b/kernel/acpi/acpica/nswalk.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nswalk")
diff --git a/kernel/acpi/acpica/nsxfeval.c b/kernel/acpi/acpica/nsxfeval.c
index 1ed9295..22a7171 100644
--- a/kernel/acpi/acpica/nsxfeval.c
+++ b/kernel/acpi/acpica/nsxfeval.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsxfname.c b/kernel/acpi/acpica/nsxfname.c
index 648c947..9589fea 100644
--- a/kernel/acpi/acpica/nsxfname.c
+++ b/kernel/acpi/acpica/nsxfname.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfname")
diff --git a/kernel/acpi/acpica/nsxfobj.c b/kernel/acpi/acpica/nsxfobj.c
index 5252001..1c7efc1 100644
--- a/kernel/acpi/acpica/nsxfobj.c
+++ b/kernel/acpi/acpica/nsxfobj.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfobj")
diff --git a/kernel/acpi/acpica/psargs.c b/kernel/acpi/acpica/psargs.c
index ec7941b..0765087 100644
--- a/kernel/acpi/acpica/psargs.c
+++ b/kernel/acpi/acpica/psargs.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdispat.h"
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/psparse.c b/kernel/acpi/acpica/psparse.c
index f6cdcfe..c065b31 100644
--- a/kernel/acpi/acpica/psparse.c
+++ b/kernel/acpi/acpica/psparse.c
@@ -55,7 +55,7 @@
 #include <acpi/acparser.h>
 #include "acdispat.h"
 #include <acpi/amlcode.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/rscalc.c b/kernel/acpi/acpica/rscalc.c
index 1300f94..4d44f58 100644
--- a/kernel/acpi/acpica/rscalc.c
+++ b/kernel/acpi/acpica/rscalc.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acresrc.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rscalc")
diff --git a/kernel/acpi/acpica/rscreate.c b/kernel/acpi/acpica/rscreate.c
index 499985d..0998933 100644
--- a/kernel/acpi/acpica/rscreate.c
+++ b/kernel/acpi/acpica/rscreate.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acresrc.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rscreate")
diff --git a/kernel/acpi/acpica/rsutils.c b/kernel/acpi/acpica/rsutils.c
index da89892..6c30ea3 100644
--- a/kernel/acpi/acpica/rsutils.c
+++ b/kernel/acpi/acpica/rsutils.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/acresrc.h>
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsxface.c b/kernel/acpi/acpica/rsxface.c
index b95f65a..f9f94a0 100644
--- a/kernel/acpi/acpica/rsxface.c
+++ b/kernel/acpi/acpica/rsxface.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acresrc.h>
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsxface")
diff --git a/kernel/acpi/acpica/tbinstal.c b/kernel/acpi/acpica/tbinstal.c
index 6cb77be..94fe615 100644
--- a/kernel/acpi/acpica/tbinstal.c
+++ b/kernel/acpi/acpica/tbinstal.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_TABLES
diff --git a/kernel/acpi/acpica/tbxface.c b/kernel/acpi/acpica/tbxface.c
index b3edad1..ef5954f 100644
--- a/kernel/acpi/acpica/tbxface.c
+++ b/kernel/acpi/acpica/tbxface.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include <acpi/actables.h>
 
 #define _COMPONENT          ACPI_TABLES
diff --git a/kernel/acpi/acpica/utcopy.c b/kernel/acpi/acpica/utcopy.c
index 9150073..b0dcfd3 100644
--- a/kernel/acpi/acpica/utcopy.c
+++ b/kernel/acpi/acpica/utcopy.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utdelete.c b/kernel/acpi/acpica/utdelete.c
index cbb6813..a0be9e3 100644
--- a/kernel/acpi/acpica/utdelete.c
+++ b/kernel/acpi/acpica/utdelete.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/uteval.c b/kernel/acpi/acpica/uteval.c
index f2a9fe0..da9450b 100644
--- a/kernel/acpi/acpica/uteval.c
+++ b/kernel/acpi/acpica/uteval.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
diff --git a/kernel/acpi/acpica/utglobal.c b/kernel/acpi/acpica/utglobal.c
index 1bc2fa0..a3ab9d9 100644
--- a/kernel/acpi/acpica/utglobal.c
+++ b/kernel/acpi/acpica/utglobal.c
@@ -45,7 +45,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utglobal")
diff --git a/kernel/acpi/acpica/utinit.c b/kernel/acpi/acpica/utinit.c
index 97d9305..10fb977 100644
--- a/kernel/acpi/acpica/utinit.c
+++ b/kernel/acpi/acpica/utinit.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acevents.h"
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/utmisc.c b/kernel/acpi/acpica/utmisc.c
index 95c991d..c1f7f4e 100644
--- a/kernel/acpi/acpica/utmisc.c
+++ b/kernel/acpi/acpica/utmisc.c
@@ -45,7 +45,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmisc")
diff --git a/kernel/acpi/acpica/utobject.c b/kernel/acpi/acpica/utobject.c
index 9dd272a..4279ed3 100644
--- a/kernel/acpi/acpica/utobject.c
+++ b/kernel/acpi/acpica/utobject.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utobject")
diff --git a/kernel/acpi/acpica/utxface.c b/kernel/acpi/acpica/utxface.c
index 57b0c02..0edc8fb 100644
--- a/kernel/acpi/acpica/utxface.c
+++ b/kernel/acpi/acpica/utxface.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acevents.h"
-#include <acpi/acnamesp.h>
+#include "acnamesp.h"
 #include "acdebug.h"
 #include <acpi/actables.h>
 
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 10/15] ACPICA: acopcode.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (7 preceding siblings ...)
  2008-12-31 10:51   ` [PATCH 09/15] ACPICA: acnamesp.h " Len Brown
@ 2008-12-31 10:52   ` Len Brown
  2008-12-31 10:52   ` [PATCH 11/15] ACPICA: acparser.h " Len Brown
                     ` (5 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:52 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acopcode.h |    0 
 kernel/acpi/acpica/psopcode.c                   |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acopcode.h (100%)

diff --git a/include/acpi/acopcode.h b/kernel/acpi/acpica/acopcode.h
similarity index 100%
rename from include/acpi/acopcode.h
rename to kernel/acpi/acpica/acopcode.h
diff --git a/kernel/acpi/acpica/psopcode.c b/kernel/acpi/acpica/psopcode.c
index b52e198..ccb9652 100644
--- a/kernel/acpi/acpica/psopcode.c
+++ b/kernel/acpi/acpica/psopcode.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/acparser.h>
-#include <acpi/acopcode.h>
+#include "acopcode.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_PARSER
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 11/15] ACPICA: acparser.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (8 preceding siblings ...)
  2008-12-31 10:52   ` [PATCH 10/15] ACPICA: acopcode.h " Len Brown
@ 2008-12-31 10:52   ` Len Brown
  2008-12-31 10:52   ` [PATCH 12/15] ACPICA: acpredef.h " Len Brown
                     ` (4 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:52 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acparser.h |    0 
 kernel/acpi/acpica/dsfield.c                    |    2 +-
 kernel/acpi/acpica/dsobject.c                   |    2 +-
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/dsutils.c                    |    2 +-
 kernel/acpi/acpica/dswexec.c                    |    2 +-
 kernel/acpi/acpica/dswload.c                    |    2 +-
 kernel/acpi/acpica/dswstate.c                   |    2 +-
 kernel/acpi/acpica/exoparg1.c                   |    2 +-
 kernel/acpi/acpica/exoparg2.c                   |    2 +-
 kernel/acpi/acpica/exoparg3.c                   |    2 +-
 kernel/acpi/acpica/exoparg6.c                   |    2 +-
 kernel/acpi/acpica/exresop.c                    |    2 +-
 kernel/acpi/acpica/nseval.c                     |    2 +-
 kernel/acpi/acpica/nsparse.c                    |    2 +-
 kernel/acpi/acpica/psargs.c                     |    2 +-
 kernel/acpi/acpica/psloop.c                     |    2 +-
 kernel/acpi/acpica/psopcode.c                   |    2 +-
 kernel/acpi/acpica/psparse.c                    |    2 +-
 kernel/acpi/acpica/psscope.c                    |    2 +-
 kernel/acpi/acpica/pstree.c                     |    2 +-
 kernel/acpi/acpica/psutils.c                    |    2 +-
 kernel/acpi/acpica/pswalk.c                     |    2 +-
 kernel/acpi/acpica/psxface.c                    |    2 +-
 24 files changed, 23 insertions(+), 23 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acparser.h (100%)

diff --git a/include/acpi/acparser.h b/kernel/acpi/acpica/acparser.h
similarity index 100%
rename from include/acpi/acparser.h
rename to kernel/acpi/acpica/acparser.h
diff --git a/kernel/acpi/acpica/dsfield.c b/kernel/acpi/acpica/dsfield.c
index 73a85c8..65e27b5 100644
--- a/kernel/acpi/acpica/dsfield.c
+++ b/kernel/acpi/acpica/dsfield.c
@@ -47,7 +47,7 @@
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsfield")
diff --git a/kernel/acpi/acpica/dsobject.c b/kernel/acpi/acpica/dsobject.c
index 8ed96dc..ae0140f 100644
--- a/kernel/acpi/acpica/dsobject.c
+++ b/kernel/acpi/acpica/dsobject.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index e2732fe..4c99739 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index bb302ca..ebc3a79 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index dc7d87c..a2d1932 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index 35b56e7..259d289 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 #include "acdispat.h"
 #include "acinterp.h"
diff --git a/kernel/acpi/acpica/dswstate.c b/kernel/acpi/acpica/dswstate.c
index f04912f..40f92bf 100644
--- a/kernel/acpi/acpica/dswstate.c
+++ b/kernel/acpi/acpica/dswstate.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acdispat.h"
 #include "acnamesp.h"
 
diff --git a/kernel/acpi/acpica/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
index 7a2d7e2..3bd08bb 100644
--- a/kernel/acpi/acpica/exoparg1.c
+++ b/kernel/acpi/acpica/exoparg1.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/exoparg2.c b/kernel/acpi/acpica/exoparg2.c
index 4eda2e1..8f321f7 100644
--- a/kernel/acpi/acpica/exoparg2.c
+++ b/kernel/acpi/acpica/exoparg2.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acinterp.h"
 #include "acevents.h"
 #include <acpi/amlcode.h>
diff --git a/kernel/acpi/acpica/exoparg3.c b/kernel/acpi/acpica/exoparg3.c
index 6405c24..dbe7612 100644
--- a/kernel/acpi/acpica/exoparg3.c
+++ b/kernel/acpi/acpica/exoparg3.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exoparg6.c b/kernel/acpi/acpica/exoparg6.c
index 74eb341..17dfb08 100644
--- a/kernel/acpi/acpica/exoparg6.c
+++ b/kernel/acpi/acpica/exoparg6.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exresop.c b/kernel/acpi/acpica/exresop.c
index 68b9577..912148c 100644
--- a/kernel/acpi/acpica/exresop.c
+++ b/kernel/acpi/acpica/exresop.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include <acpi/amlcode.h>
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acinterp.h"
 #include "acnamesp.h"
 
diff --git a/kernel/acpi/acpica/nseval.c b/kernel/acpi/acpica/nseval.c
index 07560e7..0f3d5f9 100644
--- a/kernel/acpi/acpica/nseval.c
+++ b/kernel/acpi/acpica/nseval.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acinterp.h"
 #include "acnamesp.h"
 
diff --git a/kernel/acpi/acpica/nsparse.c b/kernel/acpi/acpica/nsparse.c
index eae2c46..b7dd8cd 100644
--- a/kernel/acpi/acpica/nsparse.c
+++ b/kernel/acpi/acpica/nsparse.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acdispat.h"
 #include <acpi/actables.h>
 
diff --git a/kernel/acpi/acpica/psargs.c b/kernel/acpi/acpica/psargs.c
index 0765087..a851c73 100644
--- a/kernel/acpi/acpica/psargs.c
+++ b/kernel/acpi/acpica/psargs.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 #include "acnamesp.h"
 #include "acdispat.h"
diff --git a/kernel/acpi/acpica/psloop.c b/kernel/acpi/acpica/psloop.c
index d4f0f65..e993e43 100644
--- a/kernel/acpi/acpica/psloop.c
+++ b/kernel/acpi/acpica/psloop.c
@@ -51,7 +51,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acdispat.h"
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/psopcode.c b/kernel/acpi/acpica/psopcode.c
index ccb9652..9aede84 100644
--- a/kernel/acpi/acpica/psopcode.c
+++ b/kernel/acpi/acpica/psopcode.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acopcode.h"
 #include <acpi/amlcode.h>
 
diff --git a/kernel/acpi/acpica/psparse.c b/kernel/acpi/acpica/psparse.c
index c065b31..8d45a31 100644
--- a/kernel/acpi/acpica/psparse.c
+++ b/kernel/acpi/acpica/psparse.c
@@ -52,7 +52,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acdispat.h"
 #include <acpi/amlcode.h>
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/psscope.c b/kernel/acpi/acpica/psscope.c
index dc26c4a..2feca5c 100644
--- a/kernel/acpi/acpica/psscope.c
+++ b/kernel/acpi/acpica/psscope.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psscope")
diff --git a/kernel/acpi/acpica/pstree.c b/kernel/acpi/acpica/pstree.c
index d355ba1..f317046 100644
--- a/kernel/acpi/acpica/pstree.c
+++ b/kernel/acpi/acpica/pstree.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/psutils.c b/kernel/acpi/acpica/psutils.c
index d71e180..5336631 100644
--- a/kernel/acpi/acpica/psutils.c
+++ b/kernel/acpi/acpica/psutils.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include <acpi/amlcode.h>
 
 #define _COMPONENT          ACPI_PARSER
diff --git a/kernel/acpi/acpica/pswalk.c b/kernel/acpi/acpica/pswalk.c
index a0cf80c..78b8b79 100644
--- a/kernel/acpi/acpica/pswalk.c
+++ b/kernel/acpi/acpica/pswalk.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("pswalk")
diff --git a/kernel/acpi/acpica/psxface.c b/kernel/acpi/acpica/psxface.c
index ae30135..e905037 100644
--- a/kernel/acpi/acpica/psxface.c
+++ b/kernel/acpi/acpica/psxface.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acparser.h>
+#include "acparser.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 12/15] ACPICA: acpredef.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (9 preceding siblings ...)
  2008-12-31 10:52   ` [PATCH 11/15] ACPICA: acparser.h " Len Brown
@ 2008-12-31 10:52   ` Len Brown
  2008-12-31 10:52   ` [PATCH 13/15] ACPICA: acresrc.h, amlresrc.h are private Len Brown
                     ` (3 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:52 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acpredef.h |    0 
 kernel/acpi/acpica/nspredef.c                   |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acpredef.h (100%)

diff --git a/include/acpi/acpredef.h b/kernel/acpi/acpica/acpredef.h
similarity index 100%
rename from include/acpi/acpredef.h
rename to kernel/acpi/acpica/acpredef.h
diff --git a/kernel/acpi/acpica/nspredef.c b/kernel/acpi/acpica/nspredef.c
index b03a27b..4527032 100644
--- a/kernel/acpi/acpica/nspredef.c
+++ b/kernel/acpi/acpica/nspredef.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include <acpi/acpredef.h>
+#include "acpredef.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nspredef")
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 13/15] ACPICA: acresrc.h, amlresrc.h are private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (10 preceding siblings ...)
  2008-12-31 10:52   ` [PATCH 12/15] ACPICA: acpredef.h " Len Brown
@ 2008-12-31 10:52   ` Len Brown
  2008-12-31 10:52   ` [PATCH 14/15] ACPICA: actables.h is private Len Brown
                     ` (2 subsequent siblings)
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:52 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/acresrc.h  |    0 
 {include/acpi => kernel/acpi/acpica}/amlresrc.h |    0 
 kernel/acpi/acpica/exmisc.c                     |    2 +-
 kernel/acpi/acpica/rsaddr.c                     |    2 +-
 kernel/acpi/acpica/rscalc.c                     |    2 +-
 kernel/acpi/acpica/rscreate.c                   |    2 +-
 kernel/acpi/acpica/rsdump.c                     |    2 +-
 kernel/acpi/acpica/rsinfo.c                     |    2 +-
 kernel/acpi/acpica/rsio.c                       |    2 +-
 kernel/acpi/acpica/rsirq.c                      |    2 +-
 kernel/acpi/acpica/rslist.c                     |    2 +-
 kernel/acpi/acpica/rsmemory.c                   |    2 +-
 kernel/acpi/acpica/rsmisc.c                     |    2 +-
 kernel/acpi/acpica/rsutils.c                    |    2 +-
 kernel/acpi/acpica/rsxface.c                    |    2 +-
 kernel/acpi/acpica/utresrc.c                    |    2 +-
 16 files changed, 14 insertions(+), 14 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/acresrc.h (100%)
 rename {include/acpi => kernel/acpi/acpica}/amlresrc.h (100%)

diff --git a/include/acpi/acresrc.h b/kernel/acpi/acpica/acresrc.h
similarity index 100%
rename from include/acpi/acresrc.h
rename to kernel/acpi/acpica/acresrc.h
diff --git a/include/acpi/amlresrc.h b/kernel/acpi/acpica/amlresrc.h
similarity index 100%
rename from include/acpi/amlresrc.h
rename to kernel/acpi/acpica/amlresrc.h
diff --git a/kernel/acpi/acpica/exmisc.c b/kernel/acpi/acpica/exmisc.c
index 9c8c622..7498f36 100644
--- a/kernel/acpi/acpica/exmisc.c
+++ b/kernel/acpi/acpica/exmisc.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include <acpi/amlcode.h>
-#include <acpi/amlresrc.h>
+#include "amlresrc.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmisc")
diff --git a/kernel/acpi/acpica/rsaddr.c b/kernel/acpi/acpica/rsaddr.c
index c8b9350..1e437bf 100644
--- a/kernel/acpi/acpica/rsaddr.c
+++ b/kernel/acpi/acpica/rsaddr.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsaddr")
diff --git a/kernel/acpi/acpica/rscalc.c b/kernel/acpi/acpica/rscalc.c
index 4d44f58..52865ee 100644
--- a/kernel/acpi/acpica/rscalc.c
+++ b/kernel/acpi/acpica/rscalc.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rscreate.c b/kernel/acpi/acpica/rscreate.c
index 0998933..9eb3a2a 100644
--- a/kernel/acpi/acpica/rscreate.c
+++ b/kernel/acpi/acpica/rscreate.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/rsdump.c b/kernel/acpi/acpica/rsdump.c
index 5dee59d..3f0ca5a 100644
--- a/kernel/acpi/acpica/rsdump.c
+++ b/kernel/acpi/acpica/rsdump.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsdump")
diff --git a/kernel/acpi/acpica/rsinfo.c b/kernel/acpi/acpica/rsinfo.c
index 8cb1ef6..77b25fd 100644
--- a/kernel/acpi/acpica/rsinfo.c
+++ b/kernel/acpi/acpica/rsinfo.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsinfo")
diff --git a/kernel/acpi/acpica/rsio.c b/kernel/acpi/acpica/rsio.c
index 7f8c205..35a49aa 100644
--- a/kernel/acpi/acpica/rsio.c
+++ b/kernel/acpi/acpica/rsio.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsio")
diff --git a/kernel/acpi/acpica/rsirq.c b/kernel/acpi/acpica/rsirq.c
index b73b1ee..2e02569 100644
--- a/kernel/acpi/acpica/rsirq.c
+++ b/kernel/acpi/acpica/rsirq.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsirq")
diff --git a/kernel/acpi/acpica/rslist.c b/kernel/acpi/acpica/rslist.c
index e253f37..1b1dbc6 100644
--- a/kernel/acpi/acpica/rslist.c
+++ b/kernel/acpi/acpica/rslist.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rslist")
diff --git a/kernel/acpi/acpica/rsmemory.c b/kernel/acpi/acpica/rsmemory.c
index ac48921..ddc76ce 100644
--- a/kernel/acpi/acpica/rsmemory.c
+++ b/kernel/acpi/acpica/rsmemory.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmemory")
diff --git a/kernel/acpi/acpica/rsmisc.c b/kernel/acpi/acpica/rsmisc.c
index 375c275..5bc49a5 100644
--- a/kernel/acpi/acpica/rsmisc.c
+++ b/kernel/acpi/acpica/rsmisc.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmisc")
diff --git a/kernel/acpi/acpica/rsutils.c b/kernel/acpi/acpica/rsutils.c
index 6c30ea3..bc03d59 100644
--- a/kernel/acpi/acpica/rsutils.c
+++ b/kernel/acpi/acpica/rsutils.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsutils")
diff --git a/kernel/acpi/acpica/rsxface.c b/kernel/acpi/acpica/rsxface.c
index f9f94a0..69a2aa5 100644
--- a/kernel/acpi/acpica/rsxface.c
+++ b/kernel/acpi/acpica/rsxface.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/acresrc.h>
+#include "acresrc.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_RESOURCES
diff --git a/kernel/acpi/acpica/utresrc.c b/kernel/acpi/acpica/utresrc.c
index 118ae85..91b7c00 100644
--- a/kernel/acpi/acpica/utresrc.c
+++ b/kernel/acpi/acpica/utresrc.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlresrc.h>
+#include "amlresrc.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 14/15] ACPICA: actables.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (11 preceding siblings ...)
  2008-12-31 10:52   ` [PATCH 13/15] ACPICA: acresrc.h, amlresrc.h are private Len Brown
@ 2008-12-31 10:52   ` Len Brown
  2008-12-31 10:52   ` [PATCH 15/15] ACPICA: amlcode.h " Len Brown
  2008-12-31 13:39   ` [PATCH 01/15] ACPI: create kernel/acpi/ Sam Ravnborg
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:52 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/actables.h |    0 
 kernel/acpi/acpica/dsinit.c                     |    2 +-
 kernel/acpi/acpica/dsopcode.c                   |    2 +-
 kernel/acpi/acpica/evxfevnt.c                   |    2 +-
 kernel/acpi/acpica/exconfig.c                   |    2 +-
 kernel/acpi/acpica/hwsleep.c                    |    2 +-
 kernel/acpi/acpica/nsload.c                     |    2 +-
 kernel/acpi/acpica/nsparse.c                    |    2 +-
 kernel/acpi/acpica/nsutils.c                    |    2 +-
 kernel/acpi/acpica/tbfadt.c                     |    2 +-
 kernel/acpi/acpica/tbfind.c                     |    2 +-
 kernel/acpi/acpica/tbinstal.c                   |    2 +-
 kernel/acpi/acpica/tbutils.c                    |    2 +-
 kernel/acpi/acpica/tbxface.c                    |    2 +-
 kernel/acpi/acpica/tbxfroot.c                   |    2 +-
 kernel/acpi/acpica/utinit.c                     |    2 +-
 kernel/acpi/acpica/utxface.c                    |    2 +-
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/actables.h (100%)

diff --git a/include/acpi/actables.h b/kernel/acpi/acpica/actables.h
similarity index 100%
rename from include/acpi/actables.h
rename to kernel/acpi/acpica/actables.h
diff --git a/kernel/acpi/acpica/dsinit.c b/kernel/acpi/acpica/dsinit.c
index c063e81..eb144b1 100644
--- a/kernel/acpi/acpica/dsinit.c
+++ b/kernel/acpi/acpica/dsinit.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acdispat.h"
 #include "acnamesp.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsinit")
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index 4c99739..20b8005 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -50,7 +50,7 @@
 #include "acinterp.h"
 #include "acnamesp.h"
 #include "acevents.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsopcode")
diff --git a/kernel/acpi/acpica/evxfevnt.c b/kernel/acpi/acpica/evxfevnt.c
index b3f8caa..35485e4 100644
--- a/kernel/acpi/acpica/evxfevnt.c
+++ b/kernel/acpi/acpica/evxfevnt.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acevents.h"
 #include "acnamesp.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfevnt")
diff --git a/kernel/acpi/acpica/exconfig.c b/kernel/acpi/acpica/exconfig.c
index fb8e36d..932bbc2 100644
--- a/kernel/acpi/acpica/exconfig.c
+++ b/kernel/acpi/acpica/exconfig.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include "acnamesp.h"
-#include <acpi/actables.h>
+#include "actables.h"
 #include "acdispat.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/hwsleep.c b/kernel/acpi/acpica/hwsleep.c
index f290376..a2af2a4 100644
--- a/kernel/acpi/acpica/hwsleep.c
+++ b/kernel/acpi/acpica/hwsleep.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_HARDWARE
 ACPI_MODULE_NAME("hwsleep")
diff --git a/kernel/acpi/acpica/nsload.c b/kernel/acpi/acpica/nsload.c
index 32e530d..a0ba9e1 100644
--- a/kernel/acpi/acpica/nsload.c
+++ b/kernel/acpi/acpica/nsload.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acnamesp.h"
 #include "acdispat.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsload")
diff --git a/kernel/acpi/acpica/nsparse.c b/kernel/acpi/acpica/nsparse.c
index b7dd8cd..b9e8d00 100644
--- a/kernel/acpi/acpica/nsparse.c
+++ b/kernel/acpi/acpica/nsparse.c
@@ -46,7 +46,7 @@
 #include "acnamesp.h"
 #include "acparser.h"
 #include "acdispat.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsparse")
diff --git a/kernel/acpi/acpica/nsutils.c b/kernel/acpi/acpica/nsutils.c
index ac83061..b285ed7 100644
--- a/kernel/acpi/acpica/nsutils.c
+++ b/kernel/acpi/acpica/nsutils.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acnamesp.h"
 #include <acpi/amlcode.h>
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsutils")
diff --git a/kernel/acpi/acpica/tbfadt.c b/kernel/acpi/acpica/tbfadt.c
index 9c6769e..3636e4f 100644
--- a/kernel/acpi/acpica/tbfadt.c
+++ b/kernel/acpi/acpica/tbfadt.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbfadt")
diff --git a/kernel/acpi/acpica/tbfind.c b/kernel/acpi/acpica/tbfind.c
index 941e38c..1054dfd 100644
--- a/kernel/acpi/acpica/tbfind.c
+++ b/kernel/acpi/acpica/tbfind.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbfind")
diff --git a/kernel/acpi/acpica/tbinstal.c b/kernel/acpi/acpica/tbinstal.c
index 94fe615..37374b2 100644
--- a/kernel/acpi/acpica/tbinstal.c
+++ b/kernel/acpi/acpica/tbinstal.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbinstal")
diff --git a/kernel/acpi/acpica/tbutils.c b/kernel/acpi/acpica/tbutils.c
index 55627ee..3a8d8d2 100644
--- a/kernel/acpi/acpica/tbutils.c
+++ b/kernel/acpi/acpica/tbutils.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbutils")
diff --git a/kernel/acpi/acpica/tbxface.c b/kernel/acpi/acpica/tbxface.c
index ef5954f..c3e841f 100644
--- a/kernel/acpi/acpica/tbxface.c
+++ b/kernel/acpi/acpica/tbxface.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxface")
diff --git a/kernel/acpi/acpica/tbxfroot.c b/kernel/acpi/acpica/tbxfroot.c
index 8954e01..b7fc8dd 100644
--- a/kernel/acpi/acpica/tbxfroot.c
+++ b/kernel/acpi/acpica/tbxfroot.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_TABLES
 ACPI_MODULE_NAME("tbxfroot")
diff --git a/kernel/acpi/acpica/utinit.c b/kernel/acpi/acpica/utinit.c
index 10fb977..a54ca84 100644
--- a/kernel/acpi/acpica/utinit.c
+++ b/kernel/acpi/acpica/utinit.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acnamesp.h"
 #include "acevents.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utinit")
diff --git a/kernel/acpi/acpica/utxface.c b/kernel/acpi/acpica/utxface.c
index 0edc8fb..078a227 100644
--- a/kernel/acpi/acpica/utxface.c
+++ b/kernel/acpi/acpica/utxface.c
@@ -46,7 +46,7 @@
 #include "acevents.h"
 #include "acnamesp.h"
 #include "acdebug.h"
-#include <acpi/actables.h>
+#include "actables.h"
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utxface")
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [PATCH 15/15] ACPICA: amlcode.h is private
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (12 preceding siblings ...)
  2008-12-31 10:52   ` [PATCH 14/15] ACPICA: actables.h is private Len Brown
@ 2008-12-31 10:52   ` Len Brown
  2008-12-31 13:39   ` [PATCH 01/15] ACPI: create kernel/acpi/ Sam Ravnborg
  14 siblings, 0 replies; 33+ messages in thread
From: Len Brown @ 2008-12-31 10:52 UTC (permalink / raw)
  To: linux-acpi, linux-kernel; +Cc: Len Brown

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 {include/acpi => kernel/acpi/acpica}/amlcode.h |    0 
 kernel/acpi/acpica/dsfield.c                   |    2 +-
 kernel/acpi/acpica/dsmethod.c                  |    2 +-
 kernel/acpi/acpica/dsobject.c                  |    2 +-
 kernel/acpi/acpica/dsopcode.c                  |    2 +-
 kernel/acpi/acpica/dsutils.c                   |    2 +-
 kernel/acpi/acpica/dswexec.c                   |    2 +-
 kernel/acpi/acpica/dswload.c                   |    2 +-
 kernel/acpi/acpica/exconvrt.c                  |    2 +-
 kernel/acpi/acpica/excreate.c                  |    2 +-
 kernel/acpi/acpica/exdump.c                    |    2 +-
 kernel/acpi/acpica/exfldio.c                   |    2 +-
 kernel/acpi/acpica/exmisc.c                    |    2 +-
 kernel/acpi/acpica/exnames.c                   |    2 +-
 kernel/acpi/acpica/exoparg1.c                  |    2 +-
 kernel/acpi/acpica/exoparg2.c                  |    2 +-
 kernel/acpi/acpica/exoparg3.c                  |    2 +-
 kernel/acpi/acpica/exoparg6.c                  |    2 +-
 kernel/acpi/acpica/exprep.c                    |    2 +-
 kernel/acpi/acpica/exresolv.c                  |    2 +-
 kernel/acpi/acpica/exresop.c                   |    2 +-
 kernel/acpi/acpica/exstore.c                   |    2 +-
 kernel/acpi/acpica/exstoren.c                  |    2 +-
 kernel/acpi/acpica/exutils.c                   |    2 +-
 kernel/acpi/acpica/nsaccess.c                  |    2 +-
 kernel/acpi/acpica/nsnames.c                   |    2 +-
 kernel/acpi/acpica/nsutils.c                   |    2 +-
 kernel/acpi/acpica/psargs.c                    |    2 +-
 kernel/acpi/acpica/psloop.c                    |    2 +-
 kernel/acpi/acpica/psopcode.c                  |    2 +-
 kernel/acpi/acpica/psparse.c                   |    2 +-
 kernel/acpi/acpica/pstree.c                    |    2 +-
 kernel/acpi/acpica/psutils.c                   |    2 +-
 kernel/acpi/acpica/psxface.c                   |    2 +-
 34 files changed, 33 insertions(+), 33 deletions(-)
 rename {include/acpi => kernel/acpi/acpica}/amlcode.h (100%)

diff --git a/include/acpi/amlcode.h b/kernel/acpi/acpica/amlcode.h
similarity index 100%
rename from include/acpi/amlcode.h
rename to kernel/acpi/acpica/amlcode.h
diff --git a/kernel/acpi/acpica/dsfield.c b/kernel/acpi/acpica/dsfield.c
index 65e27b5..53e27bc 100644
--- a/kernel/acpi/acpica/dsfield.c
+++ b/kernel/acpi/acpica/dsfield.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/dsmethod.c b/kernel/acpi/acpica/dsmethod.c
index cae673e..f537b77 100644
--- a/kernel/acpi/acpica/dsmethod.c
+++ b/kernel/acpi/acpica/dsmethod.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/dsobject.c b/kernel/acpi/acpica/dsobject.c
index ae0140f..15c628e 100644
--- a/kernel/acpi/acpica/dsobject.c
+++ b/kernel/acpi/acpica/dsobject.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acnamesp.h"
 #include "acinterp.h"
diff --git a/kernel/acpi/acpica/dsopcode.c b/kernel/acpi/acpica/dsopcode.c
index 20b8005..0c3b4dd 100644
--- a/kernel/acpi/acpica/dsopcode.c
+++ b/kernel/acpi/acpica/dsopcode.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/dsutils.c b/kernel/acpi/acpica/dsutils.c
index ebc3a79..dabc23a 100644
--- a/kernel/acpi/acpica/dsutils.c
+++ b/kernel/acpi/acpica/dsutils.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/dswexec.c b/kernel/acpi/acpica/dswexec.c
index a2d1932..350e665 100644
--- a/kernel/acpi/acpica/dswexec.c
+++ b/kernel/acpi/acpica/dswexec.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/dswload.c b/kernel/acpi/acpica/dswload.c
index 259d289..3023cea 100644
--- a/kernel/acpi/acpica/dswload.c
+++ b/kernel/acpi/acpica/dswload.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/exconvrt.c b/kernel/acpi/acpica/exconvrt.c
index 49dd801..0be1018 100644
--- a/kernel/acpi/acpica/exconvrt.c
+++ b/kernel/acpi/acpica/exconvrt.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exconvrt")
diff --git a/kernel/acpi/acpica/excreate.c b/kernel/acpi/acpica/excreate.c
index a3f62fc..a57ad25 100644
--- a/kernel/acpi/acpica/excreate.c
+++ b/kernel/acpi/acpica/excreate.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exdump.c b/kernel/acpi/acpica/exdump.c
index 26cf1df..aa31357 100644
--- a/kernel/acpi/acpica/exdump.c
+++ b/kernel/acpi/acpica/exdump.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exfldio.c b/kernel/acpi/acpica/exfldio.c
index d66cd4c..ef58ac4 100644
--- a/kernel/acpi/acpica/exfldio.c
+++ b/kernel/acpi/acpica/exfldio.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acevents.h"
 #include "acdispat.h"
 
diff --git a/kernel/acpi/acpica/exmisc.c b/kernel/acpi/acpica/exmisc.c
index 7498f36..6b0747a 100644
--- a/kernel/acpi/acpica/exmisc.c
+++ b/kernel/acpi/acpica/exmisc.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "amlresrc.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exnames.c b/kernel/acpi/acpica/exnames.c
index 918fbac..ffdae12 100644
--- a/kernel/acpi/acpica/exnames.c
+++ b/kernel/acpi/acpica/exnames.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exnames")
diff --git a/kernel/acpi/acpica/exoparg1.c b/kernel/acpi/acpica/exoparg1.c
index 3bd08bb..b530480 100644
--- a/kernel/acpi/acpica/exoparg1.c
+++ b/kernel/acpi/acpica/exoparg1.c
@@ -47,7 +47,7 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exoparg2.c b/kernel/acpi/acpica/exoparg2.c
index 8f321f7..0b4f513 100644
--- a/kernel/acpi/acpica/exoparg2.c
+++ b/kernel/acpi/acpica/exoparg2.c
@@ -46,7 +46,7 @@
 #include "acparser.h"
 #include "acinterp.h"
 #include "acevents.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg2")
diff --git a/kernel/acpi/acpica/exoparg3.c b/kernel/acpi/acpica/exoparg3.c
index dbe7612..c6520bb 100644
--- a/kernel/acpi/acpica/exoparg3.c
+++ b/kernel/acpi/acpica/exoparg3.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg3")
diff --git a/kernel/acpi/acpica/exoparg6.c b/kernel/acpi/acpica/exoparg6.c
index 17dfb08..ae43f76 100644
--- a/kernel/acpi/acpica/exoparg6.c
+++ b/kernel/acpi/acpica/exoparg6.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acinterp.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exoparg6")
diff --git a/kernel/acpi/acpica/exprep.c b/kernel/acpi/acpica/exprep.c
index 4f17019..33c66eb 100644
--- a/kernel/acpi/acpica/exprep.c
+++ b/kernel/acpi/acpica/exprep.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exresolv.c b/kernel/acpi/acpica/exresolv.c
index 0cb0e9d..3673d2b 100644
--- a/kernel/acpi/acpica/exresolv.c
+++ b/kernel/acpi/acpica/exresolv.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/exresop.c b/kernel/acpi/acpica/exresop.c
index 912148c..3c38027 100644
--- a/kernel/acpi/acpica/exresop.c
+++ b/kernel/acpi/acpica/exresop.c
@@ -44,7 +44,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acparser.h"
 #include "acinterp.h"
 #include "acnamesp.h"
diff --git a/kernel/acpi/acpica/exstore.c b/kernel/acpi/acpica/exstore.c
index 7bb405b..7c6d7e5 100644
--- a/kernel/acpi/acpica/exstore.c
+++ b/kernel/acpi/acpica/exstore.c
@@ -46,7 +46,7 @@
 #include "accommon.h"
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_EXECUTER
diff --git a/kernel/acpi/acpica/exstoren.c b/kernel/acpi/acpica/exstoren.c
index 1189dca..145d153 100644
--- a/kernel/acpi/acpica/exstoren.c
+++ b/kernel/acpi/acpica/exstoren.c
@@ -46,7 +46,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exstoren")
diff --git a/kernel/acpi/acpica/exutils.c b/kernel/acpi/acpica/exutils.c
index 75f699e..32b85d6 100644
--- a/kernel/acpi/acpica/exutils.c
+++ b/kernel/acpi/acpica/exutils.c
@@ -61,7 +61,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exutils")
diff --git a/kernel/acpi/acpica/nsaccess.c b/kernel/acpi/acpica/nsaccess.c
index c7addfe..88303eb 100644
--- a/kernel/acpi/acpica/nsaccess.c
+++ b/kernel/acpi/acpica/nsaccess.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 #include "acdispat.h"
 
diff --git a/kernel/acpi/acpica/nsnames.c b/kernel/acpi/acpica/nsnames.c
index 558fba3..ae3dc10 100644
--- a/kernel/acpi/acpica/nsnames.c
+++ b/kernel/acpi/acpica/nsnames.c
@@ -43,7 +43,7 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/nsutils.c b/kernel/acpi/acpica/nsutils.c
index b285ed7..3e1149b 100644
--- a/kernel/acpi/acpica/nsutils.c
+++ b/kernel/acpi/acpica/nsutils.c
@@ -45,7 +45,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "actables.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
diff --git a/kernel/acpi/acpica/psargs.c b/kernel/acpi/acpica/psargs.c
index a851c73..b161f35 100644
--- a/kernel/acpi/acpica/psargs.c
+++ b/kernel/acpi/acpica/psargs.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 #include "acdispat.h"
 
diff --git a/kernel/acpi/acpica/psloop.c b/kernel/acpi/acpica/psloop.c
index e993e43..c5f6ce1 100644
--- a/kernel/acpi/acpica/psloop.c
+++ b/kernel/acpi/acpica/psloop.c
@@ -53,7 +53,7 @@
 #include "accommon.h"
 #include "acparser.h"
 #include "acdispat.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psloop")
diff --git a/kernel/acpi/acpica/psopcode.c b/kernel/acpi/acpica/psopcode.c
index 9aede84..3bc3a60 100644
--- a/kernel/acpi/acpica/psopcode.c
+++ b/kernel/acpi/acpica/psopcode.c
@@ -45,7 +45,7 @@
 #include "accommon.h"
 #include "acparser.h"
 #include "acopcode.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psopcode")
diff --git a/kernel/acpi/acpica/psparse.c b/kernel/acpi/acpica/psparse.c
index 8d45a31..70838e9 100644
--- a/kernel/acpi/acpica/psparse.c
+++ b/kernel/acpi/acpica/psparse.c
@@ -54,7 +54,7 @@
 #include "accommon.h"
 #include "acparser.h"
 #include "acdispat.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 #include "acnamesp.h"
 #include "acinterp.h"
 
diff --git a/kernel/acpi/acpica/pstree.c b/kernel/acpi/acpica/pstree.c
index f317046..4d33891 100644
--- a/kernel/acpi/acpica/pstree.c
+++ b/kernel/acpi/acpica/pstree.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("pstree")
diff --git a/kernel/acpi/acpica/psutils.c b/kernel/acpi/acpica/psutils.c
index 5336631..e636e07 100644
--- a/kernel/acpi/acpica/psutils.c
+++ b/kernel/acpi/acpica/psutils.c
@@ -44,7 +44,7 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acparser.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psutils")
diff --git a/kernel/acpi/acpica/psxface.c b/kernel/acpi/acpica/psxface.c
index e905037..ff06032 100644
--- a/kernel/acpi/acpica/psxface.c
+++ b/kernel/acpi/acpica/psxface.c
@@ -46,7 +46,7 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "acinterp.h"
-#include <acpi/amlcode.h>
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psxface")
-- 
1.5.6.6


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* Re: [PATCH 01/15] ACPI: create kernel/acpi/
  2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
                     ` (13 preceding siblings ...)
  2008-12-31 10:52   ` [PATCH 15/15] ACPICA: amlcode.h " Len Brown
@ 2008-12-31 13:39   ` Sam Ravnborg
  2008-12-31 14:21     ` Andi Kleen
  2009-01-02 21:30     ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
  14 siblings, 2 replies; 33+ messages in thread
From: Sam Ravnborg @ 2008-12-31 13:39 UTC (permalink / raw)
  To: Len Brown; +Cc: linux-acpi, linux-kernel, Len Brown

> diff --git a/kernel/acpi/Makefile b/kernel/acpi/Makefile
> new file mode 100644
> index 0000000..92a1f94
> --- /dev/null
> +++ b/kernel/acpi/Makefile
> @@ -0,0 +1,26 @@
> +#
> +# Makefile for the Linux/ACPI
> +#
> +
> +export ACPI_CFLAGS
> +

Why is ACPI_CFLAGS exported?
> +ACPI_CFLAGS	:= -Os
> +
> +ifdef CONFIG_ACPI_DEBUG
> +  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
> +endif
> +
> +EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
A better way:

ccflags-$(CONFIG_ACPI_DEBUG) := -DACPI_DEBUG_OUTPUT

Note: EXTRA_CFLAGS is deprecated in favour of ccflags-y.

> +export ACPI_CFLAGS
> +
> +ACPI_CFLAGS	:= -Os
> +
> +ifdef CONFIG_ACPI_DEBUG
> +  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
> +endif
> +
> +EXTRA_CFLAGS	+= $(ACPI_CFLAGS)

Same construct - see above.

	Sam

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 01/15] ACPI: create kernel/acpi/
  2008-12-31 13:39   ` [PATCH 01/15] ACPI: create kernel/acpi/ Sam Ravnborg
@ 2008-12-31 14:21     ` Andi Kleen
  2008-12-31 15:34       ` Sam Ravnborg
  2009-01-02 21:30     ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
  1 sibling, 1 reply; 33+ messages in thread
From: Andi Kleen @ 2008-12-31 14:21 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Len Brown, linux-acpi, linux-kernel, Len Brown

Sam Ravnborg <sam@ravnborg.org> writes:
> Why is ACPI_CFLAGS exported?
>> +ACPI_CFLAGS	:= -Os
>> +
>> +ifdef CONFIG_ACPI_DEBUG
>> +  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
>> +endif
>> +
>> +EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
> A better way:
>
> ccflags-$(CONFIG_ACPI_DEBUG) := -DACPI_DEBUG_OUTPUT

Surely s/:=/+=/ ?

-Andi

-- 
ak@linux.intel.com

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 01/15] ACPI: create kernel/acpi/
  2008-12-31 14:21     ` Andi Kleen
@ 2008-12-31 15:34       ` Sam Ravnborg
  2009-01-02 21:44         ` [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS Len Brown
  0 siblings, 1 reply; 33+ messages in thread
From: Sam Ravnborg @ 2008-12-31 15:34 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Len Brown, linux-acpi, linux-kernel, Len Brown

On Wed, Dec 31, 2008 at 03:21:08PM +0100, Andi Kleen wrote:
> Sam Ravnborg <sam@ravnborg.org> writes:
> > Why is ACPI_CFLAGS exported?
> >> +ACPI_CFLAGS	:= -Os
> >> +
> >> +ifdef CONFIG_ACPI_DEBUG
> >> +  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
> >> +endif
> >> +
> >> +EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
> > A better way:
> >
> > ccflags-$(CONFIG_ACPI_DEBUG) := -DACPI_DEBUG_OUTPUT
> 
> Surely s/:=/+=/ ?

Only if ccflags-y is assigned earlier in the same file
otherwise it does not matter.

	Sam

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2008-12-31 10:51   ` [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/ Len Brown
@ 2009-01-02 19:14     ` Ingo Molnar
  2009-01-02 20:48       ` Len Brown
  2009-01-02 21:56       ` Len Brown
  0 siblings, 2 replies; 33+ messages in thread
From: Ingo Molnar @ 2009-01-02 19:14 UTC (permalink / raw)
  To: Len Brown
  Cc: linux-acpi, linux-kernel, Len Brown, Andrew Morton,
	Linus Torvalds, H. Peter Anvin, Thomas Gleixner


* Len Brown <lenb@kernel.org> wrote:

> From: Len Brown <len.brown@intel.com>
> 
> Signed-off-by: Len Brown <len.brown@intel.com>
> ---

>  kernel/acpi/acpica/dsfield.c                    |    2 +-
>  kernel/acpi/acpica/dsinit.c                     |    2 +-
>  kernel/acpi/acpica/dsmethod.c                   |    2 +-
>  kernel/acpi/acpica/dsmthdat.c                   |    2 +-
>  kernel/acpi/acpica/dsobject.c                   |    2 +-
>  kernel/acpi/acpica/dsopcode.c                   |    2 +-
>  kernel/acpi/acpica/dsutils.c                    |    2 +-
>  kernel/acpi/acpica/dswexec.c                    |    2 +-
>  kernel/acpi/acpica/dswload.c                    |    2 +-
>  kernel/acpi/acpica/dswscope.c                   |    2 +-
>  kernel/acpi/acpica/dswstate.c                   |    2 +-
>  kernel/acpi/acpica/evevent.c                    |    2 +-
>  kernel/acpi/acpica/evgpe.c                      |    2 +-
>  kernel/acpi/acpica/evgpeblk.c                   |    2 +-
>  kernel/acpi/acpica/evmisc.c                     |    2 +-
>  kernel/acpi/acpica/evregion.c                   |    2 +-
>  kernel/acpi/acpica/evrgnini.c                   |    2 +-
>  kernel/acpi/acpica/evsci.c                      |    2 +-
>  kernel/acpi/acpica/evxface.c                    |    2 +-
>  kernel/acpi/acpica/evxfevnt.c                   |    2 +-
>  kernel/acpi/acpica/evxfregn.c                   |    2 +-
>  kernel/acpi/acpica/exconfig.c                   |    2 +-
>  kernel/acpi/acpica/exconvrt.c                   |    2 +-
>  kernel/acpi/acpica/excreate.c                   |    2 +-
>  kernel/acpi/acpica/exdump.c                     |    2 +-
>  kernel/acpi/acpica/exfield.c                    |    2 +-
>
>  [... etc ...]

hm, dunno. Do we really want to introduce 'driver/platform' space items 
like this in the core kernel/* ?

If it goes there then IMHO the ACPI code needs to be cleaned up 
_significantly_ to not wrap native Linux calls like spinlocks, allocators, 
etc.

Random example - i dont think stuff like this is readable [in to-be 
kernel/acpi/utilities/utcache.c]:

        if (cache->current_depth >= cache->max_depth) {
                ACPI_FREE(object);
                ACPI_MEM_TRACKING(cache->total_freed++);
        }

        /* Otherwise put this object back into the cache */

        else {
                status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
                if (ACPI_FAILURE(status)) {
                        return (status);
                }

acpi_ut_acquire_mutex() under [to-be] kernel/acpi/utilities/utmutex.c 
looks absolutely horrible, redirected after some debugging layer to its 
final destination:

./include/acpi/acpiosxf.h:#define acpi_os_acquire_mutex(handle,time) 
acpi_os_wait_semaphore (handle, 1, time), which does [kernel/acpi/osl.c]:

/*
 * TODO: Support for units > 1?
 */
acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
{
	acpi_status status = AE_OK;
	struct semaphore *sem = (struct semaphore *)handle;
	long jiffies;
	int ret = 0;

	if (!sem || (units < 1))
		return AE_BAD_PARAMETER;

	if (units > 1)
		return AE_SUPPORT;

	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n",
			  handle, units, timeout));

	if (timeout == ACPI_WAIT_FOREVER)
		jiffies = MAX_SCHEDULE_TIMEOUT;
	else
		jiffies = msecs_to_jiffies(timeout);
	
	ret = down_timeout(sem, jiffies);
	if (ret)
		status = AE_TIME;

	if (ACPI_FAILURE(status)) {
		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
				  "Failed to acquire semaphore[%p|%d|%d], %s",
				  handle, units, timeout,
				  acpi_format_exception(status)));
	} else {
		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
				  "Acquired semaphore[%p|%d|%d]", handle,
				  units, timeout));
	}

	return status;
}

so it's a glorified down_timeout(). While we have mutex_timeout(). What's 
the plan here?

	Ingo

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2009-01-02 19:14     ` Ingo Molnar
@ 2009-01-02 20:48       ` Len Brown
  2009-01-07 22:10         ` Ingo Molnar
  2009-01-02 21:56       ` Len Brown
  1 sibling, 1 reply; 33+ messages in thread
From: Len Brown @ 2009-01-02 20:48 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-acpi, Linux Kernel Mailing List, Andrew Morton,
	Linus Torvalds, H. Peter Anvin, Thomas Gleixner

> hm, dunno. Do we really want to introduce 'driver/platform' space items 
> like this in the core kernel/* ?

This patch series applies only to the non-driver code.
The ACPI drivers remain in drivers/acpi/.

The code being moved here statically builds into the kernel
on multiple architectures, x86 and ia64.
If you can recommend a more  logical home
for it in the source tree, I'm all ears.

> If it goes there then IMHO the ACPI code needs to be cleaned up 
> _significantly_ to not wrap native Linux calls like spinlocks, allocators, 
> etc.

Are there different style guidelines for the src/kernel/
directory versus other parts of the source tree?

The acpi/acpica/ sub-directory is a processed version of code that
we share with BSD, opensolaris, and every ACPI-capable OS on Earth
besides Microsoft's.  There is a huge commmon benefit
to that sharing, and the Linux community's tolerance of wrappers,
shims, and other unconventional things allows that sharing to
work without an infinite amount of additional make-work.

Indeed, consolidating the ACPICA code under a single acpica/
sub-directory to better identify it is one of the main
benefits of this patch.  Before the split between
Linux code and ACPICA code was less clear.
Maybe I should add a README.txt to that directory to clarify?

> Random example - i dont think stuff like this is readable [in to-be 
> kernel/acpi/utilities/utcache.c]:
> 
>         if (cache->current_depth >= cache->max_depth) {
>                 ACPI_FREE(object);
>                 ACPI_MEM_TRACKING(cache->total_freed++);
>         }
> 
>         /* Otherwise put this object back into the cache */
> 
>         else {
>                 status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
>                 if (ACPI_FAILURE(status)) {
>                         return (status);
>                 }
> 
> acpi_ut_acquire_mutex() under [to-be] kernel/acpi/utilities/utmutex.c 
> looks absolutely horrible, redirected after some debugging layer to its 
> final destination:
> 
> ./include/acpi/acpiosxf.h:#define acpi_os_acquire_mutex(handle,time) 
> acpi_os_wait_semaphore (handle, 1, time), which does [kernel/acpi/osl.c]:
> 
> /*
>  * TODO: Support for units > 1?
>  */
> acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
> {
> 	acpi_status status = AE_OK;
> 	struct semaphore *sem = (struct semaphore *)handle;
> 	long jiffies;
> 	int ret = 0;
> 
> 	if (!sem || (units < 1))
> 		return AE_BAD_PARAMETER;
> 
> 	if (units > 1)
> 		return AE_SUPPORT;
> 
> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n",
> 			  handle, units, timeout));
> 
> 	if (timeout == ACPI_WAIT_FOREVER)
> 		jiffies = MAX_SCHEDULE_TIMEOUT;
> 	else
> 		jiffies = msecs_to_jiffies(timeout);
> 	
> 	ret = down_timeout(sem, jiffies);
> 	if (ret)
> 		status = AE_TIME;
> 
> 	if (ACPI_FAILURE(status)) {
> 		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
> 				  "Failed to acquire semaphore[%p|%d|%d], %s",
> 				  handle, units, timeout,
> 				  acpi_format_exception(status)));
> 	} else {
> 		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
> 				  "Acquired semaphore[%p|%d|%d]", handle,
> 				  units, timeout));
> 	}
> 
> 	return status;
> }
> 
> so it's a glorified down_timeout(). While we have mutex_timeout(). What's 
> the plan here?

ACPICA has required the OS to supply acpi_os_wait_semaphore()
for 10 years.  The timeout in the original Linux implementation
would make you vomit.

We were delighted when Matt gaive us down_timeout() in Linux
starting in 2.6.26.

We went out of our way to give ACPICA the ability to take advantage
of spinlock vs. mutex. vs semaphore if the OS provides them.
However, when mutexes were added to Linux in 2.6.15, we
didn't cut over to them.  I don't recall why at the moment,
the question has come up recently in other conversations.
Perhaps it was that we didn't have a mutex_timeout().
We have one now?

There are plenty of places where we can polish the Linux/ACPI code,
the Linux/ACPI drivers, and the ACPICA code, and I'm all for it.
However, I don't think that should gate moving forward with
a logical source tree layout.

thanks
Len Brown, Intel Open Source Technology Center



^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 01/15] ACPI: create kernel/acpi/
  2008-12-31 13:39   ` [PATCH 01/15] ACPI: create kernel/acpi/ Sam Ravnborg
  2008-12-31 14:21     ` Andi Kleen
@ 2009-01-02 21:30     ` Len Brown
  1 sibling, 0 replies; 33+ messages in thread
From: Len Brown @ 2009-01-02 21:30 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: linux-acpi, Linux Kernel Mailing List


On Wed, 31 Dec 2008, Sam Ravnborg wrote:

> > diff --git a/kernel/acpi/Makefile b/kernel/acpi/Makefile
> > new file mode 100644
> > index 0000000..92a1f94
> > --- /dev/null
> > +++ b/kernel/acpi/Makefile
> > @@ -0,0 +1,26 @@
> > +#
> > +# Makefile for the Linux/ACPI
> > +#
> > +
> > +export ACPI_CFLAGS
> > +
> 
> Why is ACPI_CFLAGS exported?

Dunno what export actually does -- drivers/acpi/Makefile
has been this way for many years.

I believe that -Os is the right way to build the ACPI code.

I see that src/Makefile now has

ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS   += -Os
else
KBUILD_CFLAGS   += -O2
endif

so maybe we are now being redundant?

> > +ACPI_CFLAGS	:= -Os
> > +
> > +ifdef CONFIG_ACPI_DEBUG
> > +  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
> > +endif
> > +
> > +EXTRA_CFLAGS	+= $(ACPI_CFLAGS)

> A better way:
> 
> ccflags-$(CONFIG_ACPI_DEBUG) := -DACPI_DEBUG_OUTPUT
> 
> Note: EXTRA_CFLAGS is deprecated in favour of ccflags-y.

can do.

thanks,
Len Brown, Intel Open Source Technology Center


^ permalink raw reply	[flat|nested] 33+ messages in thread

* [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS
  2008-12-31 15:34       ` Sam Ravnborg
@ 2009-01-02 21:44         ` Len Brown
  2009-01-02 21:52           ` Sam Ravnborg
  0 siblings, 1 reply; 33+ messages in thread
From: Len Brown @ 2009-01-02 21:44 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Andi Kleen, linux-acpi, Linux Kernel Mailing List

From: Len Brown <len.brown@intel.com>

Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/Makefile       |   11 ++---------
 kernel/acpi/Makefile        |   11 ++---------
 kernel/acpi/acpica/Makefile |   12 ++----------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 5f4096d..a4c0582 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -2,15 +2,8 @@
 # Makefile for the Linux ACPI Drivers
 #
 
-export ACPI_CFLAGS
-
-ACPI_CFLAGS	:= -Os
-
-ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
-endif
-
-EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
+ccflags-y			:= -Os
+ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 
 #
 # ACPI Device Drivers
diff --git a/kernel/acpi/Makefile b/kernel/acpi/Makefile
index 92a1f94..fd0927d 100644
--- a/kernel/acpi/Makefile
+++ b/kernel/acpi/Makefile
@@ -2,15 +2,8 @@
 # Makefile for the Linux/ACPI
 #
 
-export ACPI_CFLAGS
-
-ACPI_CFLAGS	:= -Os
-
-ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
-endif
-
-EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
+ccflags-y			:= -Os
+ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 
 obj-y				:= tables.o
 obj-$(CONFIG_X86)		+= x86/
diff --git a/kernel/acpi/acpica/Makefile b/kernel/acpi/acpica/Makefile
index 8d4e018..bad8ad8 100644
--- a/kernel/acpi/acpica/Makefile
+++ b/kernel/acpi/acpica/Makefile
@@ -2,16 +2,8 @@
 # Makefile for ACPICA Core interpreter
 #
 
-export ACPI_CFLAGS
-
-ACPI_CFLAGS	:= -Os
-
-ifdef CONFIG_ACPI_DEBUG
-  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
-endif
-
-EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
-
+ccflags-y			:= -Os
+ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 
 obj-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
 	 dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
-- 
1.6.1.35.g3827


^ permalink raw reply related	[flat|nested] 33+ messages in thread

* Re: [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS
  2009-01-02 21:44         ` [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS Len Brown
@ 2009-01-02 21:52           ` Sam Ravnborg
  2009-01-02 21:56             ` Andi Kleen
  2009-01-02 22:17             ` Len Brown
  0 siblings, 2 replies; 33+ messages in thread
From: Sam Ravnborg @ 2009-01-02 21:52 UTC (permalink / raw)
  To: Len Brown; +Cc: Andi Kleen, linux-acpi, Linux Kernel Mailing List

On Fri, Jan 02, 2009 at 04:44:02PM -0500, Len Brown wrote:
> From: Len Brown <len.brown@intel.com>
> 
> Signed-off-by: Len Brown <len.brown@intel.com>
> ---
>  drivers/acpi/Makefile       |   11 ++---------
>  kernel/acpi/Makefile        |   11 ++---------
>  kernel/acpi/acpica/Makefile |   12 ++----------
>  3 files changed, 6 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index 5f4096d..a4c0582 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -2,15 +2,8 @@
>  # Makefile for the Linux ACPI Drivers
>  #
>  
> -export ACPI_CFLAGS
> -
> -ACPI_CFLAGS	:= -Os
> -
> -ifdef CONFIG_ACPI_DEBUG
> -  ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT
> -endif
> -
> -EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
> +ccflags-y			:= -Os
> +ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT

The conversion from ACPI_CFLAGS to ccflags-y is fine.
And if acpi really require -Os then this part is also OK -
I just did not get *why* acpi needs -Os

On the assumption the the -Os requirement is a hard requirement:

Acked-by: Sam Ravnborg <sam@ravnborg.org>
[For the full patch - I just quoted the first part]

	Sam

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS
  2009-01-02 21:52           ` Sam Ravnborg
@ 2009-01-02 21:56             ` Andi Kleen
  2009-01-02 22:01               ` Sam Ravnborg
  2009-01-02 22:17             ` Len Brown
  1 sibling, 1 reply; 33+ messages in thread
From: Andi Kleen @ 2009-01-02 21:56 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Len Brown, linux-acpi, Linux Kernel Mailing List

Sam Ravnborg <sam@ravnborg.org> writes:
>
> The conversion from ACPI_CFLAGS to ccflags-y is fine.
> And if acpi really require -Os then this part is also OK -
> I just did not get *why* acpi needs -Os

None of ACPI is performance critical and it's rather large, so it was
defaulted to -Os long before the rest of the kernel. It's not
a hard requirement, but a generally good idea.

-Andi

-- 
ak@linux.intel.com

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2009-01-02 19:14     ` Ingo Molnar
  2009-01-02 20:48       ` Len Brown
@ 2009-01-02 21:56       ` Len Brown
  1 sibling, 0 replies; 33+ messages in thread
From: Len Brown @ 2009-01-02 21:56 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-acpi, Linux Kernel Mailing List, Andrew Morton,
	Linus Torvalds, H. Peter Anvin, Thomas Gleixner



-- Len Brown, Intel Open Source Technology Center
> Random example - i dont think stuff like this is readable [in to-be 
> kernel/acpi/utilities/utcache.c]:
> 
>         if (cache->current_depth >= cache->max_depth) {
>                 ACPI_FREE(object);
>                 ACPI_MEM_TRACKING(cache->total_freed++);
>         }
> 
>         /* Otherwise put this object back into the cache */
> 
>         else {
>                 status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
>                 if (ACPI_FAILURE(status)) {
>                         return (status);
>                 }

Oops, I notice that I skipped over this comment.

It is a good example of needed cleanup.
(I proposed moving this to kernel/acpi/acpica/, not 
kernel/acpi/utilities/)
But the Linux kernel doesn't compile the contents of utcache.c
and indeed, I should delete that entire file from the tree.

Linux compiles this in osl.c instead:

acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)
{               
        kmem_cache_free(cache, object);
        return (AE_OK);
}

thanks for pointing this out, I'll deal with it right now.

-Len


^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS
  2009-01-02 21:56             ` Andi Kleen
@ 2009-01-02 22:01               ` Sam Ravnborg
  0 siblings, 0 replies; 33+ messages in thread
From: Sam Ravnborg @ 2009-01-02 22:01 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Len Brown, linux-acpi, Linux Kernel Mailing List

On Fri, Jan 02, 2009 at 10:56:15PM +0100, Andi Kleen wrote:
> Sam Ravnborg <sam@ravnborg.org> writes:
> >
> > The conversion from ACPI_CFLAGS to ccflags-y is fine.
> > And if acpi really require -Os then this part is also OK -
> > I just did not get *why* acpi needs -Os
> 
> None of ACPI is performance critical and it's rather large, so it was
> defaulted to -Os long before the rest of the kernel. It's not
> a hard requirement, but a generally good idea.

Wrong wording on my part when I wrote "hard requirement".
I should have said "justified requirement" which you with the above
have proved it is.

Thanks,
	Sam

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS
  2009-01-02 21:52           ` Sam Ravnborg
  2009-01-02 21:56             ` Andi Kleen
@ 2009-01-02 22:17             ` Len Brown
  2009-01-02 22:46               ` Andi Kleen
  1 sibling, 1 reply; 33+ messages in thread
From: Len Brown @ 2009-01-02 22:17 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Andi Kleen, linux-acpi, Linux Kernel Mailing List



> > --- a/drivers/acpi/Makefile
...
> > +ccflags-y			:= -Os

> The conversion from ACPI_CFLAGS to ccflags-y is fine.
> And if acpi really require -Os then this part is also OK -
> I just did not get *why* acpi needs -Os

ACPI does not "need" -Os.

However, ACPI in Linux has been built with -Os since 2.4
on the assumption that since ACPI should never be performance critical,
that it was best to simply have it consume as little space as possible.

It appears that the entire kernel is now built with -Os by default,
so it looks like this is now redundant in the default case and will
have an effect only when somebody disables CONFIG_CC_OPTIMIZE_FOR_SIZE
to build with -O2.

So I'm willing to delete -Os from the ACPI Makefile
in the interest of simplicity.

thanks,
Len Brown, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS
  2009-01-02 22:17             ` Len Brown
@ 2009-01-02 22:46               ` Andi Kleen
  0 siblings, 0 replies; 33+ messages in thread
From: Andi Kleen @ 2009-01-02 22:46 UTC (permalink / raw)
  To: Len Brown; +Cc: Sam Ravnborg, Andi Kleen, linux-acpi, Linux Kernel Mailing List

> It appears that the entire kernel is now built with -Os by default,

It's default in defconfig, but not necessarily in all configs people
are using.

> so it looks like this is now redundant in the default case and will
> have an effect only when somebody disables CONFIG_CC_OPTIMIZE_FOR_SIZE
> to build with -O2.
> 
> So I'm willing to delete -Os from the ACPI Makefile
> in the interest of simplicity.

I would keep it. In fact it might make sense to expand explicit -Os
to more subsystems.

-Andi

-- 
ak@linux.intel.com

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2009-01-02 20:48       ` Len Brown
@ 2009-01-07 22:10         ` Ingo Molnar
  2009-01-08 16:03           ` Christoph Hellwig
  0 siblings, 1 reply; 33+ messages in thread
From: Ingo Molnar @ 2009-01-07 22:10 UTC (permalink / raw)
  To: Len Brown
  Cc: linux-acpi, Linux Kernel Mailing List, Andrew Morton,
	Linus Torvalds, H. Peter Anvin, Thomas Gleixner


* Len Brown <lenb@kernel.org> wrote:

> > If it goes there then IMHO the ACPI code needs to be cleaned up 
> > _significantly_ to not wrap native Linux calls like spinlocks, 
> > allocators, etc.
> 
> Are there different style guidelines for the src/kernel/
> directory versus other parts of the source tree?
> 
> The acpi/acpica/ sub-directory is a processed version of code that we 
> share with BSD, opensolaris, and every ACPI-capable OS on Earth besides 
> Microsoft's.  There is a huge commmon benefit to that sharing, and the 
> Linux community's tolerance of wrappers, shims, and other unconventional 
> things allows that sharing to work without an infinite amount of 
> additional make-work.

i still tend to regard kernel/* as the core Linux kernel, as code that can 
be improved infinitely (only subject to the laws of physics), without 
having to worry about how the ACPI spec wants certain things done.

The moment you bring in "this has to work on BSD, etc." arguments it will 
be a never ending excuse for crap. Standards tend to create the _worst_ 
possible code, because every vendor compromizes a bit on another vendor's 
crap, just to be able to get in their own important crap. So the more 
vendors there are in a standards group, the crappier the end result is 
technically.

Also, ACPI is an environment/bootstrap detail well placed under 
drivers/acpi/ - why should it move to kernel/acpi/ ? The fact that it's 
used widely is immaterial - by that argument we could move arch/x86/ to 
kernel/x86/, and we could move drivers/ata/ to kernel/ata/ as well. (they 
are probably even more widely deployed than ACPI)

	Ingo

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2009-01-07 22:10         ` Ingo Molnar
@ 2009-01-08 16:03           ` Christoph Hellwig
  2009-01-09  4:34             ` Len Brown
  0 siblings, 1 reply; 33+ messages in thread
From: Christoph Hellwig @ 2009-01-08 16:03 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Len Brown, linux-acpi, Linux Kernel Mailing List, Andrew Morton,
	Linus Torvalds, H. Peter Anvin, Thomas Gleixner

On Wed, Jan 07, 2009 at 11:10:17PM +0100, Ingo Molnar wrote:
> i still tend to regard kernel/* as the core Linux kernel, as code that can 
> be improved infinitely (only subject to the laws of physics), without 
> having to worry about how the ACPI spec wants certain things done.
> 
> The moment you bring in "this has to work on BSD, etc." arguments it will 
> be a never ending excuse for crap. Standards tend to create the _worst_ 
> possible code, because every vendor compromizes a bit on another vendor's 
> crap, just to be able to get in their own important crap. So the more 
> vendors there are in a standards group, the crappier the end result is 
> technically.
> 
> Also, ACPI is an environment/bootstrap detail well placed under 
> drivers/acpi/ - why should it move to kernel/acpi/ ? The fact that it's 
> used widely is immaterial - by that argument we could move arch/x86/ to 
> kernel/x86/, and we could move drivers/ata/ to kernel/ata/ as well. (they 
> are probably even more widely deployed than ACPI)

I agree.  acpi has no business under kernel/.


^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2009-01-08 16:03           ` Christoph Hellwig
@ 2009-01-09  4:34             ` Len Brown
  2009-01-11  4:09               ` Ingo Molnar
  0 siblings, 1 reply; 33+ messages in thread
From: Len Brown @ 2009-01-09  4:34 UTC (permalink / raw)
  To: Christoph Hellwig, Ingo Molnar
  Cc: linux-acpi, Linux Kernel Mailing List, Andrew Morton,
	Linus Torvalds, H. Peter Anvin, Thomas Gleixner



> On Wed, Jan 07, 2009 at 11:10:17PM +0100, Ingo Molnar wrote:
> > i still tend to regard kernel/* as the core Linux kernel, as code that can 
> > be improved infinitely (only subject to the laws of physics), without 
> > having to worry about how the ACPI spec wants certain things done.

I want to move the Linux-ACPI code and the ACPICA core
out of drivers/ simply because they are not drivers,
and never will be.

The actual ACPI drivers, OTOH, would remain in drivers/acpi/.

So looking around...

arch/ doesn't make sense for something shared by x86 and ia64

firmware/ seems to be about software that doesn't run on the CPU.

kernel/ is evidently sacred ground.                 
 
So I suggest "platform/acpi/" or if we can't imagine any
other cross architecture platform code code that isn't device drivers,
then simply "acpi/"  Would you find that less offensive?

thanks,
Len Brown, Intel Open Source Technology Center


^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/
  2009-01-09  4:34             ` Len Brown
@ 2009-01-11  4:09               ` Ingo Molnar
  0 siblings, 0 replies; 33+ messages in thread
From: Ingo Molnar @ 2009-01-11  4:09 UTC (permalink / raw)
  To: Len Brown
  Cc: Christoph Hellwig, linux-acpi, Linux Kernel Mailing List,
	Andrew Morton, Linus Torvalds, H. Peter Anvin, Thomas Gleixner


* Len Brown <lenb@kernel.org> wrote:

> > On Wed, Jan 07, 2009 at 11:10:17PM +0100, Ingo Molnar wrote:
> > > i still tend to regard kernel/* as the core Linux kernel, as code that can 
> > > be improved infinitely (only subject to the laws of physics), without 
> > > having to worry about how the ACPI spec wants certain things done.
> 
> I want to move the Linux-ACPI code and the ACPICA core out of drivers/ 
> simply because they are not drivers, and never will be.

which files are these exactly, in Linus's latest tree?

	Ingo

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2009-01-11  4:10 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-12-31 10:51 RFC - ACPI source code re-org Len Brown
2008-12-31 10:51 ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown
2008-12-31 10:51   ` [PATCH 02/15] ACPI: delete include/acpi/platform/ Len Brown
2008-12-31 10:51   ` [PATCH 03/15] ACPICA: move common private headers under kernel/acpi/acpica/ Len Brown
2009-01-02 19:14     ` Ingo Molnar
2009-01-02 20:48       ` Len Brown
2009-01-07 22:10         ` Ingo Molnar
2009-01-08 16:03           ` Christoph Hellwig
2009-01-09  4:34             ` Len Brown
2009-01-11  4:09               ` Ingo Molnar
2009-01-02 21:56       ` Len Brown
2008-12-31 10:51   ` [PATCH 04/15] ACPICA: acdebug.h is private Len Brown
2008-12-31 10:51   ` [PATCH 05/15] ACPICA: delete acdisasm.h Len Brown
2008-12-31 10:51   ` [PATCH 06/15] ACPICA: acdispat.h is private Len Brown
2008-12-31 10:51   ` [PATCH 07/15] ACPICA: acevents.h " Len Brown
2008-12-31 10:51   ` [PATCH 08/15] ACPICA: acinterp.h " Len Brown
2008-12-31 10:51   ` [PATCH 09/15] ACPICA: acnamesp.h " Len Brown
2008-12-31 10:52   ` [PATCH 10/15] ACPICA: acopcode.h " Len Brown
2008-12-31 10:52   ` [PATCH 11/15] ACPICA: acparser.h " Len Brown
2008-12-31 10:52   ` [PATCH 12/15] ACPICA: acpredef.h " Len Brown
2008-12-31 10:52   ` [PATCH 13/15] ACPICA: acresrc.h, amlresrc.h are private Len Brown
2008-12-31 10:52   ` [PATCH 14/15] ACPICA: actables.h is private Len Brown
2008-12-31 10:52   ` [PATCH 15/15] ACPICA: amlcode.h " Len Brown
2008-12-31 13:39   ` [PATCH 01/15] ACPI: create kernel/acpi/ Sam Ravnborg
2008-12-31 14:21     ` Andi Kleen
2008-12-31 15:34       ` Sam Ravnborg
2009-01-02 21:44         ` [incremental-PATCH-for-Sam's-Review] ACPI: use ccflags-y instead of EXTRA_CFLAGS Len Brown
2009-01-02 21:52           ` Sam Ravnborg
2009-01-02 21:56             ` Andi Kleen
2009-01-02 22:01               ` Sam Ravnborg
2009-01-02 22:17             ` Len Brown
2009-01-02 22:46               ` Andi Kleen
2009-01-02 21:30     ` [PATCH 01/15] ACPI: create kernel/acpi/ Len Brown

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).