diff options
author | Rob Herring <robh@kernel.org> | 2018-03-08 09:21:07 -0600 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-03-08 09:21:07 -0600 |
commit | c679fa6e3aaa5c58fc514b5b88cfa82774b8d390 (patch) | |
tree | 0c10b339368bd1795152a66a4e245e6f654fb3ec /arch/x86/lib/error-inject.c | |
parent | bdb7013df910681f84eff27b07791d4c160cb76f (diff) | |
parent | 4fd98e374fd377ae0458a9dc44aa779cf9631ddd (diff) |
Merge branch 'dtc-update' into dt/next
Diffstat (limited to 'arch/x86/lib/error-inject.c')
-rw-r--r-- | arch/x86/lib/error-inject.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c index 7b881d03d0dd..3cdf06128d13 100644 --- a/arch/x86/lib/error-inject.c +++ b/arch/x86/lib/error-inject.c @@ -7,6 +7,7 @@ asmlinkage void just_return_func(void); asm( ".type just_return_func, @function\n" + ".globl just_return_func\n" "just_return_func:\n" " ret\n" ".size just_return_func, .-just_return_func\n" |