Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11031
b: refs/heads/master
c: 5068deb
h: refs/heads/master
i:
  11029: ed23397
  11027: 4903eab
  11023: 5874faf
v: v3
  • Loading branch information
Ralf Baechle committed Oct 29, 2005
1 parent af96a79 commit fabf705
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f04afb59565c3029563b9a79b3513c9f3327a27
refs/heads/master: 5068debff2dcbc8f624811e3c06d60c7c0bba744
21 changes: 21 additions & 0 deletions trunk/include/asm-mips/hazards.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ __asm__(
".set\tmips32\n\t" \
"_ssnop; _ssnop; _ssnop; _ssnop\n\t" \
".set\tmips0")

#define back_to_back_c0_hazard() do { } while (0)

#else

/*
Expand All @@ -141,6 +144,12 @@ __asm__(
"nop; nop; nop; nop; nop; nop;\n\t" \
".set reorder\n\t")

#define back_to_back_c0_hazard() \
__asm__ __volatile__( \
" .set noreorder \n" \
" nop; nop; nop \n" \
" .set reorder \n")

#endif

/*
Expand Down Expand Up @@ -170,6 +179,10 @@ __asm__(
__asm__ __volatile__( \
"_ehb\t\t\t\t# irq_disable_hazard")

#define back_to_back_c0_hazard() \
__asm__ __volatile__( \
"_ehb\t\t\t\t# back_to_back_c0_hazard")

#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)

/*
Expand All @@ -186,6 +199,8 @@ __asm__(
#define irq_enable_hazard() do { } while (0)
#define irq_disable_hazard() do { } while (0)

#define back_to_back_c0_hazard() do { } while (0)

#else

/*
Expand All @@ -210,6 +225,12 @@ __asm__(
__asm__ __volatile__( \
"_ssnop; _ssnop; _ssnop;\t\t# irq_disable_hazard")

#define back_to_back_c0_hazard() \
__asm__ __volatile__( \
" .set noreorder \n" \
" nop; nop; nop \n" \
" .set reorder \n")

#endif

#endif /* __ASSEMBLY__ */
Expand Down

0 comments on commit fabf705

Please sign in to comment.