diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-08-23 23:26:06 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-23 23:26:06 +0200 |
| commit | fdebffeba8b877368ddcc139c26278c1c97931a4 (patch) | |
| tree | 5ebf85a3e26d55ea388aa7a8608222205a4d59ba /arch/x86/include/asm/linkage.h | |
| parent | Merge tag 'amd-drm-next-6.6-2023-08-18' of https://gitlab.freedesktop.org/agd... (diff) | |
| parent | Linux 6.5-rc7 (diff) | |
| download | linux-fdebffeba8b877368ddcc139c26278c1c97931a4.tar.xz linux-fdebffeba8b877368ddcc139c26278c1c97931a4.zip | |
BackMerge tag 'v6.5-rc7' into drm-next
Linux 6.5-rc7
This is needed for the CI stuff and the msm pull has fixes in it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/linkage.h')
| -rw-r--r-- | arch/x86/include/asm/linkage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index 0953aa32a324..97a3de7892d3 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -21,7 +21,7 @@ #define FUNCTION_PADDING #endif -#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BULID_VDSO) +#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) # define __FUNC_ALIGN __ALIGN; FUNCTION_PADDING #else # define __FUNC_ALIGN __ALIGN |