From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 3 Dec 2018 09:47:53 +0000 (+0100)
Subject: Merge tag 'v4.20-rc5' into x86/cleanups, to sync up the tree
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=df60673198ae678f68af54873b8904ba93fe13a0;p=linux.git

Merge tag 'v4.20-rc5' into x86/cleanups, to sync up the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

df60673198ae678f68af54873b8904ba93fe13a0
diff --cc arch/x86/kernel/process.c
index b7cb5348f37f1,7d31192296a87..90ae0ca510837
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -41,8 -39,9 +41,10 @@@
  #include <asm/desc.h>
  #include <asm/prctl.h>
  #include <asm/spec-ctrl.h>
 +#include <asm/proto.h>
  
+ #include "process.h"
+ 
  /*
   * per-CPU TSS segments. Threads are completely 'soft' on Linux,
   * no more per-task TSS's. The TSS size is kept cacheline-aligned