Log message:
Fix merge error
Modified files:
linux/include/linux:
sched.h task_struct.h
Index: linux/include/linux/sched.h
Stats: 4 deletions
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/include/linux/sched%2eh.diff?r1=1.81&r2=1.82
========================================================================
--- sched.h 2 Mar 2005 23:48:02 -0000 1.81
+++ sched.h 20 Mar 2005 12:45:57 -0000 1.82
@@ -19,7 +19,6 @@
#include <asm/page.h>
#include <asm/ptrace.h>
#include <asm/mmu.h>
-#include <asm/cputime.h>
#include <linux/smp.h>
#include <linux/sem.h>
@@ -120,9 +119,6 @@
#define set_current_state(state_value) \
set_mb(current->state, (state_value))
-/* Task command name length */
-#define TASK_COMM_LEN 16
-
/*
* Scheduling policies
*/
Index: linux/include/linux/task_struct.h
Stats: 4 insertions
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/include/linux/task_struct%2eh.diff?r1=1.35&r2=1.36
========================================================================
--- task_struct.h 2 Mar 2005 23:48:02 -0000 1.35
+++ task_struct.h 20 Mar 2005 12:45:57 -0000 1.36
@@ -13,6 +13,7 @@
#include <linux/wait.h>
#include <asm/atomic.h>
#include <asm/param.h>
+#include <asm/cputime.h>
typedef struct prio_array prio_array_t;
struct backing_dev_info;
@@ -54,6 +55,9 @@
((gi)->blocks[(i)/NGROUPS_PER_BLOCK][(i)%NGROUPS_PER_BLOCK])
+/* Task command name length */
+#define TASK_COMM_LEN 16
+
struct task_struct {
volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
//struct thread_info *thread_info;
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit"
in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
