diff --git a/[refs] b/[refs] index 4c2c33ae06a1..1604f307bd61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f0cb3e01ec41b35b8452856f2ddd7a9f36fb80b +refs/heads/master: 95d3a8cd1596b7d34b873d1fa5a70bbc656f5410 diff --git a/trunk/arch/microblaze/include/asm/thread_info.h b/trunk/arch/microblaze/include/asm/thread_info.h index 8a8e9fc6e0c0..21e7997d08be 100644 --- a/trunk/arch/microblaze/include/asm/thread_info.h +++ b/trunk/arch/microblaze/include/asm/thread_info.h @@ -133,14 +133,14 @@ static inline struct thread_info *current_thread_info(void) /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_POLLING_NRFLAG 16 -#define _TIF_SYSCALL_TRACE (1<