Skip to content

Commit ab8a1e4

Browse files
sfrothwellsfrothwell
committed
Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git
# Conflicts: # arch/x86/include/asm/paravirt_types.h # arch/x86/include/asm/percpu.h
2 parents ca262a7 + cbc1780 commit ab8a1e4

File tree

118 files changed

+1062
-775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1062
-775
lines changed

‎arch/arm64/include/asm/spectre.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#define __BP_HARDEN_HYP_VECS_SZ ((BP_HARDEN_EL2_SLOTS - 1) * SZ_2K)
1414

1515
#ifndef __ASSEMBLY__
16-
17-
#include <linux/percpu.h>
16+
#include <linux/smp.h>
17+
#include <asm/percpu.h>
1818

1919
#include <asm/cpufeature.h>
2020
#include <asm/virt.h>

‎arch/arm64/kernel/ptrace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/hw_breakpoint.h>
2929
#include <linux/regset.h>
3030
#include <linux/elf.h>
31+
#include <linux/rseq.h>
3132

3233
#include <asm/compat.h>
3334
#include <asm/cpufeature.h>

‎arch/m68k/include/asm/processor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#ifndef __ASM_M68K_PROCESSOR_H
99
#define __ASM_M68K_PROCESSOR_H
1010

11+
#include <linux/preempt.h>
1112
#include <linux/thread_info.h>
1213
#include <asm/fpu.h>
1314
#include <asm/ptrace.h>

‎arch/microblaze/include/asm/pgtable.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
336336
}
337337

338338
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
339+
struct vm_area_struct;
339340
static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
340341
unsigned long address, pte_t *ptep)
341342
{

‎arch/parisc/mm/init.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <asm/msgbuf.h>
3434
#include <asm/sparsemem.h>
3535
#include <asm/asm-offsets.h>
36+
#include <asm/shmbuf.h>
3637

3738
extern int data_start;
3839
extern void parisc_kernel_start(void); /* Kernel entry point in head.S */

‎arch/powerpc/kernel/interrupt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <linux/context_tracking.h>
44
#include <linux/err.h>
55
#include <linux/compat.h>
6+
#include <linux/rseq.h>
67
#include <linux/sched/debug.h> /* for show_regs */
78

89
#include <asm/kup.h>

‎arch/powerpc/kvm/book3s_64_vio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <linux/iommu.h>
2121
#include <linux/file.h>
2222
#include <linux/mm.h>
23+
#include <linux/rcupdate_wait.h>
2324

2425
#include <asm/kvm_ppc.h>
2526
#include <asm/kvm_book3s.h>

‎arch/s390/kernel/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <linux/sched.h>
1414
#include <linux/sched/task_stack.h>
15+
#include <linux/rseq.h>
1516
#include <linux/mm.h>
1617
#include <linux/smp.h>
1718
#include <linux/kernel.h>

‎arch/x86/include/asm/current.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifndef _ASM_X86_CURRENT_H
33
#define _ASM_X86_CURRENT_H
44

5+
#include <linux/build_bug.h>
56
#include <linux/compiler.h>
67

78
#ifndef __ASSEMBLY__

‎arch/x86/include/asm/debugreg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <linux/bug.h>
66
#include <linux/percpu.h>
77
#include <uapi/asm/debugreg.h>
8+
#include <asm/cpufeature.h>
89

910
DECLARE_PER_CPU(unsigned long, cpu_dr7);
1011

‎arch/x86/include/asm/fpu/types.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#ifndef _ASM_X86_FPU_H
66
#define _ASM_X86_FPU_H
77

8+
#include <asm/page_types.h>
9+
810
/*
911
* The legacy x87 FPU state format, as saved by FSAVE and
1012
* restored by the FRSTOR instructions:

‎arch/x86/include/asm/paravirt.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
#include <asm/paravirt_types.h>
88

9+
#ifndef __ASSEMBLY__
10+
struct mm_struct;
11+
#endif
12+
913
#ifdef CONFIG_PARAVIRT
1014
#include <asm/pgtable_types.h>
1115
#include <asm/asm.h>

‎arch/x86/include/asm/paravirt_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#ifdef CONFIG_PARAVIRT
66

77
#ifndef __ASSEMBLY__
8+
#include <linux/types.h>
89

910
#include <asm/desc_defs.h>
1011
#include <asm/pgtable_types.h>

‎arch/x86/include/asm/percpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#else /* ...!ASSEMBLY */
3030

3131
#include <linux/build_bug.h>
32-
#include <linux/kernel.h>
3332
#include <linux/stringify.h>
33+
#include <asm/asm.h>
3434

3535
#ifdef CONFIG_SMP
3636

‎arch/x86/include/asm/preempt.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <asm/percpu.h>
77
#include <asm/current.h>
88

9-
#include <linux/thread_info.h>
109
#include <linux/static_call_types.h>
1110

1211
/* We use the MSB mostly because its available */

‎arch/x86/include/uapi/asm/signal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#ifndef __ASSEMBLY__
66
#include <linux/types.h>
7-
#include <linux/time.h>
87
#include <linux/compiler.h>
98

109
/* Avoid too many header ordering problems. */

‎arch/x86/kernel/fpu/bugs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/*
33
* x86 FPU bug checks:
44
*/
5+
#include <asm/cpufeature.h>
56
#include <asm/fpu/api.h>
67

78
/*

‎arch/x86/kernel/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/context_tracking.h>
2828
#include <linux/entry-common.h>
2929
#include <linux/syscalls.h>
30+
#include <linux/rseq.h>
3031

3132
#include <asm/processor.h>
3233
#include <asm/ucontext.h>

‎arch/x86/lib/cache-smp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2+
#include <asm/paravirt.h>
23
#include <linux/smp.h>
34
#include <linux/export.h>
45

‎arch/x86/um/sysrq_64.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <linux/kernel.h>
88
#include <linux/module.h>
9+
#include <linux/pid.h>
910
#include <linux/sched.h>
1011
#include <linux/sched/debug.h>
1112
#include <linux/utsname.h>

‎drivers/base/power/runtime.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/export.h>
1212
#include <linux/pm_runtime.h>
1313
#include <linux/pm_wakeirq.h>
14+
#include <linux/rculist.h>
1415
#include <trace/events/rpm.h>
1516

1617
#include "../base.h"

‎drivers/gpu/drm/i915/i915_memcpy.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424

2525
#include <linux/kernel.h>
26+
#include <linux/string.h>
27+
#include <linux/cpufeature.h>
2628
#include <asm/fpu/api.h>
2729

2830
#include "i915_memcpy.h"

‎drivers/gpu/drm/lima/lima_ctx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0 OR MIT
22
/* Copyright 2018-2019 Qiang Yu <[email protected]> */
33

4+
#include <linux/pid.h>
45
#include <linux/slab.h>
56

67
#include "lima_device.h"

‎drivers/irqchip/irq-gic-v4.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <linux/irq.h>
99
#include <linux/irqdomain.h>
1010
#include <linux/msi.h>
11+
#include <linux/pid.h>
1112
#include <linux/sched.h>
1213

1314
#include <linux/irqchip/arm-gic-v4.h>

‎drivers/media/test-drivers/vidtv/vidtv_pes.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#define pr_fmt(fmt) KBUILD_MODNAME ":%s, %d: " fmt, __func__, __LINE__
1515

1616
#include <linux/types.h>
17+
#include <linux/math64.h>
1718
#include <linux/printk.h>
1819
#include <linux/ratelimit.h>
1920

‎drivers/target/target_core_xcopy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/slab.h>
1616
#include <linux/spinlock.h>
1717
#include <linux/list.h>
18+
#include <linux/rculist.h>
1819
#include <linux/configfs.h>
1920
#include <linux/ratelimit.h>
2021
#include <scsi/scsi_proto.h>

‎fs/exec.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#include <linux/coredump.h>
6767
#include <linux/time_namespace.h>
6868
#include <linux/user_events.h>
69+
#include <linux/rseq.h>
6970

7071
#include <linux/uaccess.h>
7172
#include <asm/mmu_context.h>

‎include/linux/audit.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ struct mqstat;
3636
struct audit_watch;
3737
struct audit_tree;
3838
struct sk_buff;
39+
struct kern_ipc_perm;
3940

4041
struct audit_krule {
4142
u32 pflags;

‎include/linux/dma-fence.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <linux/sched.h>
2222
#include <linux/printk.h>
2323
#include <linux/rcupdate.h>
24+
#include <linux/timekeeping.h>
2425

2526
struct dma_fence;
2627
struct dma_fence_ops;

‎include/linux/hrtimer.h

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
#define _LINUX_HRTIMER_H
1414

1515
#include <linux/hrtimer_defs.h>
16-
#include <linux/rbtree.h>
16+
#include <linux/hrtimer_types.h>
1717
#include <linux/init.h>
1818
#include <linux/list.h>
19-
#include <linux/percpu.h>
19+
#include <linux/percpu-defs.h>
20+
#include <linux/rbtree.h>
2021
#include <linux/seqlock.h>
2122
#include <linux/timer.h>
22-
#include <linux/timerqueue.h>
2323

2424
struct hrtimer_clock_base;
2525
struct hrtimer_cpu_base;
@@ -59,14 +59,6 @@ enum hrtimer_mode {
5959
HRTIMER_MODE_REL_PINNED_HARD = HRTIMER_MODE_REL_PINNED | HRTIMER_MODE_HARD,
6060
};
6161

62-
/*
63-
* Return values for the callback function
64-
*/
65-
enum hrtimer_restart {
66-
HRTIMER_NORESTART, /* Timer is not restarted */
67-
HRTIMER_RESTART, /* Timer must be restarted */
68-
};
69-
7062
/*
7163
* Values to track state of the timer
7264
*
@@ -94,38 +86,6 @@ enum hrtimer_restart {
9486
#define HRTIMER_STATE_INACTIVE 0x00
9587
#define HRTIMER_STATE_ENQUEUED 0x01
9688

97-
/**
98-
* struct hrtimer - the basic hrtimer structure
99-
* @node: timerqueue node, which also manages node.expires,
100-
* the absolute expiry time in the hrtimers internal
101-
* representation. The time is related to the clock on
102-
* which the timer is based. Is setup by adding
103-
* slack to the _softexpires value. For non range timers
104-
* identical to _softexpires.
105-
* @_softexpires: the absolute earliest expiry time of the hrtimer.
106-
* The time which was given as expiry time when the timer
107-
* was armed.
108-
* @function: timer expiry callback function
109-
* @base: pointer to the timer base (per cpu and per clock)
110-
* @state: state information (See bit values above)
111-
* @is_rel: Set if the timer was armed relative
112-
* @is_soft: Set if hrtimer will be expired in soft interrupt context.
113-
* @is_hard: Set if hrtimer will be expired in hard interrupt context
114-
* even on RT.
115-
*
116-
* The hrtimer structure must be initialized by hrtimer_init()
117-
*/
118-
struct hrtimer {
119-
struct timerqueue_node node;
120-
ktime_t _softexpires;
121-
enum hrtimer_restart (*function)(struct hrtimer *);
122-
struct hrtimer_clock_base *base;
123-
u8 state;
124-
u8 is_rel;
125-
u8 is_soft;
126-
u8 is_hard;
127-
};
128-
12989
/**
13090
* struct hrtimer_sleeper - simple sleeper structure
13191
* @timer: embedded timer structure

‎include/linux/hrtimer_types.h

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef _LINUX_HRTIMER_TYPES_H
3+
#define _LINUX_HRTIMER_TYPES_H
4+
5+
#include <linux/types.h>
6+
#include <linux/timerqueue_types.h>
7+
8+
struct hrtimer_clock_base;
9+
10+
/*
11+
* Return values for the callback function
12+
*/
13+
enum hrtimer_restart {
14+
HRTIMER_NORESTART, /* Timer is not restarted */
15+
HRTIMER_RESTART, /* Timer must be restarted */
16+
};
17+
18+
/**
19+
* struct hrtimer - the basic hrtimer structure
20+
* @node: timerqueue node, which also manages node.expires,
21+
* the absolute expiry time in the hrtimers internal
22+
* representation. The time is related to the clock on
23+
* which the timer is based. Is setup by adding
24+
* slack to the _softexpires value. For non range timers
25+
* identical to _softexpires.
26+
* @_softexpires: the absolute earliest expiry time of the hrtimer.
27+
* The time which was given as expiry time when the timer
28+
* was armed.
29+
* @function: timer expiry callback function
30+
* @base: pointer to the timer base (per cpu and per clock)
31+
* @state: state information (See bit values above)
32+
* @is_rel: Set if the timer was armed relative
33+
* @is_soft: Set if hrtimer will be expired in soft interrupt context.
34+
* @is_hard: Set if hrtimer will be expired in hard interrupt context
35+
* even on RT.
36+
*
37+
* The hrtimer structure must be initialized by hrtimer_init()
38+
*/
39+
struct hrtimer {
40+
struct timerqueue_node node;
41+
ktime_t _softexpires;
42+
enum hrtimer_restart (*function)(struct hrtimer *);
43+
struct hrtimer_clock_base *base;
44+
u8 state;
45+
u8 is_rel;
46+
u8 is_soft;
47+
u8 is_hard;
48+
};
49+
50+
#endif /* _LINUX_HRTIMER_TYPES_H */

‎include/linux/ipc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _LINUX_IPC_H
33
#define _LINUX_IPC_H
44

5-
#include <linux/spinlock.h>
5+
#include <linux/spinlock_types.h>
66
#include <linux/uidgid.h>
77
#include <linux/rhashtable-types.h>
88
#include <uapi/linux/ipc.h>

‎include/linux/irqflags.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#ifndef _LINUX_TRACE_IRQFLAGS_H
1313
#define _LINUX_TRACE_IRQFLAGS_H
1414

15+
#include <linux/irqflags_types.h>
1516
#include <linux/typecheck.h>
1617
#include <linux/cleanup.h>
1718
#include <asm/irqflags.h>
@@ -34,19 +35,6 @@
3435

3536
#ifdef CONFIG_TRACE_IRQFLAGS
3637

37-
/* Per-task IRQ trace events information. */
38-
struct irqtrace_events {
39-
unsigned int irq_events;
40-
unsigned long hardirq_enable_ip;
41-
unsigned long hardirq_disable_ip;
42-
unsigned int hardirq_enable_event;
43-
unsigned int hardirq_disable_event;
44-
unsigned long softirq_disable_ip;
45-
unsigned long softirq_enable_ip;
46-
unsigned int softirq_disable_event;
47-
unsigned int softirq_enable_event;
48-
};
49-
5038
DECLARE_PER_CPU(int, hardirqs_enabled);
5139
DECLARE_PER_CPU(int, hardirq_context);
5240

0 commit comments

Comments
 (0)