projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
include
/
asm-alpha
/
system.h
diff --git
a/include/asm-alpha/system.h
b/include/asm-alpha/system.h
index
050e86d
..
f3b7b1a
100644
(file)
--- a/
include/asm-alpha/system.h
+++ b/
include/asm-alpha/system.h
@@
-131,15
+131,25
@@
struct el_common_EV6_mcheck {
extern void halt(void) __attribute__((noreturn));
#define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
extern void halt(void) __attribute__((noreturn));
#define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
-#define switch_to(P,N,L) \
- do { \
- (L) = alpha_switch_to(virt_to_phys(&
(N)->thread_info->pcb), (P));
\
- check_mmu_context(); \
+#define switch_to(P,N,L)
\
+ do {
\
+ (L) = alpha_switch_to(virt_to_phys(&
task_thread_info(N)->pcb), (P));
\
+ check_mmu_context();
\
} while (0)
struct task_struct;
extern struct task_struct *alpha_switch_to(unsigned long, struct task_struct*);
} while (0)
struct task_struct;
extern struct task_struct *alpha_switch_to(unsigned long, struct task_struct*);
+/*
+ * On SMP systems, when the scheduler does migration-cost autodetection,
+ * it needs a way to flush as much of the CPU's caches as possible.
+ *
+ * TODO: fill this in!
+ */
+static inline void sched_cacheflush(void)
+{
+}
+
#define imb() \
__asm__ __volatile__ ("call_pal %0 #imb" : : "i" (PAL_imb) : "memory")
#define imb() \
__asm__ __volatile__ ("call_pal %0 #imb" : : "i" (PAL_imb) : "memory")
@@
-562,7
+572,7
@@
__cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
if something tries to do an invalid cmpxchg(). */
extern void __cmpxchg_called_with_bad_pointer(void);
if something tries to do an invalid cmpxchg(). */
extern void __cmpxchg_called_with_bad_pointer(void);
-static inline unsigned long
+static
__always_
inline unsigned long
__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
{
switch (size) {
__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
{
switch (size) {