On Mon, 7 Mar 2005, Kars de Jong wrote:
> On Wed, 2005-03-02 at 16:59 -0600, Roman Zippel wrote:
> > In directory ubb:/home/linux-m68k/zippel/linux-native
> >
> > Log Message:
> > import native 2.6.11
> >
> > C linux/include/linux/sched.h
>
> I tried compiling the tree today, it doesn't seem to work:
This is what I have in my tree (compile-tested only). Note that the patch is
reversed!
--- linux-m68k-2.6.11/include/linux/interrupt.h 2005-01-17 20:31:01.000000000
+0100
+++ cvs/linux-m68k-2.6.x/include/linux/interrupt.h 2005-03-03
10:03:05.000000000 +0100
@@ -9,7 +9,6 @@
#include <linux/preempt.h>
#include <linux/cpumask.h>
#include <linux/hardirq.h>
-#include <linux/task_struct.h>
#include <asm/atomic.h>
#include <asm/ptrace.h>
#include <asm/system.h>
--- linux-m68k-2.6.11/include/linux/sched.h 2005-02-03 15:33:06.000000000
+0100
+++ cvs/linux-m68k-2.6.x/include/linux/sched.h 2005-03-03 10:03:07.000000000
+0100
@@ -11,14 +11,15 @@
#include <linux/rbtree.h>
#include <linux/thread_info.h>
#include <linux/cpumask.h>
-#include <linux/task_struct.h>
#include <linux/errno.h>
+#include <linux/task_struct.h>
#include <asm/system.h>
#include <asm/semaphore.h>
#include <asm/page.h>
#include <asm/ptrace.h>
#include <asm/mmu.h>
+#include <asm/cputime.h>
#include <linux/smp.h>
#include <linux/sem.h>
@@ -119,6 +120,9 @@ extern unsigned long nr_iowait(void);
#define set_current_state(state_value) \
set_mb(current->state, (state_value))
+/* Task command name length */
+#define TASK_COMM_LEN 16
+
/*
* Scheduling policies
*/
--- linux-m68k-2.6.11/include/linux/task_struct.h 2005-02-03
15:32:04.000000000 +0100
+++ cvs/linux-m68k-2.6.x/include/linux/task_struct.h 2005-03-03
10:03:08.000000000 +0100
@@ -13,7 +13,6 @@
#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;
@@ -55,9 +54,6 @@ int set_current_groups(struct group_info
((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;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED]
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-m68k" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
