Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aca8637 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by android-build-merger
Browse files

x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y 

am: 24ba2842

Change-Id: Ice61360ad131e124ba97e52e456a79b9cb02d350
parents 722bffc9 24ba2842

arch/x86/kernel/head64.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *  Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE

 */



#define DISABLE_BRANCH_PROFILING

#include <linux/init.h>

#include <linux/linkage.h>

#include <linux/types.h>

arch/x86/mm/kasan_init_64.c

+1 −0
Original line number Diff line number Diff line 
#define DISABLE_BRANCH_PROFILING

#define pr_fmt(fmt) "kasan: " fmt

#include <linux/bootmem.h>

#include <linux/kasan.h>