[PATCH 547] M68k: Add missing pieces of thread info TIF_MEMDIE support

[Geert Uytterhoeven]

M68k: Add missing pieces of thread info TIF_MEMDIE support (introduced in
2.6.11-rc3)

Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

--- linux-2.6.12-rc1/include/asm-m68k/processor.h	2004-04-30 17:54:35.000000000 +0200
+++ linux-m68k-2.6.12-rc1/include/asm-m68k/processor.h	2005-03-20 11:57:32.743537879 +0100
@@ -63,7 +63,8 @@ struct task_work {
 	char          need_resched;
 	unsigned char delayed_trace;	/* single step a syscall */
 	unsigned char syscall_trace;	/* count of syscall interceptors */
-	unsigned char pad[3];
+	unsigned char memdie;		/* task was selected to be killed */
+	unsigned char pad[2];
 };
 
 struct thread_struct {
--- linux-2.6.12-rc1/include/asm-m68k/thread_info.h	2005-02-03 15:05:36.000000000 +0100
+++ linux-m68k-2.6.12-rc1/include/asm-m68k/thread_info.h	2005-02-04 13:20:27.000000000 +0100
@@ -70,6 +70,9 @@ extern int thread_flag_fixme(void);
 	case TIF_SYSCALL_TRACE:				\
 		tsk->thread.work.syscall_trace = val;	\
 		break;					\
+	case TIF_MEMDIE:				\
+		tsk->thread.work.memdie = val;		\
+		break;					\
 	default:					\
 		thread_flag_fixme();			\
 	}						\
@@ -87,6 +90,9 @@ extern int thread_flag_fixme(void);
 	case TIF_SYSCALL_TRACE:				\
 		___res = tsk->thread.work.syscall_trace;\
 		break;					\
+	case TIF_MEMDIE:				\
+		___res = tsk->thread.work.memdie;\
+		break;					\
 	default:					\
 		___res = thread_flag_fixme();		\
 	}						\

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/