diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:18:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:18:27 -0400 |
| commit | 6a31d4aeab85a02f9a57ca37b935054393daa794 (patch) | |
| tree | 4b17d8da5166caf106b567425cd6859e2d9484e4 /arch/microblaze/include/asm/tlb.h | |
| parent | ca597a02cd9902338aad91b0ce792fd9ffcaaa04 (diff) | |
| parent | 950b260ed21fdb6fa5f18485dabb0b03488431fa (diff) | |
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Makefile cleanup
microblaze: Typo fix for cpu param inconsistency
microblaze: Add support for R_MICROBLAZE_64_NONE
microblaze: Get module loading working
microblaze: remove sys_ipc
microblaze: Support unaligned address for put/get_user macros
microblaze: Detect new Microblaze 7.20 versions
microblaze: Fix do_page_fault for no context
microblaze: Add _PAGE_FILE macros to pgtable.h
microblaze: Fix put_user macro for 64bits arguments
microblaze: Clear print messages for DTB passing via r7
microblaze: Not to clear r7 after copying DTB to kernel
microblaze: Add messages about FDT blob
microblaze: Final support for statically linked DTB
microblaze: remove duplicated #include
microblaze: Define tlb_flush macro
Diffstat (limited to 'arch/microblaze/include/asm/tlb.h')
| -rw-r--r-- | arch/microblaze/include/asm/tlb.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ | |||
| 11 | #ifndef _ASM_MICROBLAZE_TLB_H | 11 | #ifndef _ASM_MICROBLAZE_TLB_H |
| 12 | #define _ASM_MICROBLAZE_TLB_H | 12 | #define _ASM_MICROBLAZE_TLB_H |
| 13 | 13 | ||
| 14 | #define tlb_flush(tlb) do {} while (0) | 14 | #define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) |
| 15 | 15 | ||
| 16 | #include <asm-generic/tlb.h> | 16 | #include <asm-generic/tlb.h> |
| 17 | 17 | ||