Skip to content

Commit b23b9ed

Browse files
committed
powerpc/machdep: Drop include of dma-mapping.h
Drop the include of dma-mapping.h in machdep.h, replace it with forward declarations of struct device and struct pci_dev, and include time64.h and page.h which are required for time64_t and pgprot_t respectively. Add direct includes of some other headers to some files that were getting them via machdep.h. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://patch.msgid.link/20241009051826.132805-2-mpe@ellerman.id.au
1 parent 3c9670d commit b23b9ed

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

arch/powerpc/include/asm/machdep.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55

66
#include <linux/compiler.h>
77
#include <linux/init.h>
8-
#include <linux/dma-mapping.h>
98
#include <linux/export.h>
9+
#include <linux/time64.h>
10+
11+
#include <asm/page.h>
1012

1113
struct pt_regs;
1214
struct pci_bus;
15+
struct device;
1316
struct device_node;
1417
struct iommu_table;
1518
struct rtc_time;
1619
struct file;
20+
struct pci_dev;
1721
struct pci_controller;
1822
struct kimage;
1923
struct pci_host_bridge;

arch/powerpc/kernel/sysfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <asm/hvcall.h>
1818
#include <asm/machdep.h>
1919
#include <asm/smp.h>
20+
#include <asm/time.h>
2021
#include <asm/pmc.h>
2122
#include <asm/firmware.h>
2223
#include <asm/idle.h>

arch/powerpc/platforms/pseries/svm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/mm.h>
1010
#include <linux/memblock.h>
1111
#include <linux/cc_platform.h>
12+
#include <linux/mem_encrypt.h>
1213
#include <asm/machdep.h>
1314
#include <asm/svm.h>
1415
#include <asm/swiotlb.h>

drivers/cpuidle/cpuidle-pseries.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <asm/idle.h>
2323
#include <asm/plpar_wrappers.h>
2424
#include <asm/rtas.h>
25+
#include <asm/time.h>
2526

2627
static struct cpuidle_driver pseries_idle_driver = {
2728
.name = "pseries_idle",

0 commit comments

Comments
 (0)