Skip to content

Commit

Permalink
[PATCH] sh: PREEMPT_ACTIVE fix
Browse files Browse the repository at this point in the history
Port Paulus's ppc64 fix to sh:

  When the generic IRQ stuff went in, it seems that HARDIRQ_BITS got bumped
  from 9 (for ppc64) up to 12.  Consequently, the PREEMPT_ACTIVE bit is now
  within HARDIRQ_MASK, and I get in_interrupt() falsely returning true when
  PREEMPT_ACTIVE is set, and thus a BUG_ON tripping in arch/ppc64/mm/tlb.c.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Paul Mundt authored and Linus Torvalds committed May 28, 2005
1 parent affac4b commit 37053cc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/asm-sh/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct thread_info {

#endif

#define PREEMPT_ACTIVE 0x4000000
#define PREEMPT_ACTIVE 0x10000000

/*
* macros/functions for gaining access to the thread information structure
Expand Down
2 changes: 1 addition & 1 deletion include/asm-sh64/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static inline struct thread_info *current_thread_info(void)

#define THREAD_SIZE 8192

#define PREEMPT_ACTIVE 0x4000000
#define PREEMPT_ACTIVE 0x10000000

/* thread information flags */
#define TIF_SYSCALL_TRACE 0 /* syscall trace active */
Expand Down

0 comments on commit 37053cc

Please sign in to comment.