Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[powerpc.git] / include / asm-sparc / thread_info.h

diff --git a/include/asm-sparc/thread_info.h b/include/asm-sparc/thread_info.h
index 104f03c..65f060b 100644 (file)
--- a/include/asm-sparc/thread_info.h
+++ b/include/asm-sparc/thread_info.h
@@ -30,9 +30,9 @@ struct thread_info {
        struct task_struct      *task;          /* main task structure */
        struct exec_domain      *exec_domain;   /* execution domain */
        unsigned long           flags;          /* low level flags */
-
        int                     cpu;            /* cpu we're on */
-       int                     preempt_count;
+       int                     preempt_count;  /* 0 => preemptable,
+                                                  <0 => BUG */
        int                     softirq_count;
        int                     hardirq_count;
 
@@ -92,9 +92,6 @@ BTFIXUPDEF_CALL(struct thread_info *, alloc_thread_info, void)
 BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
 #define free_thread_info(ti) BTFIXUP_CALL(free_thread_info)(ti)
 
-#define get_thread_info(ti)    get_task_struct((ti)->task)
-#define put_thread_info(ti)    put_task_struct((ti)->task)
-
 #endif /* __ASSEMBLY__ */
 
 /*