git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-sh64
/
system.h
diff --git
a/include/asm-sh64/system.h
b/include/asm-sh64/system.h
index
8b3a6f9
..
b1598c2
100644
(file)
--- a/
include/asm-sh64/system.h
+++ b/
include/asm-sh64/system.h
@@
-14,8
+14,6
@@
*
*/
*
*/
-#include <linux/config.h>
-#include <linux/kernel.h>
#include <asm/registers.h>
#include <asm/processor.h>
#include <asm/registers.h>
#include <asm/processor.h>
@@
-66,9
+64,8
@@
extern void __xchg_called_with_bad_pointer(void);
#define smp_read_barrier_depends() do { } while (0)
#endif /* CONFIG_SMP */
#define smp_read_barrier_depends() do { } while (0)
#endif /* CONFIG_SMP */
-#define set_rmb(var, value) do { xchg(&var, value); } while (0)
+#define set_rmb(var, value) do {
(void)
xchg(&var, value); } while (0)
#define set_mb(var, value) set_rmb(var, value)
#define set_mb(var, value) set_rmb(var, value)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
/* Interrupt Control */
#ifndef HARD_CLI
/* Interrupt Control */
#ifndef HARD_CLI
@@
-133,7
+130,7
@@
static __inline__ void local_irq_disable(void)
(flags != 0); \
})
(flags != 0); \
})
-
extern __inline__
unsigned long xchg_u32(volatile int * m, unsigned long val)
+
static inline
unsigned long xchg_u32(volatile int * m, unsigned long val)
{
unsigned long flags, retval;
{
unsigned long flags, retval;
@@
-144,7
+141,7
@@
extern __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
return retval;
}
return retval;
}
-
extern __inline__
unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
+
static inline
unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
{
unsigned long flags, retval;
{
unsigned long flags, retval;
@@
-191,4
+188,6
@@
extern void print_seg(char *file,int line);
#define PL() printk("@ <%s,%s:%d>\n",__FILE__,__FUNCTION__,__LINE__)
#define PL() printk("@ <%s,%s:%d>\n",__FILE__,__FUNCTION__,__LINE__)
+#define arch_align_stack(x) (x)
+
#endif /* __ASM_SH64_SYSTEM_H */
#endif /* __ASM_SH64_SYSTEM_H */