aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 12:20:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 12:20:59 -0400
commitf39d01be4c59a61a08d0cb53f615e7016b85d339 (patch)
tree6777590e3ff2ddf4df1d38444ba7d692cd463b7b /arch/mips
parent54291263519ac2c9bdda68b23b02fef3808deed4 (diff)
parent7db82437cfcac4bdfe79a6323eb554fdfa271623 (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/mips')
-rw-r--r--arch/mips/include/asm/thread_info.h2
-rw-r--r--arch/mips/sibyte/bcm1480/irq.c2
-rw-r--r--arch/mips/sibyte/sb1250/irq.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index 845da2107ed1..2376f2e06e47 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -112,7 +112,7 @@ register struct thread_info *__current_thread_info __asm__("$28");
112#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ 112#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
113#define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ 113#define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
114#define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ 114#define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */
115#define TIF_MEMDIE 18 115#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
116#define TIF_FREEZE 19 116#define TIF_FREEZE 19
117#define TIF_FIXADE 20 /* Fix address errors in software */ 117#define TIF_FIXADE 20 /* Fix address errors in software */
118#define TIF_LOGADE 21 /* Log address errors to syslog */ 118#define TIF_LOGADE 21 /* Log address errors to syslog */
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 7a8b0a8b643a..044bbe462c2c 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -253,7 +253,7 @@ void __init init_bcm1480_irqs(void)
253 * On the second cpu, everything is set to IP5, which is 253 * On the second cpu, everything is set to IP5, which is
254 * ignored, EXCEPT the mailbox interrupt. That one is 254 * ignored, EXCEPT the mailbox interrupt. That one is
255 * set to IP[2] so it is handled. This is needed so we 255 * set to IP[2] so it is handled. This is needed so we
256 * can do cross-cpu function calls, as requred by SMP 256 * can do cross-cpu function calls, as required by SMP
257 */ 257 */
258 258
259#define IMR_IP2_VAL K_BCM1480_INT_MAP_I0 259#define IMR_IP2_VAL K_BCM1480_INT_MAP_I0
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 62371f772553..12ac04a658ee 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -236,7 +236,7 @@ void __init init_sb1250_irqs(void)
236 * On the second cpu, everything is set to IP5, which is 236 * On the second cpu, everything is set to IP5, which is
237 * ignored, EXCEPT the mailbox interrupt. That one is 237 * ignored, EXCEPT the mailbox interrupt. That one is
238 * set to IP[2] so it is handled. This is needed so we 238 * set to IP[2] so it is handled. This is needed so we
239 * can do cross-cpu function calls, as requred by SMP 239 * can do cross-cpu function calls, as required by SMP
240 */ 240 */
241 241
242#define IMR_IP2_VAL K_INT_MAP_I0 242#define IMR_IP2_VAL K_INT_MAP_I0