Merge branch 'akpm' (Andrew's patch-bomb)

[linux-flexiantxendom0-3.2.10.git] / arch / frv / include / asm / processor.h

diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h
index 4b789ab..9b1a92b 100644 (file)
--- a/arch/frv/include/asm/processor.h
+++ b/arch/frv/include/asm/processor.h
@@ -97,7 +97,6 @@ extern struct task_struct *__kernel_current_task;
  */
 #define start_thread(_regs, _pc, _usp)                 \
 do {                                                   \
-       set_fs(USER_DS); /* reads from user space */    \
        __frame = __kernel_frame0_ptr;                  \
        __frame->pc     = (_pc);                        \
        __frame->psr    &= ~PSR_S;                      \
@@ -136,10 +135,6 @@ unsigned long get_wchan(struct task_struct *p);
 #define        KSTK_EIP(tsk)   ((tsk)->thread.frame0->pc)
 #define        KSTK_ESP(tsk)   ((tsk)->thread.frame0->sp)
 
-/* Allocation and freeing of basic task resources. */
-extern struct task_struct *alloc_task_struct_node(int node);
-extern void free_task_struct(struct task_struct *p);
-
 #define cpu_relax()    barrier()
 
 /* data cache prefetch */