From c15fe3916b77bc809577898c0d5037b1bfd4183b Mon Sep 17 00:00:00 2001 From: Saket Dumbre Date: Wed, 18 Oct 2023 15:30:43 -0700 Subject: ACPICA: Attempt 1 to fix issue #900 ACPICA commit f5910dd1ab60780b95eed16d36860f18b01bc156 Link: https://github.com/acpica/acpica/commit/f5910dd1 Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/utdebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/acpi/acpica/utdebug.c') diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c index c5f6c85a3a09..2f37d673e285 100644 --- a/drivers/acpi/acpica/utdebug.c +++ b/drivers/acpi/acpica/utdebug.c @@ -42,7 +42,6 @@ void acpi_ut_init_stack_ptr_trace(void) #pragma GCC diagnostic ignored "-Wdangling-pointer=" #endif acpi_gbl_entry_stack_pointer = ¤t_sp; -#pragma GCC diagnostic pop } /******************************************************************************* @@ -63,6 +62,7 @@ void acpi_ut_track_stack_ptr(void) if (¤t_sp < acpi_gbl_lowest_stack_pointer) { acpi_gbl_lowest_stack_pointer = ¤t_sp; +#pragma GCC diagnostic pop } if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) { -- cgit v1.2.3-59-g8ed1b From 5a02527783caae57535e0742262cd96b7167f983 Mon Sep 17 00:00:00 2001 From: Saket Dumbre Date: Tue, 26 Dec 2023 13:32:56 -0800 Subject: ACPICA: Clean up the fix for Issue #900 ACPICA commit b6b38edb0c18017af0bd2aff4eaa502810c8873f Link: https://github.com/acpica/acpica/commit/b6b38edb Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/utdebug.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'drivers/acpi/acpica/utdebug.c') diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c index 2f37d673e285..98027d2f7bfb 100644 --- a/drivers/acpi/acpica/utdebug.c +++ b/drivers/acpi/acpica/utdebug.c @@ -42,6 +42,7 @@ void acpi_ut_init_stack_ptr_trace(void) #pragma GCC diagnostic ignored "-Wdangling-pointer=" #endif acpi_gbl_entry_stack_pointer = ¤t_sp; +#pragma GCC diagnostic pop } /******************************************************************************* @@ -61,8 +62,12 @@ void acpi_ut_track_stack_ptr(void) acpi_size current_sp; if (¤t_sp < acpi_gbl_lowest_stack_pointer) { +#pragma GCC diagnostic push +#if defined(__GNUC__) && __GNUC__ >= 12 +#pragma GCC diagnostic ignored "-Wdangling-pointer=" +#endif acpi_gbl_lowest_stack_pointer = ¤t_sp; -#pragma GCC diagnostic pop +#pragma GCC diagnostic popmake } if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) { -- cgit v1.2.3-59-g8ed1b From ed5addd09827566df237df16357c514e2f18a9cb Mon Sep 17 00:00:00 2001 From: Saket Dumbre Date: Tue, 26 Dec 2023 13:36:14 -0800 Subject: ACPICA: Fix spelling and typos ACPICA commit a6a236c44c7d3eb54562fb5ddde4144d8347e0ac Clean up the fix for Issue #900. Link: https://github.com/acpica/acpica/commit/a6a236c4 Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/utdebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/acpi/acpica/utdebug.c') diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c index 98027d2f7bfb..3d71bd9245c7 100644 --- a/drivers/acpi/acpica/utdebug.c +++ b/drivers/acpi/acpica/utdebug.c @@ -67,7 +67,7 @@ void acpi_ut_track_stack_ptr(void) #pragma GCC diagnostic ignored "-Wdangling-pointer=" #endif acpi_gbl_lowest_stack_pointer = ¤t_sp; -#pragma GCC diagnostic popmake +#pragma GCC diagnostic pop } if (acpi_gbl_nesting_level > acpi_gbl_deepest_nesting) { -- cgit v1.2.3-59-g8ed1b