From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catalin Marinas Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree Date: Fri, 23 May 2014 09:41:18 +0100 Message-ID: <20140523084118.GA9252@arm.com> References: <20140523162844.05e6ac65@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from fw-tnat.austin.arm.com ([217.140.110.23]:17939 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751472AbaEWIle (ORCPT ); Fri, 23 May 2014 04:41:34 -0400 Content-Disposition: inline In-Reply-To: <20140523162844.05e6ac65@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , AKASHI Takahiro On Fri, May 23, 2014 at 07:28:44AM +0100, Stephen Rothwell wrote: > diff --cc arch/arm64/include/asm/thread_info.h > index 9c086c63f911,7b8e3a2a00fb..000000000000 > --- a/arch/arm64/include/asm/thread_info.h > +++ b/arch/arm64/include/asm/thread_info.h > @@@ -103,12 -99,7 +102,11 @@@ static inline struct thread_info *curre > #define TIF_SIGPENDING 0 > #define TIF_NEED_RESCHED 1 > #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */ > +#define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */ > #define TIF_SYSCALL_TRACE 8 > +#define TIF_SYSCALL_AUDIT 9 > +#define TIF_SYSCALL_TRACEPOINT 10 > +#define TIF_SECCOMP 11 > - #define TIF_POLLING_NRFLAG 16 > #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ > #define TIF_FREEZE 19 > #define TIF_RESTORE_SIGMASK 20 It looks fine, thanks. -- Catalin