diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-04-26 16:44:31 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-04-26 16:44:31 +0300 |
| commit | 3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24 (patch) | |
| tree | debfb201936d9f81837f74ac6f3cb763ea428b72 /arch/powerpc/include/asm/setup.h | |
| parent | f08699ec5bd924be4c9572e21fd0a806d3fb34c2 (diff) | |
| parent | 19df0cfa258cd42f7f106f6085f1e625f26283db (diff) | |
Merge drm/drm-next into drm-intel-next
Need to bring commit d8bb92e70a43 ("drm/dp: Factor out a function to
probe a DPCD address") back as a dependency to further work in
drm-intel-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'arch/powerpc/include/asm/setup.h')
| -rw-r--r-- | arch/powerpc/include/asm/setup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h index 049ca26893e6..8fa37ef5da4d 100644 --- a/arch/powerpc/include/asm/setup.h +++ b/arch/powerpc/include/asm/setup.h @@ -28,11 +28,13 @@ void setup_panic(void); #define ARCH_PANIC_TIMEOUT 180 #ifdef CONFIG_PPC_PSERIES +extern bool pseries_reloc_on_exception(void); extern bool pseries_enable_reloc_on_exc(void); extern void pseries_disable_reloc_on_exc(void); extern void pseries_big_endian_exceptions(void); void __init pseries_little_endian_exceptions(void); #else +static inline bool pseries_reloc_on_exception(void) { return false; } static inline bool pseries_enable_reloc_on_exc(void) { return false; } static inline void pseries_disable_reloc_on_exc(void) {} static inline void pseries_big_endian_exceptions(void) {} |