On Mon, Mar 20, 2017 at 8:00 AM, Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > On Mon, 20 Mar 2017, Kyle Huey wrote: >> --- a/arch/x86/include/uapi/asm/prctl.h >> +++ b/arch/x86/include/uapi/asm/prctl.h >> @@ -6,8 +6,17 @@ >> #define ARCH_GET_FS 0x1003 >> #define ARCH_GET_GS 0x1004 >> >> +#define ARCH_GET_CPUID 0x1005 >> +#define ARCH_SET_CPUID 0x1006 >> + >> #define ARCH_MAP_VDSO_X32 0x2001 >> #define ARCH_MAP_VDSO_32 0x2002 >> #define ARCH_MAP_VDSO_64 0x2003 >> >> +#ifdef CONFIG_CHECKPOINT_RESTORE >> +# define ARCH_MAP_VDSO_X32 0x2001 >> +# define ARCH_MAP_VDSO_32 0x2002 >> +# define ARCH_MAP_VDSO_64 0x2003 >> +#endif > > That hunk is bogus in two aspects: > - It's just a copy of the above wrapped in a ifdef > > - The ifdef is broken, because the UAPI headers do not know about > that. > > I dropped it. Looks like that was introduced when I rebased over a01aa6c9f40f for v14 and I didn't catch it manually. Thanks for finding and fixing that. - Kyle
