From 258820cd9766a3d810ac305d01c80acc558519a2 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Tue, 3 Apr 2012 19:14:04 -0400 Subject: [PATCH] --- yaml --- r: 298535 b: refs/heads/master c: 167d82152079debd0a76726972a76ea032d82043 h: refs/heads/master i: 298533: c98999c132611f76c395dd5d5543ff7323c2ddbe 298531: 8c0344d3edd4b3bb426e1606f2223f949730d6af 298527: 1b8de4a8de4499c03018e6fe5810d1d6113902a8 v: v3 --- [refs] | 2 +- trunk/arch/avr32/include/asm/barrier.h | 2 ++ trunk/arch/avr32/include/asm/special_insns.h | 13 ------------- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 trunk/arch/avr32/include/asm/special_insns.h diff --git a/[refs] b/[refs] index cff7ff539ca6..95a5133c874d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3718a818f7fb3636130d5f34bde8df34f45c5e5 +refs/heads/master: 167d82152079debd0a76726972a76ea032d82043 diff --git a/trunk/arch/avr32/include/asm/barrier.h b/trunk/arch/avr32/include/asm/barrier.h index 808001c9cf8c..0961275373db 100644 --- a/trunk/arch/avr32/include/asm/barrier.h +++ b/trunk/arch/avr32/include/asm/barrier.h @@ -8,6 +8,8 @@ #ifndef __ASM_AVR32_BARRIER_H #define __ASM_AVR32_BARRIER_H +#define nop() asm volatile("nop") + #define mb() asm volatile("" : : : "memory") #define rmb() mb() #define wmb() asm volatile("sync 0" : : : "memory") diff --git a/trunk/arch/avr32/include/asm/special_insns.h b/trunk/arch/avr32/include/asm/special_insns.h deleted file mode 100644 index f922218dfaa5..000000000000 --- a/trunk/arch/avr32/include/asm/special_insns.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2004-2006 Atmel Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef __ASM_AVR32_SPECIAL_INSNS_H -#define __ASM_AVR32_SPECIAL_INSNS_H - -#define nop() asm volatile("nop") - -#endif /* __ASM_AVR32_SPECIAL_INSNS_H */