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

Commit 40071626 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq cleanups from Ingo Molnar:
 "This is a multi-arch cleanup series from Thomas Gleixner, which we
  kept to near the end of the merge window, to not interfere with
  architecture updates.

  This series (motivated by the -rt kernel) unifies more aspects of IRQ
  handling and generalizes PREEMPT_ACTIVE"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  preempt: Make PREEMPT_ACTIVE generic
  sparc: Use preempt_schedule_irq
  ia64: Use preempt_schedule_irq
  m32r: Use preempt_schedule_irq
  hardirq: Make hardirq bits generic
  m68k: Simplify low level interrupt handling code
  genirq: Prevent spurious detection for unconditionally polled interrupts
parents 801a7605 00d1a39e

arch/alpha/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define THREAD_SIZE_ORDER 1

#define THREAD_SIZE (2*PAGE_SIZE)



#define PREEMPT_ACTIVE		0x40000000



/*

 * Thread information flags:

 * - these are process state flags and used from assembly

arch/arc/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void) 


#endif /* !__ASSEMBLY__ */



#define PREEMPT_ACTIVE      0x10000000



/*

 * thread information flags

 * - these are process state flags that various assembly files may need to

arch/arm/include/asm/thread_info.h

+0 −6
Original line number Diff line number Diff line
@@ -140,12 +140,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, 
				    struct user_vfp_exc __user *);

#endif



/*

 * We use bit 30 of the preempt_count to indicate that kernel

 * preemption is occurring.  See <asm/hardirq.h>.

 */

#define PREEMPT_ACTIVE	0x40000000



/*

 * thread information flags:

 *  TIF_SYSCALL_TRACE	- syscall trace active

arch/arm64/include/asm/thread_info.h

+0 −6
Original line number Diff line number Diff line
@@ -88,12 +88,6 @@ static inline struct thread_info *current_thread_info(void) 


#endif



/*

 * We use bit 30 of the preempt_count to indicate that kernel

 * preemption is occurring.  See <asm/hardirq.h>.

 */

#define PREEMPT_ACTIVE	0x40000000



/*

 * thread information flags:

 *  TIF_SYSCALL_TRACE	- syscall trace active

arch/avr32/include/asm/thread_info.h

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ static inline struct thread_info *current_thread_info(void) 


#endif /* !__ASSEMBLY__ */



#define PREEMPT_ACTIVE		0x40000000



/*

 * Thread information flags

 * - these are process state flags that various assembly files may need to access