summaryrefslogtreecommitdiffstats
path: root/include/asm-sh
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-sh')
-rw-r--r--include/asm-sh/current.h2
-rw-r--r--include/asm-sh/pgtable.h6
-rw-r--r--include/asm-sh/sh_bios.h2
-rw-r--r--include/asm-sh/system.h65
4 files changed, 38 insertions, 37 deletions
diff --git a/include/asm-sh/current.h b/include/asm-sh/current.h
index 355a2cd14..c690c233b 100644
--- a/include/asm-sh/current.h
+++ b/include/asm-sh/current.h
@@ -12,7 +12,7 @@ static __inline__ struct task_struct * get_current(void)
{
struct task_struct *current;
- __asm__("stc $r7_bank, %0"
+ __asm__("stc r7_bank, %0"
:"=r" (current));
return current;
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index b1a6f9461..a448c6f00 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -39,6 +39,7 @@ extern void paging_init(void);
#define flush_dcache_page(page) do { } while (0)
#define flush_icache_range(start, end) do { } while (0)
#define flush_icache_page(vma,pg) do { } while (0)
+#define flush_cache_sigtramp(vaddr) do { } while (0)
#elif defined(__SH4__)
/*
* Caches are broken on SH-4, so we need them.
@@ -52,6 +53,7 @@ extern void flush_page_to_ram(struct page *page);
extern void flush_dcache_page(struct page *pg);
extern void flush_icache_range(unsigned long start, unsigned long end);
extern void flush_icache_page(struct vm_area_struct *vma, struct page *pg);
+extern void flush_cache_sigtramp(unsigned long addr);
#endif
/*
@@ -125,11 +127,7 @@ extern unsigned long empty_zero_page[1024];
/* Hardware flags: SZ=1 (4k-byte) */
#define _PAGE_FLAGS_HARD 0x00000010
-#if defined(__sh3__)
-#define _PAGE_SHARED _PAGE_HW_SHARED
-#elif defined(__SH4__)
#define _PAGE_SHARED _PAGE_U0_SHARED
-#endif
#define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
#define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
diff --git a/include/asm-sh/sh_bios.h b/include/asm-sh/sh_bios.h
index cdb73bdea..0ca261956 100644
--- a/include/asm-sh/sh_bios.h
+++ b/include/asm-sh/sh_bios.h
@@ -13,5 +13,7 @@ extern void sh_bios_char_out(char ch);
extern int sh_bios_in_gdb_mode(void);
extern void sh_bios_gdb_detach(void);
+extern void sh_bios_get_node_addr(unsigned char *node_addr);
+extern void sh_bios_shutdown(unsigned int how);
#endif /* __ASM_SH_BIOS_H */
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index 86786c730..a8f720582 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -6,6 +6,7 @@
*/
#include <linux/config.h>
+#include <linux/kernel.h>
/*
* switch_to() should switch tasks to task nr n, first
@@ -28,37 +29,37 @@ typedef struct {
register unsigned long *__ts6 __asm__ ("r6") = &next->thread.sp; \
register unsigned long __ts7 __asm__ ("r7") = next->thread.pc; \
__asm__ __volatile__ (".balign 4\n\t" \
- "stc.l $gbr, @-$r15\n\t" \
- "sts.l $pr, @-$r15\n\t" \
- "mov.l $r8, @-$r15\n\t" \
- "mov.l $r9, @-$r15\n\t" \
- "mov.l $r10, @-$r15\n\t" \
- "mov.l $r11, @-$r15\n\t" \
- "mov.l $r12, @-$r15\n\t" \
- "mov.l $r13, @-$r15\n\t" \
- "mov.l $r14, @-$r15\n\t" \
- "mov.l $r15, @$r1 ! save SP\n\t" \
- "mov.l @$r6, $r15 ! change to new stack\n\t" \
- "mov.l %0, @-$r15 ! push R0 onto new stack\n\t" \
+ "stc.l gbr, @-r15\n\t" \
+ "sts.l pr, @-r15\n\t" \
+ "mov.l r8, @-r15\n\t" \
+ "mov.l r9, @-r15\n\t" \
+ "mov.l r10, @-r15\n\t" \
+ "mov.l r11, @-r15\n\t" \
+ "mov.l r12, @-r15\n\t" \
+ "mov.l r13, @-r15\n\t" \
+ "mov.l r14, @-r15\n\t" \
+ "mov.l r15, @r1 ! save SP\n\t" \
+ "mov.l @r6, r15 ! change to new stack\n\t" \
+ "mov.l %0, @-r15 ! push R0 onto new stack\n\t" \
"mova 1f, %0\n\t" \
- "mov.l %0, @$r2 ! save PC\n\t" \
+ "mov.l %0, @r2 ! save PC\n\t" \
"mov.l 2f, %0\n\t" \
"jmp @%0 ! call __switch_to\n\t" \
- " lds $r7, $pr ! with return to new PC\n\t" \
+ " lds r7, pr ! with return to new PC\n\t" \
".balign 4\n" \
"2:\n\t" \
".long " "__switch_to\n" \
"1:\n\t" \
- "mov.l @$r15+, %0 ! pop R0 from new stack\n\t" \
- "mov.l @$r15+, $r14\n\t" \
- "mov.l @$r15+, $r13\n\t" \
- "mov.l @$r15+, $r12\n\t" \
- "mov.l @$r15+, $r11\n\t" \
- "mov.l @$r15+, $r10\n\t" \
- "mov.l @$r15+, $r9\n\t" \
- "mov.l @$r15+, $r8\n\t" \
- "lds.l @$r15+, $pr\n\t" \
- "ldc.l @$r15+, $gbr\n\t" \
+ "mov.l @r15+, %0 ! pop R0 from new stack\n\t" \
+ "mov.l @r15+, r14\n\t" \
+ "mov.l @r15+, r13\n\t" \
+ "mov.l @r15+, r12\n\t" \
+ "mov.l @r15+, r11\n\t" \
+ "mov.l @r15+, r10\n\t" \
+ "mov.l @r15+, r9\n\t" \
+ "mov.l @r15+, r8\n\t" \
+ "lds.l @r15+, pr\n\t" \
+ "ldc.l @r15+, gbr\n\t" \
:"=&z" (__last) \
:"0" (prev), \
"r" (__ts1), "r" (__ts2), \
@@ -107,11 +108,11 @@ static __inline__ void __sti(void)
{
unsigned long __dummy0, __dummy1;
- __asm__ __volatile__("stc $sr, %0\n\t"
+ __asm__ __volatile__("stc sr, %0\n\t"
"and %1, %0\n\t"
- "stc $r6_bank, %1\n\t"
+ "stc r6_bank, %1\n\t"
"or %1, %0\n\t"
- "ldc %0, $sr"
+ "ldc %0, sr"
: "=&r" (__dummy0), "=r" (__dummy1)
: "1" (~0x000000f0)
: "memory");
@@ -120,9 +121,9 @@ static __inline__ void __sti(void)
static __inline__ void __cli(void)
{
unsigned long __dummy;
- __asm__ __volatile__("stc $sr, %0\n\t"
+ __asm__ __volatile__("stc sr, %0\n\t"
"or #0xf0, %0\n\t"
- "ldc %0, $sr"
+ "ldc %0, sr"
: "=&z" (__dummy)
: /* no inputs */
: "memory");
@@ -131,7 +132,7 @@ static __inline__ void __cli(void)
#define __save_flags(x) \
x = (__extension__ ({ unsigned long __sr; \
__asm__ __volatile__( \
- "stc $sr, %0" \
+ "stc sr, %0" \
: "=&r" (__sr) \
: /* no inputs */ \
: "memory"); \
@@ -140,10 +141,10 @@ x = (__extension__ ({ unsigned long __sr; \
#define __save_and_cli(x) \
x = (__extension__ ({ unsigned long __dummy,__sr; \
__asm__ __volatile__( \
- "stc $sr, %1\n\t" \
+ "stc sr, %1\n\t" \
"mov %1, %0\n\t" \
"or #0xf0, %0\n\t" \
- "ldc %0, $sr" \
+ "ldc %0, sr" \
: "=&z" (__dummy), "=&r" (__sr) \
: /* no inputs */ \
: "memory"); (__sr & 0x000000f0); }))
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:23:50 +0000