diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
| commit | f39d01be4c59a61a08d0cb53f615e7016b85d339 (patch) | |
| tree | 6777590e3ff2ddf4df1d38444ba7d692cd463b7b /arch/m68k | |
| parent | 54291263519ac2c9bdda68b23b02fef3808deed4 (diff) | |
| parent | 7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/thread_info_mm.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/thread_info_no.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h index 67266c683453..3bf31dc51b12 100644 --- a/arch/m68k/include/asm/thread_info_mm.h +++ b/arch/m68k/include/asm/thread_info_mm.h | |||
| @@ -65,7 +65,7 @@ struct thread_info { | |||
| 65 | #define TIF_NEED_RESCHED 7 /* rescheduling necessary */ | 65 | #define TIF_NEED_RESCHED 7 /* rescheduling necessary */ |
| 66 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ | 66 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ |
| 67 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ | 67 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ |
| 68 | #define TIF_MEMDIE 16 | 68 | #define TIF_MEMDIE 16 /* is terminating due to OOM killer */ |
| 69 | #define TIF_FREEZE 17 /* thread is freezing for suspend */ | 69 | #define TIF_FREEZE 17 /* thread is freezing for suspend */ |
| 70 | 70 | ||
| 71 | #endif /* _ASM_M68K_THREAD_INFO_H */ | 71 | #endif /* _ASM_M68K_THREAD_INFO_H */ |
diff --git a/arch/m68k/include/asm/thread_info_no.h b/arch/m68k/include/asm/thread_info_no.h index 884776f686ca..51f354b672e6 100644 --- a/arch/m68k/include/asm/thread_info_no.h +++ b/arch/m68k/include/asm/thread_info_no.h | |||
| @@ -85,7 +85,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 85 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 85 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 86 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | 86 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling |
| 87 | TIF_NEED_RESCHED */ | 87 | TIF_NEED_RESCHED */ |
| 88 | #define TIF_MEMDIE 4 | 88 | #define TIF_MEMDIE 4 /* is terminating due to OOM killer */ |
| 89 | #define TIF_FREEZE 16 /* is freezing for suspend */ | 89 | #define TIF_FREEZE 16 /* is freezing for suspend */ |
| 90 | 90 | ||
| 91 | /* as above, but as bit values */ | 91 | /* as above, but as bit values */ |