Commit 7d4c44a5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-tables' 

Merge a fix for a recently introduced build issue on ARM32 platforms
caused by an inadvertent header file breakage (Dave Jiang).

* acpi-tables:
  ACPI: Fix ARM32 platforms compile issue introduced by fw_table changes
parents 172c48ca 35732699

include/linux/acpi.h

+11 −11
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/mod_devicetable.h>

#include <linux/property.h>

#include <linux/uuid.h>

#include <linux/fw_table.h>



struct irq_domain;

struct irq_domain_ops;
@@ -25,22 +24,13 @@ struct irq_domain_ops; 
#endif

#include <acpi/acpi.h>



#ifdef CONFIG_ACPI_TABLE_LIB

#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)

#define __init_or_acpilib

#define __initdata_or_acpilib

#else

#define EXPORT_SYMBOL_ACPI_LIB(x)

#define __init_or_acpilib __init

#define __initdata_or_acpilib __initdata

#endif



#ifdef	CONFIG_ACPI



#include <linux/list.h>

#include <linux/dynamic_debug.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/fw_table.h>



#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>
@@ -48,6 +38,16 @@ struct irq_domain_ops; 
#include <acpi/acpi_io.h>

#include <asm/acpi.h>



#ifdef CONFIG_ACPI_TABLE_LIB

#define EXPORT_SYMBOL_ACPI_LIB(x) EXPORT_SYMBOL_NS_GPL(x, ACPI)

#define __init_or_acpilib

#define __initdata_or_acpilib

#else

#define EXPORT_SYMBOL_ACPI_LIB(x)

#define __init_or_acpilib __init

#define __initdata_or_acpilib __initdata

#endif



static inline acpi_handle acpi_device_handle(struct acpi_device *adev)

{

	return adev ? adev->handle : NULL;

include/linux/fw_table.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ struct acpi_subtable_proc { 
	int count;

};



#include <linux/acpi.h>

#include <acpi/acpi.h>



union acpi_subtable_headers {

	struct acpi_subtable_header common;

	struct acpi_hmat_structure hmat;

lib/fw_table.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *  Copyright (C) 2023 Intel Corp.

 */

#include <linux/errno.h>

#include <linux/fw_table.h>

#include <linux/acpi.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/string.h>