diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-07 08:12:40 +0100 |
| commit | 05bc268ec5c5bcf1eca52f2aaa9ebdcaf2edee25 (patch) | |
| tree | a5131c0eb8e7e59c00e0c941b3830814cb23040b /arch/arm/include | |
| parent | b9dcb4ae01b034da77ba56b1886c8d04971f5cec (diff) | |
| parent | 1ef8adb77b36153b996c09294310d1b662291ba5 (diff) | |
| download | barebox-05bc268ec5c5bcf1eca52f2aaa9ebdcaf2edee25.tar.gz barebox-05bc268ec5c5bcf1eca52f2aaa9ebdcaf2edee25.tar.xz | |
Merge branch 'for-next/missing-prototypes'
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmu.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/ptrace.h | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index c0c749ae34..e065b479e3 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -85,6 +85,8 @@ static inline void boarddata_create(void *adr, u32 machine) u32 barebox_arm_machine(void); +unsigned long arm_mem_ramoops_get(void); + struct barebox_arm_boarddata_compressed_dtb { #define BAREBOX_ARM_BOARDDATA_COMPRESSED_DTB_MAGIC 0x7b66bcbd u32 magic; diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h index 99833ac5b4..417808bfcc 100644 --- a/arch/arm/include/asm/mmu.h +++ b/arch/arm/include/asm/mmu.h @@ -56,5 +56,6 @@ void __dma_inv_range(unsigned long, unsigned long); void mmu_early_enable(unsigned long membase, unsigned long memsize, unsigned long ttb); +void mmu_early_disable(void); #endif /* __ASM_MMU_H */ diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index 7fbd8d9b6f..042e0cef70 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h @@ -23,6 +23,8 @@ struct pt_regs { unsigned long regs[31]; }; +void show_regs(struct pt_regs *); + #endif /* __ASSEMBLY__ */ #else /* CONFIG_CPU_64 */ |