Linux 2.5.23-dj1

diff -Nru a/include/linux/sched.h b/include/linux/sched.h
@@ -863,6 +863,34 @@
 		clear_thread_flag(TIF_SIGPENDING);
 }
 
+/*
+ * Wrappers for p->thread_info->cpu access. No-op on UP.
+ */
+#ifdef CONFIG_SMP
+
+static inline unsigned int task_cpu(struct task_struct *p)
+{
+	return p->thread_info->cpu;
+}
+
+static inline unsigned int set_task_cpu(struct task_struct *p, unsigned int cpu)
+{
+	p->thread_info->cpu = cpu;
+}
+
+#else
+
+static inline unsigned int task_cpu(struct task_struct *p)
+{
+	return 0;
+}
+
+static inline unsigned int set_task_cpu(struct task_struct *p, unsigned int cpu)
+{
+}
+
+#endif /* CONFIG_SMP */
+
 #endif /* __KERNEL__ */
 
 #endif

151 lines not on this page · raw message

diff -urN linux-2.5.23-virgin/include/linux/sched.h linux-2.5.23-wli/include/linux/sched.h
@@ -144,6 +144,7 @@
 typedef struct task_struct task_t;
 
 extern void sched_init(void);
+extern void pidhash_init(void);
 extern void init_idle(task_t *idle, int cpu);
 extern void show_state(void);
 extern void cpu_init (void);

diff -urN linux-2.5.23-virgin/init/main.c linux-2.5.23-wli/init/main.c
@@ -347,6 +347,7 @@
 	trap_init();
 	init_IRQ();
 	sched_init();
+	pidhash_init();
 	softirq_init();
 	time_init();
 

diff -urN linux-2.5.23-virgin/kernel/fork.c linux-2.5.23-wli/kernel/fork.c
@@ -27,7 +27,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/jiffies.h>
-
+#include <linux/bootmem.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>

@@ -49,6 +49,25 @@
 
 list_t *pidhash;
 unsigned long pidhash_size;
+
+void __init pidhash_init(void)
+{
+	int i, size = PAGE_SIZE*sizeof(list_t);
+
+	do {
+		pidhash = (list_t *)alloc_bootmem(size);
+		if (!pidhash)
+			size >>= 1;
+	} while (!pidhash && size >= sizeof(list_t));
+
+	if (!pidhash)
+		panic("Failed to allocated pid hash table!\n");
+
+	pidhash_size = size/sizeof(list_t);
+
+	for (i = 0; i < pidhash_size; ++i)
+		INIT_LIST_HEAD(&pidhash[i]);
+}
 
 rwlock_t tasklist_lock __cacheline_aligned = RW_LOCK_UNLOCKED;  /* outer */
 

diff -urN linux-2.5.23-virgin/kernel/sched.c linux-2.5.23-wli/kernel/sched.c
@@ -1662,21 +1662,7 @@
 void __init sched_init(void)
 {
 	runqueue_t *rq;
-	int i, j, k, size = PAGE_SIZE*sizeof(list_t);
-
-	do {
-		pidhash = (list_t *)alloc_bootmem(size);
-		if (!pidhash)
-			size >>= 1;
-	} while (!pidhash && size >= sizeof(list_t));
-
-	if (!pidhash)
-		panic("Failed to allocated pid hash table!\n");
-
-	pidhash_size = size/sizeof(list_t);
-
-	for (i = 0; i < pidhash_size; ++i)
-		INIT_LIST_HEAD(&pidhash[i]);
+	int i, j, k;
 
 	for (i = 0; i < NR_CPUS; i++) {
 		prio_array_t *array;

diff -urN linux-2.5.23-virgin/include/linux/sched.h linux-2.5.23-wli/include/linux/sched.h
@@ -459,19 +459,7 @@
 	list_del(&p->pidhash_list);
 }
 
-static inline task_t *find_task_by_pid(int pid)
-{
-	list_t *p, *pid_list = &pidhash[pid_hashfn(pid)];
-
-	list_for_each(p, pid_list) {
-		task_t *t = list_entry(p, task_t, pidhash_list);
-
-		if(t->pid == pid)
-			return t;
-	}
-
-	return NULL;
-}
+extern task_t *find_task_by_pid(int pid);
 
 /* per-UID process charging. */
 extern struct user_struct * alloc_uid(uid_t);

diff -urN linux-2.5.23-virgin/kernel/fork.c linux-2.5.23-wli/kernel/fork.c
@@ -69,6 +69,21 @@
 		INIT_LIST_HEAD(&pidhash[i]);
 }
 
+task_t *find_task_by_pid(int pid)
+{
+	list_t *p, *pid_list = &pidhash[pid_hashfn(pid)];
+
+	list_for_each(p, pid_list) {
+		task_t *t = list_entry(p, task_t, pidhash_list);
+
+		if(t->pid == pid)
+			return t;
+	}
+
+	return NULL;
+}
+EXPORT_SYMBOL(find_task_by_pid);
+
 rwlock_t tasklist_lock __cacheline_aligned = RW_LOCK_UNLOCKED;  /* outer */
 
 void add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait)

diff -urN linux-2.5.23-virgin/include/linux/sched.h linux-2.5.23-wli/include/linux/sched.h
@@ -441,24 +441,8 @@
 extern struct task_struct *init_tasks[NR_CPUS];
 
 /* PID hashing. */
-extern list_t *pidhash;
-extern unsigned long pidhash_size;
-
-static inline unsigned pid_hashfn(pid_t pid)
-{
-	return ((pid >> 8) ^ pid) & (pidhash_size - 1);
-}
-
-static inline void hash_pid(struct task_struct *p)
-{
-	list_add(&p->pidhash_list, &pidhash[pid_hashfn(p->pid)]);
-}
-
-static inline void unhash_pid(struct task_struct *p)
-{
-	list_del(&p->pidhash_list);
-}
-
+extern void hash_pid(task_t *);
+extern void unhash_pid(task_t *);
 extern task_t *find_task_by_pid(int pid);
 
 /* per-UID process charging. */

diff -urN linux-2.5.23-virgin/kernel/fork.c linux-2.5.23-wli/kernel/fork.c
@@ -69,6 +69,11 @@
 		INIT_LIST_HEAD(&pidhash[i]);
 }
 
+static inline unsigned pid_hashfn(pid_t pid)
+{
+	return ((pid >> 8) ^ pid) & (pidhash_size - 1);
+}
+
 task_t *find_task_by_pid(int pid)
 {
 	list_t *p, *pid_list = &pidhash[pid_hashfn(pid)];

@@ -82,7 +87,20 @@
 
 	return NULL;
 }
+
+void hash_pid(task_t *p)
+{
+	list_add(&p->pidhash_list, &pidhash[pid_hashfn(p->pid)]);
+}
+
+void unhash_pid(task_t *p)
+{
+	list_del(&p->pidhash_list);
+}
+
 EXPORT_SYMBOL(find_task_by_pid);
+EXPORT_SYMBOL(hash_pid);
+EXPORT_SYMBOL(unhash_pid);
 
 rwlock_t tasklist_lock __cacheline_aligned = RW_LOCK_UNLOCKED;  /* outer */
 

diff -urN linux-2.5.23-virgin/kernel/ksyms.c linux-2.5.23-wli/kernel/ksyms.c
@@ -602,5 +602,3 @@
 EXPORT_SYMBOL(init_thread_union);
 
 EXPORT_SYMBOL(tasklist_lock);
-EXPORT_SYMBOL(pidhash);
-EXPORT_SYMBOL(pidhash_size);

diff -urN linux-2.5.23-virgin/kernel/fork.c linux-2.5.23-wli/kernel/fork.c
@@ -61,7 +61,7 @@
 	} while (!pidhash && size >= sizeof(list_t));
 
 	if (!pidhash)
-		panic("Failed to allocated pid hash table!\n");
+		panic("Failed to allocate pid hash table!\n");
 
 	pidhash_size = size/sizeof(list_t);
 

diff -Nru a/include/linux/sched.h b/include/linux/sched.h
@@ -863,6 +863,34 @@
 		clear_thread_flag(TIF_SIGPENDING);
 }
 
+/*
+ * Wrappers for p->thread_info->cpu access. No-op on UP.
+ */
+#ifdef CONFIG_SMP
+
+static inline unsigned int task_cpu(struct task_struct *p)
+{
+	return p->thread_info->cpu;
+}
+
+static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
+{
+	p->thread_info->cpu = cpu;
+}
+
+#else
+
+static inline unsigned int task_cpu(struct task_struct *p)
+{
+	return 0;
+}
+
+static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
+{
+}
+
+#endif /* CONFIG_SMP */
+
 #endif /* __KERNEL__ */
 
 #endif

151 lines not on this page · raw message