diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-12 07:53:05 +0200 |
| commit | 45a7dc7f8dfa5acc8789203800f2234ad71dedf4 (patch) | |
| tree | 2793330e1c48ff4eabbf9b99031eac05d0c6f00b /include | |
| parent | aa63596f6189852e2b61f8dc0f6dc2b103e5ef16 (diff) | |
| parent | 22f38edf93da46f5149849666df64beeb5d973fe (diff) | |
| download | barebox-45a7dc7f8dfa5acc8789203800f2234ad71dedf4.tar.gz barebox-45a7dc7f8dfa5acc8789203800f2234ad71dedf4.tar.xz | |
Merge branch 'for-next/fsanitize'
Diffstat (limited to 'include')
| -rw-r--r-- | include/abort.h | 4 | ||||
| -rw-r--r-- | include/common.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/abort.h b/include/abort.h index 326467c25f..89ee549e34 100644 --- a/include/abort.h +++ b/include/abort.h @@ -1,9 +1,7 @@ #ifndef __ABORT_H #define __ABORT_H -#include <asm/barebox.h> - -#if defined ARCH_HAS_DATA_ABORT_MASK && !defined __PBL__ +#if defined CONFIG_ARCH_HAS_DATA_ABORT_MASK && !defined __PBL__ /* * data_abort_mask - ignore data aborts diff --git a/include/common.h b/include/common.h index 8cc8e14fb7..6563068467 100644 --- a/include/common.h +++ b/include/common.h @@ -51,8 +51,6 @@ #error "None of __LITTLE_ENDIAN and __BIG_ENDIAN are defined" #endif -#include <asm/barebox.h> /* boot information for Linux kernel */ - /* * Function Prototypes */ @@ -72,7 +70,7 @@ int ctrlc(void); int arch_ctrlc(void); void ctrlc_handled(void); -#ifdef ARCH_HAS_STACK_DUMP +#ifdef CONFIG_ARCH_HAS_STACK_DUMP void dump_stack(void); #else static inline void dump_stack(void) |