Skip to content

Commit

Permalink
avr32: fix nop compile fails from system.h split up
Browse files Browse the repository at this point in the history
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 ae47394
("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>
  • Loading branch information
paulgortmaker authored and torvalds committed Apr 4, 2012
1 parent f3718a8 commit 167d821
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
2 changes: 2 additions & 0 deletions arch/avr32/include/asm/barrier.h
Expand Up @@ -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")
Expand Down
13 changes: 0 additions & 13 deletions arch/avr32/include/asm/special_insns.h

This file was deleted.

0 comments on commit 167d821

Please sign in to comment.