patch-2.3.39 linux/include/linux/sched.h

Next file: linux/include/linux/sem.h
Previous file: linux/include/linux/qnxtypes.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.38/linux/include/linux/sched.h linux/include/linux/sched.h
@@ -274,17 +274,19 @@
 	struct exec_domain *exec_domain;
 	volatile long need_resched;
 
-/* various fields */
+	cycles_t avg_slice;
+	int lock_depth;		/* Lock depth. We can context switch in and out of holding a syscall kernel lock... */	
+/* begin intel cache line */
 	long counter;
 	long priority;
-	cycles_t avg_slice;
-/* SMP and runqueue state */
+	unsigned long policy;
+/* memory management info */
+	struct mm_struct *mm, *active_mm;
 	int has_cpu;
 	int processor;
-	int last_processor;
-	int lock_depth;		/* Lock depth. We can context switch in and out of holding a syscall kernel lock... */	
-	struct task_struct *next_task, *prev_task;
 	struct list_head run_list;
+	struct task_struct *next_task, *prev_task;
+	int last_processor;
 
 /* task state */
 	struct linux_binfmt *binfmt;
@@ -313,7 +315,7 @@
 
 	wait_queue_head_t wait_chldexit;	/* for wait4() */
 	struct semaphore *vfork_sem;		/* for vfork() */
-	unsigned long policy, rt_priority;
+	unsigned long rt_priority;
 	unsigned long it_real_value, it_prof_value, it_virt_value;
 	unsigned long it_real_incr, it_prof_incr, it_virt_incr;
 	struct timer_list real_timer;
@@ -346,10 +348,6 @@
 	struct fs_struct *fs;
 /* open file information */
 	struct files_struct *files;
-
-/* memory management info */
-	struct mm_struct *mm, *active_mm;
-
 /* signal handlers */
 	spinlock_t sigmask_lock;	/* Protects signal and blocked */
 	struct signal_struct *sig;
@@ -398,16 +396,20 @@
  */
 #define INIT_TASK(name) \
 /* state etc */	{ 0,0,0,KERNEL_DS,&default_exec_domain,0, \
-/* counter */	DEF_PRIORITY,DEF_PRIORITY,0, \
-/* SMP */	0,0,0,-1, \
-/* schedlink */	&init_task,&init_task, LIST_HEAD_INIT(init_task.run_list), \
+/* avg_slice */	0, -1, \
+/* counter */	DEF_PRIORITY,DEF_PRIORITY,SCHED_OTHER, \
+/* mm */	NULL, &init_mm, \
+/* has_cpu */	0,0, \
+/* run_list */	LIST_HEAD_INIT(init_task.run_list), \
+/* next_task */	&init_task,&init_task, \
+/* last_proc */	0, \
 /* binfmt */	NULL, \
 /* ec,brk... */	0,0,0,0,0,0, \
 /* pid etc.. */	0,0,0,0,0, \
 /* proc links*/ &init_task,&init_task,NULL,NULL,NULL, \
 /* pidhash */	NULL, NULL, \
 /* chld wait */	__WAIT_QUEUE_HEAD_INITIALIZER(name.wait_chldexit), NULL, \
-/* timeout */	SCHED_OTHER,0,0,0,0,0,0,0, \
+/* timeout */	0,0,0,0,0,0,0, \
 /* timer */	{ NULL, NULL, 0, 0, it_real_fn }, \
 /* utime */	{0,0,0,0},0, \
 /* per CPU times */ {0, }, {0, }, \
@@ -426,7 +428,6 @@
 /* thread */	INIT_THREAD, \
 /* fs */	&init_fs, \
 /* files */	&init_files, \
-/* mm */	NULL, &init_mm, \
 /* signals */	SPIN_LOCK_UNLOCKED, &init_signals, {{0}}, {{0}}, NULL, &init_task.sigqueue, 0, 0, \
 /* exec cts */	0,0, \
 /* exit_sem */	__MUTEX_INITIALIZER(name.exit_sem),	\
@@ -508,10 +509,10 @@
 extern void FASTCALL(wake_up_process(struct task_struct * tsk));
 
 #define wake_up(x)			__wake_up((x),TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE | TASK_EXCLUSIVE)
-#define wake_up_all(x)			__wake_up_all((x),TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE)
+#define wake_up_all(x)			__wake_up((x),TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE)
 #define wake_up_sync(x)			__wake_up_sync((x),TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE | TASK_EXCLUSIVE)
 #define wake_up_interruptible(x)	__wake_up((x),TASK_INTERRUPTIBLE | TASK_EXCLUSIVE)
-#define wake_up_interruptible_all(x)	__wake_up_all((x),TASK_INTERRUPTIBLE)
+#define wake_up_interruptible_all(x)	__wake_up((x),TASK_INTERRUPTIBLE)
 #define wake_up_interruptible_sync(x)	__wake_up_sync((x),TASK_INTERRUPTIBLE | TASK_EXCLUSIVE)
 
 extern int in_group_p(gid_t);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)