diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2015-06-19 05:38:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-24 19:54:15 +0200 |
| commit | 7011bf4eccb63b4f34e4caa37a3a86f59d4031d4 (patch) | |
| tree | c71e08b29c4778df5cad92d6408f84015070a315 /drivers/acpi | |
| parent | ACPICA: Linuxize: Reduce divergences for 20150616 release (diff) | |
| download | linux-7011bf4eccb63b4f34e4caa37a3a86f59d4031d4.tar.xz linux-7011bf4eccb63b4f34e4caa37a3a86f59d4031d4.zip | |
ACPICA: Linuxize: Replace __FUNCTION__ with __func__
ACPICA commit cb3d1c79f862cd368d749c9b8d9dced40111b0d0
__FUNCTION__ is MSVC only, in Linux, it is __func__. Lv Zheng.
As noted by Christoph Hellwig: "__func__ is in C99 and never.
__FUNCTION__ is an old extension supported by various compilers."
In ACPICA, this is achieved by string replacement in release script and
this patch contains the source code difference between the Linux upstream
and ACPICA that is caused by the back porting.
Link: https://github.com/acpica/acpica/commit/cb3d1c79
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/utdebug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c index 4f3f888d33bb..cd02693841db 100644 --- a/drivers/acpi/acpica/utdebug.c +++ b/drivers/acpi/acpica/utdebug.c @@ -111,8 +111,8 @@ void acpi_ut_track_stack_ptr(void) * RETURN: Updated pointer to the function name * * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present. - * This allows compiler macros such as __func__ to be used with no - * change to the debug output. + * This allows compiler macros such as __func__ to be used + * with no change to the debug output. * ******************************************************************************/ |