diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
| commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
| tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /arch/x86/boot/Makefile | |
| parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
| parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'arch/x86/boot/Makefile')
| -rw-r--r-- | arch/x86/boot/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 3db07f30636f..ff6dc20d4b1b 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -9,6 +9,8 @@ # Changed by many, many contributors over the years. # +KASAN_SANITIZE := n + # If you want to preset the SVGA mode, uncomment the next line and # set SVGA_MODE to whatever number you want. # Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode. |