History

Merge tag 'acpi-6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki: "This fixes a recently introduced build issue on ARM32 and a NULL pointer dereference in the ACPI backlight driver due to a design issue exposed by a recent change in the ACPI bus type code. Specifics: - Fix a recently introduced build issue on ARM32 platforms caused by an inadvertent header file breakage (Dave Jiang) - Eliminate questionable usage of acpi_driver_data() in the ACPI backlight cooling device code that leads to NULL pointer dereferences after recent ACPI core changes (Hans de Goede)" * tag 'acpi-6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: video: Use acpi_video_device for cooling-dev driver data ACPI: Fix ARM32 platforms compile issue introduced by fw_table changes

Linus Torvalds committed 2 years ago

Commit ce474ae2 parents 35f8458 7d4c44a4 files · +17 −24Browse files

Showing the changes to include/linux (2 of 4 files). Show all

Unified · Split

2 files
  1. include/linux/acpi.h +11 −11
  2. include/linux/fw_table.h +0 −3
include/linux/acpi.h+11−11
@@ -15,7 +15,6 @@ · 14 unmodified lines
15#include <linux/mod_devicetable.h>15#include <linux/mod_devicetable.h>
16#include <linux/property.h>16#include <linux/property.h>
17#include <linux/uuid.h>17#include <linux/uuid.h>
18#include <linux/fw_table.h>
19 18
20struct irq_domain;19struct irq_domain;
21struct irq_domain_ops;20struct irq_domain_ops;
@@ -25,22 +24,13 @@ struct irq_domain_ops; · 3 unmodified lines
25#endif24#endif
26#include <acpi/acpi.h>25#include <acpi/acpi.h>
27 26
28#ifdef CONFIG_ACPI_TABLE_LIB
29#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)
30#define __init_or_acpilib
31#define __initdata_or_acpilib
32#else
33#define EXPORT_SYMBOL_ACPI_LIB(x)
34#define __init_or_acpilib __init
35#define __initdata_or_acpilib __initdata
36#endif
37
38#ifdef CONFIG_ACPI27#ifdef CONFIG_ACPI
39 28
40#include <linux/list.h>29#include <linux/list.h>
41#include <linux/dynamic_debug.h>30#include <linux/dynamic_debug.h>
42#include <linux/module.h>31#include <linux/module.h>
43#include <linux/mutex.h>32#include <linux/mutex.h>
33#include <linux/fw_table.h>
44 34
45#include <acpi/acpi_bus.h>35#include <acpi/acpi_bus.h>
46#include <acpi/acpi_drivers.h>36#include <acpi/acpi_drivers.h>
@@ -48,6 +38,16 @@ struct irq_domain_ops; · 1 unmodified line
48#include <acpi/acpi_io.h>38#include <acpi/acpi_io.h>
49#include <asm/acpi.h>39#include <asm/acpi.h>
50 40
41#ifdef CONFIG_ACPI_TABLE_LIB
42#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)
43#define __init_or_acpilib
44#define __initdata_or_acpilib
45#else
46#define EXPORT_SYMBOL_ACPI_LIB(x)
47#define __init_or_acpilib __init
48#define __initdata_or_acpilib __initdata
49#endif
50
51static inline acpi_handle acpi_device_handle(struct acpi_device *adev)51static inline acpi_handle acpi_device_handle(struct acpi_device *adev)
52{52{
53 return adev ? adev->handle : NULL;53 return adev ? adev->handle : NULL;
include/linux/fw_table.h+0−3
@@ -25,9 +25,6 @@ struct acpi_subtable_proc { · 24 unmodified lines
25 int count;25 int count;
26};26};
27 27
28#include <linux/acpi.h>
29#include <acpi/acpi.h>
30
31union acpi_subtable_headers {28union acpi_subtable_headers {
32 struct acpi_subtable_header common;29 struct acpi_subtable_header common;
33 struct acpi_hmat_structure hmat;30 struct acpi_hmat_structure hmat;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t