Re: builing kernel 2.5.4 fails

[Nick Orlov <nick.orlov@mail.ru>]

Согласно lkml лечится вот так:

diff -uNr linux-2.5.4/include/asm-i386/processor.h
+linux-orn-254/include/asm-i386/processor.h
--- linux-2.5.4/include/asm-i386/processor.h    Mon Feb 11 09:41:35 2002
+++ linux-orn-254/include/asm-i386/processor.h  Mon Feb 11 10:29:29 2002
@@ -439,10 +439,7 @@
 /*
  * Return saved PC of a blocked thread.
  */
-static inline unsigned long thread_saved_pc(struct task_struct *tsk)
-{
-       return ((unsigned long *)tsk->thread->esp)[3];
-}
+#define thread_saved_pc(TSK) (((unsigned long *)(TSK)->thread.esp)[3])

 unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)  (((unsigned long *)(4096+(unsigned long)(tsk)->thread_info))[1019])

или вот так:

--- linux-2.5.4/include/asm-i386/processor.h    Sun Feb 10 22:00:29 2002
+++ 25/include/asm-i386/processor.h     Sun Feb 10 22:21:53 2002
@@ -435,14 +435,7 @@ extern int kernel_thread(int (*fn)(void
 /* Copy and release all segment info associated with a VM */
 extern void copy_segments(struct task_struct *p, struct mm_struct * mm);
 extern void release_segments(struct mm_struct * mm);
-
-/*
- * Return saved PC of a blocked thread.
- */
-static inline unsigned long thread_saved_pc(struct task_struct *tsk)
-{
-       return ((unsigned long *)tsk->thread->esp)[3];
-}
+extern unsigned long thread_saved_pc(struct task_struct *tsk);

 unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)  (((unsigned long *)(4096+(unsigned long)(tsk)->thread_info))[1019])
--- linux-2.5.4/arch/i386/kernel/process.c      Sun Feb 10 22:00:28 2002
+++ 25/arch/i386/kernel/process.c       Sun Feb 10 22:26:35 2002
@@ -55,6 +55,14 @@ asmlinkage void ret_from_fork(void) __as
 int hlt_counter;

 /*
+ * Return saved PC of a blocked thread.
+ */
+unsigned long thread_saved_pc(struct task_struct *tsk)
+{
+       return ((unsigned long *)tsk->thread.esp)[3];
+}
+
+/*
  * Powermanagement idle function, if any..
  */
 void (*pm_idle)(void);
     
что войдет в main stream - понятия не имею :)
   
-- 
With best wishes,
	Nick Orlov.