projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]
[powerpc.git]
/
include
/
asm-sparc
/
system.h
diff --git
a/include/asm-sparc/system.h
b/include/asm-sparc/system.h
index
898562e
..
100c3ea
100644
(file)
--- a/
include/asm-sparc/system.h
+++ b/
include/asm-sparc/system.h
@@
-1,15
+1,12
@@
/* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */
/* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */
-#include <linux/config.h>
#ifndef __SPARC_SYSTEM_H
#define __SPARC_SYSTEM_H
#ifndef __SPARC_SYSTEM_H
#define __SPARC_SYSTEM_H
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/threads.h> /* NR_CPUS */
#include <linux/thread_info.h>
#include <linux/kernel.h>
#include <linux/threads.h> /* NR_CPUS */
#include <linux/thread_info.h>
-#include <asm/segment.h>
#include <asm/page.h>
#include <asm/psr.h>
#include <asm/ptrace.h>
#include <asm/page.h>
#include <asm/psr.h>
#include <asm/ptrace.h>
@@
-156,7
+153,7
@@
extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
"here:\n" \
: "=&r" (last) \
: "r" (&(current_set[hard_smp_processor_id()])), \
"here:\n" \
: "=&r" (last) \
: "r" (&(current_set[hard_smp_processor_id()])), \
- "r" (
(next)->thread_info),
\
+ "r" (
task_thread_info(next)),
\
"i" (TI_KPSR), \
"i" (TI_KSP), \
"i" (TI_TASK) \
"i" (TI_KPSR), \
"i" (TI_KSP), \
"i" (TI_TASK) \
@@
-166,6
+163,16
@@
extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
"o0", "o1", "o2", "o3", "o7"); \
} while(0)
"o0", "o1", "o2", "o3", "o7"); \
} while(0)
+/*
+ * 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)
+{
+}
+
/*
* Changing the IRQ level on the Sparc.
*/
/*
* Changing the IRQ level on the Sparc.
*/
@@
-192,7
+199,6
@@
static inline unsigned long getipl(void)
#define wmb() mb()
#define read_barrier_depends() do { } while(0)
#define set_mb(__var, __value) do { __var = __value; mb(); } while(0)
#define wmb() mb()
#define read_barrier_depends() do { } while(0)
#define set_mb(__var, __value) do { __var = __value; mb(); } while(0)
-#define set_wmb(__var, __value) set_mb(__var, __value)
#define smp_mb() __asm__ __volatile__("":::"memory")
#define smp_rmb() __asm__ __volatile__("":::"memory")
#define smp_wmb() __asm__ __volatile__("":::"memory")
#define smp_mb() __asm__ __volatile__("":::"memory")
#define smp_rmb() __asm__ __volatile__("":::"memory")
#define smp_wmb() __asm__ __volatile__("":::"memory")
@@
-205,7
+211,7
@@
static inline unsigned long getipl(void)
BTFIXUPDEF_CALL(void, ___xchg32, void)
#endif
BTFIXUPDEF_CALL(void, ___xchg32, void)
#endif
-
extern __inline__
unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val)
+
static inline
unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned long val)
{
#ifdef CONFIG_SMP
__asm__ __volatile__("swap [%2], %0"
{
#ifdef CONFIG_SMP
__asm__ __volatile__("swap [%2], %0"