git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
include
/
asm-blackfin
/
system.h
diff --git
a/include/asm-blackfin/system.h
b/include/asm-blackfin/system.h
index
758bac7
..
5e5f1a0
100644
(file)
--- a/
include/asm-blackfin/system.h
+++ b/
include/asm-blackfin/system.h
@@
-138,7
+138,6
@@
extern unsigned long irq_flags;
#endif
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
#endif
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) ((void)xchg((ptr),1))
struct __xchg_dummy {
unsigned long a[100];
struct __xchg_dummy {
unsigned long a[100];
@@
-240,9
+239,9
@@
asmlinkage struct task_struct *resume(struct task_struct *prev, struct task_stru
#define switch_to(prev,next,last) \
do { \
#define switch_to(prev,next,last) \
do { \
- memcpy (&
prev->thread_info
->l1_task_info, L1_SCRATCH_TASK_INFO, \
+ memcpy (&
task_thread_info(prev)
->l1_task_info, L1_SCRATCH_TASK_INFO, \
sizeof *L1_SCRATCH_TASK_INFO); \
sizeof *L1_SCRATCH_TASK_INFO); \
- memcpy (L1_SCRATCH_TASK_INFO, &
next->thread_info
->l1_task_info, \
+ memcpy (L1_SCRATCH_TASK_INFO, &
task_thread_info(next)
->l1_task_info, \
sizeof *L1_SCRATCH_TASK_INFO); \
(last) = resume (prev, next); \
} while (0)
sizeof *L1_SCRATCH_TASK_INFO); \
(last) = resume (prev, next); \
} while (0)