Commit 167d8215 authored Apr 03, 2012 by Paul Gortmaker Committed by Linus Torvalds Apr 04, 2012

avr32: fix nop compile fails from system.h split up



To fix:

  In file included from kernel/exit.c:61:
  arch/avr32/include/asm/mmu_context.h: In function 'enable_mmu':
  arch/avr32/include/asm/mmu_context.h:135: error: implicit declaration of function 'nop'

It needs an include of the new file created in commit ae473946
("Disintegrate asm/system.h for AVR32"), but since that file only
contains "nop", and since other arch already have precedent of putting
nop in asm/barrier.h we should just delete the new file and put nop in
barrier.h

Suggested-and-acked-by: David Howells <dhowells@redhat.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f3718a81

arch/avr32/include/asm/barrier.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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")

arch/avr32/include/asm/special_insns.h

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		/*
		* 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 */