From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH v2 3/5] ACPICA: Add to remove mis-ordered inclusion of from . Date: Mon, 28 Apr 2014 22:30:03 +0200 Message-ID: <535EBA4B.5090305@intel.com> References: <522ac0c3a52f1697d75363cc808a213773dca295.1398232409.git.lv.zheng@intel.com> <1469560.3p9s15HIYZ@vostro.rjw.lan> <1AE640813FDE7649BE1B193DEA596E880255865E@SHSMSX101.ccr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1AE640813FDE7649BE1B193DEA596E880255865E@SHSMSX101.ccr.corp.intel.com> Sender: linux-ia64-owner@vger.kernel.org To: "Zheng, Lv" , "Rafael J. Wysocki" Cc: "Brown, Len" , Lv Zheng , "linux-kernel@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "Luck, Tony" , "Yu, Fenghua" , "linux-ia64@vger.kernel.org" , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , "x86@kernel.org" List-Id: linux-acpi@vger.kernel.org On 4/28/2014 5:02 AM, Zheng, Lv wrote: > Hi, Rafael > >> From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki >> Sent: Monday, April 28, 2014 5:37 AM >> To: Zheng, Lv >> >> On Wednesday, April 23, 2014 02:54:06 PM Lv Zheng wrote: >>> There is a mis-order inclusion for . >>> >>> As we will enforce including for all Linux ACPI users, we >>> can find the inclusion order is as follows: >>> >>> >>> >>> >>> (acenv.h before including aclinux.h) >>> >>> ........................................................................... >>> (aclinux.h before including asm/acpi.h) >>> @Redundant@ >>> (ACPICA specific stuff) >>> ........................................................................... >>> ........................................................................... >>> (Linux ACPI specific stuff) ? - - - - - - - - - - - - + >>> (aclinux.h after including asm/acpi.h) @Invisible@ | >>> (acenv.h after including aclinux.h) @Invisible@ | >>> other ACPICA headers @Invisible@ | >>> ............................................................|.............. >>> | >>> | >>> (Excluded) | >>> (Linux ACPI specific stuff) ! <- - - - - - - - - - - - - + >>> >>> NOTE that, in ACPICA, is more like Kconfig >>> generated for Linux, it is meant to be included >>> before including any ACPICA code. >>> >>> In the above figure, there is a question mark for "Linux ACPI specific >>> stuff" in which should be included after including all other >>> ACPICA header files. Thus they really need to be moved to the position >>> marked with exclaimation mark or the definitions in the blocks marked with >>> "@Invisible@" will be invisible to such architecture specific "Linux ACPI >>> specific stuff" header blocks. This leaves 2 issues: >>> 1. All environmental definitions in these blocks should have a copy in the >>> area marked with "@Redundant@" if they are required by the "Linux ACPI >>> specific stuff". >>> 2. We cannot use any ACPICA defined types in . >>> >>> This patch splits architecture specific ACPICA stuff from to >>> fix this issue. >>> >>> Signed-off-by: Lv Zheng >>> Cc: Tony Luck >>> Cc: Fenghua Yu >>> Cc: linux-ia64@vger.kernel.org >>> Cc: Thomas Gleixner >>> Cc: Ingo Molnar >>> Cc: "H. Peter Anvin" >>> Cc: x86@kernel.org >>> --- >>> arch/ia64/include/asm/acenv.h | 71 +++++++++++++++++++++++++++++++++++++++ >>> arch/ia64/include/asm/acpi.h | 50 --------------------------- >>> arch/x86/include/asm/acenv.h | 65 +++++++++++++++++++++++++++++++++++ >>> arch/x86/include/asm/acpi.h | 45 ------------------------- >>> include/acpi/platform/aclinux.h | 2 +- >> Please rename the files first (in a separate patch) and then modify the >> renamed ones. That will make changes much easier to follow. > This patch doesn't provide a rename. > Currently, includes: > 1. arch specific ACPI stuff > 2. arch specific ACPICA stuff > This patch moves "2" to a separate file , thus no renaming happens here. Ah, I overlooked that, sorry. Which I might not do if the changelog said what the patch was really doing. Thanks, Rafael