This patch has removed some redefinitions in hazard.h . Yoichi Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx> diff -pruN -X mips/Documentation/dontdiff mips-orig/include/asm-mips/hazards.h mips/include/asm-mips/hazards.h --- mips-orig/include/asm-mips/hazards.h 2006-09-22 00:17:58.189227000 +0900 +++ mips/include/asm-mips/hazards.h 2006-09-22 00:13:46.893522000 +0900 @@ -191,22 +191,4 @@ ASMMACRO(back_to_back_c0_hazard, #endif -#ifndef __ASSEMBLY__ - -/* C access to assembler macros */ -#define mtc0_tlbw_hazard() \ - __asm__ __volatile__("mtc0_tlbw_hazard") -#define tlbw_use_hazard() \ - __asm__ __volatile__("tlbw_use_hazard") -#define tlb_probe_hazard() \ - __asm__ __volatile__("tlb_probe_hazard") -#define irq_enable_hazard() \ - __asm__ __volatile__("irq_enable_hazard") -#define irq_disable_hazard() \ - __asm__ __volatile__("irq_disable_hazard") -#define back_to_back_c0_hazard() \ - __asm__ __volatile__("back_to_back_c0_hazard") - -#endif /* __ASSEMBLY__ */ - #endif /* _ASM_HAZARDS_H */