diff options
author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
---|---|---|
committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xenolinux-2.4.21-pre4-sparse/include/asm-xeno/current.h | |
parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse/include/asm-xeno/current.h')
-rw-r--r-- | xenolinux-2.4.21-pre4-sparse/include/asm-xeno/current.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/current.h b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/current.h deleted file mode 100644 index bc1496a2c9..0000000000 --- a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/current.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _I386_CURRENT_H -#define _I386_CURRENT_H - -struct task_struct; - -static inline struct task_struct * get_current(void) -{ - struct task_struct *current; - __asm__("andl %%esp,%0; ":"=r" (current) : "0" (~8191UL)); - return current; - } - -#define current get_current() - -#endif /* !(_I386_CURRENT_H) */ |