diff options
author | Andrey Konovalov <andreyknvl@google.com> | 2015-11-05 21:51:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 22:34:48 -0500 |
commit | c63f06dd15797736c31dc86e6392811d0bac34a1 (patch) | |
tree | 39d7ce6b47f6620ceeaf5d259d92b105154182de | |
parent | 0295fd5d570626817d10deadf5a2ad5e49c36a1d (diff) |
kasan: move KASAN_SANITIZE in arch/x86/boot/Makefile
Move KASAN_SANITIZE in arch/x86/boot/Makefile above the comment
related to SVGA_MODE, since the comment refers to 'the next line'.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Konstantin Serebryany <kcc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/x86/boot/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 0d553e54171b..2ee62dba0373 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile | |||
@@ -9,13 +9,13 @@ | |||
9 | # Changed by many, many contributors over the years. | 9 | # Changed by many, many contributors over the years. |
10 | # | 10 | # |
11 | 11 | ||
12 | KASAN_SANITIZE := n | ||
13 | |||
12 | # If you want to preset the SVGA mode, uncomment the next line and | 14 | # If you want to preset the SVGA mode, uncomment the next line and |
13 | # set SVGA_MODE to whatever number you want. | 15 | # set SVGA_MODE to whatever number you want. |
14 | # Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode. | 16 | # Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode. |
15 | # The number is the same as you would ordinarily press at bootup. | 17 | # The number is the same as you would ordinarily press at bootup. |
16 | 18 | ||
17 | KASAN_SANITIZE := n | ||
18 | |||
19 | SVGA_MODE := -DSVGA_MODE=NORMAL_VGA | 19 | SVGA_MODE := -DSVGA_MODE=NORMAL_VGA |
20 | 20 | ||
21 | targets := vmlinux.bin setup.bin setup.elf bzImage | 21 | targets := vmlinux.bin setup.bin setup.elf bzImage |