diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 10:41:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 10:41:16 +1000 |
| commit | d81e69b61b048b24c0eaa47cabf39311675527c9 (patch) | |
| tree | 5d77b92a086394231e538247c98f9a16686d8a58 | |
| parent | a8330c86ff1f0e483fa5e19c06b72d48ee25df44 (diff) | |
| parent | 63afe541c97c313ed9ff007c9bcfcce1b0bdb4d9 (diff) | |
Merge commit 'microblaze/next'
| -rw-r--r-- | arch/microblaze/include/asm/io.h | 1 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/tlb.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 5c173424d074..7c3ec13b44d8 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -14,7 +14,6 @@ #include <asm/byteorder.h> #include <asm/page.h> #include <linux/types.h> -#include <asm/byteorder.h> #include <linux/mm.h> /* Get struct page {...} */ diff --git a/arch/microblaze/include/asm/tlb.h b/arch/microblaze/include/asm/tlb.h index c472d2801132..e8abd4a0349c 100644 --- a/arch/microblaze/include/asm/tlb.h +++ b/arch/microblaze/include/asm/tlb.h @@ -11,7 +11,7 @@ #ifndef _ASM_MICROBLAZE_TLB_H #define _ASM_MICROBLAZE_TLB_H -#define tlb_flush(tlb) do {} while (0) +#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) #include <asm-generic/tlb.h> |