asm/system.h is a cause of circular dependency problems because it contains commonly used primitive stuff like barrier definitions and uncommonly used stuff like switch_to() that might require MMU definitions. asm/system.h has been disintegrated by this point on all arches into the following common segments: (1) asm/barrier.h Moved memory barrier definitions here. (2) asm/cmpxchg.h Moved xchg() and cmpxchg() here. #included in asm/atomic.h. (3) asm/bug.h Moved die() and similar here. (4) asm/exec.h Moved arch_align_stack() here. (5) asm/elf.h Moved AT_VECTOR_SIZE_ARCH here. (6) asm/switch_to.h Moved switch_to() here.
Unified · Split
| @@ -40,6 +40,7 @@ extern void gru_wait_abort_proc(void *cb); · 39 unmodified lines | ||
| 40 | 40 | *((volatile unsigned long *)(p)) = v; /* force st.rel */ \ |
| 41 | 41 | } while (0) |
| 42 | 42 | #elif defined(CONFIG_X86_64) |
| 43 | +#include <asm/cacheflush.h> | |
| 43 | 44 | #define __flush_cache(p) clflush(p) |
| 44 | 45 | #define gru_ordered_store_ulong(p, v) \ |
| 45 | 46 | do { \ |
| @@ -26,6 +26,8 @@ · 25 unmodified lines | ||
| 26 | 26 | #ifndef _BC_DTS_DEFS_H_ |
| 27 | 27 | #define _BC_DTS_DEFS_H_ |
| 28 | 28 | |
| 29 | +#include <linux/types.h> | |
| 30 | + | |
| 29 | 31 | /* BIT Mask */ |
| 30 | 32 | #define BC_BIT(_x) (1 << (_x)) |
| 31 | 33 | |
| @@ -35,6 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | #include <asm/uaccess.h> |
| 36 | 36 | #include <asm/param.h> |
| 37 | 37 | #include <asm/page.h> |
| 38 | +#include <asm/exec.h> | |
| 38 | 39 | |
| 39 | 40 | static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs); |
| 40 | 41 | static int load_elf_library(struct file *); |
| @@ -39,6 +39,7 @@ · 38 unmodified lines | ||
| 39 | 39 | #include <asm/uaccess.h> |
| 40 | 40 | #include <asm/param.h> |
| 41 | 41 | #include <asm/pgalloc.h> |
| 42 | +#include <asm/exec.h> | |
| 42 | 43 | |
| 43 | 44 | typedef char *elf_caddr_t; |
| 44 | 45 | |
| @@ -59,6 +59,7 @@ · 58 unmodified lines | ||
| 59 | 59 | #include <asm/uaccess.h> |
| 60 | 60 | #include <asm/mmu_context.h> |
| 61 | 61 | #include <asm/tlb.h> |
| 62 | +#include <asm/exec.h> | |
| 62 | 63 | |
| 63 | 64 | #include <trace/events/task.h> |
| 64 | 65 | #include "internal.h" |
| @@ -2,7 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | #define _ASM_GENERIC_BITOPS_ATOMIC_H_ |
| 3 | 3 | |
| 4 | 4 | #include <asm/types.h> |
| 5 | −#include <asm/system.h> | |
| 5 | +#include <linux/irqflags.h> | |
| 6 | 6 | |
| 7 | 7 | #ifdef CONFIG_SMP |
| 8 | 8 | #include <asm/spinlock.h> |
| @@ -56,8 +56,7 @@ · 55 unmodified lines | ||
| 56 | 56 | */ |
| 57 | 57 | |
| 58 | 58 | #include <linux/kernel.h> |
| 59 | −#include <asm/system.h> | |
| 60 | −#include <asm/processor.h> | |
| 59 | +#include <asm/cmpxchg.h> | |
| 61 | 60 | |
| 62 | 61 | struct llist_head { |
| 63 | 62 | struct llist_node *first; |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <asm/unaligned.h> |
| 32 | 32 | #include <asm/system.h> |
| 33 | 33 | #include <asm/io.h> |
| 34 | +#include <asm/barrier.h> | |
| 34 | 35 | |
| 35 | 36 | #ifdef CONFIG_MTD_MAP_BANK_WIDTH_1 |
| 36 | 37 | #define map_bankwidth(map) 1 |
| @@ -55,6 +55,7 @@ · 54 unmodified lines | ||
| 55 | 55 | #include <linux/kernel.h> |
| 56 | 56 | #include <linux/stringify.h> |
| 57 | 57 | #include <linux/bottom_half.h> |
| 58 | +#include <asm/barrier.h> | |
| 58 | 59 | |
| 59 | 60 | #include <asm/system.h> |
| 60 | 61 | |
| @@ -73,6 +73,7 @@ · 72 unmodified lines | ||
| 73 | 73 | #include <linux/init_task.h> |
| 74 | 74 | #include <linux/binfmts.h> |
| 75 | 75 | |
| 76 | +#include <asm/switch_to.h> | |
| 76 | 77 | #include <asm/tlb.h> |
| 77 | 78 | #include <asm/irq_regs.h> |
| 78 | 79 | #include <asm/mutex.h> |