OSDN Git Service

avr32: fix nop compile fails from system.h split up
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Tue, 3 Apr 2012 23:14:04 +0000 (19:14 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Apr 2012 15:23:44 +0000 (08:23 -0700)
commit167d82152079debd0a76726972a76ea032d82043
tree076a9d27a89e6540692bbcabc5b9f600cbbe1856
parentf3718a818f7fb3636130d5f34bde8df34f45c5e5
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 ae4739465866
("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>
arch/avr32/include/asm/barrier.h
arch/avr32/include/asm/special_insns.h [deleted file]