diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/tlb.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/tlb.h')
| -rw-r--r-- | include/asm-powerpc/tlb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/tlb.h b/include/asm-powerpc/tlb.h index 56659f121779..601a53cf96d5 100644 --- a/include/asm-powerpc/tlb.h +++ b/include/asm-powerpc/tlb.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #ifndef _ASM_POWERPC_TLB_H | 12 | #ifndef _ASM_POWERPC_TLB_H |
| 13 | #define _ASM_POWERPC_TLB_H | 13 | #define _ASM_POWERPC_TLB_H |
| 14 | #ifdef __KERNEL__ | ||
| 14 | 15 | ||
| 15 | #include <linux/config.h> | 16 | #include <linux/config.h> |
| 16 | #ifndef __powerpc64__ | 17 | #ifndef __powerpc64__ |
| @@ -67,4 +68,5 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, | |||
| 67 | } | 68 | } |
| 68 | 69 | ||
| 69 | #endif | 70 | #endif |
| 71 | #endif /* __KERNEL__ */ | ||
| 70 | #endif /* __ASM_POWERPC_TLB_H */ | 72 | #endif /* __ASM_POWERPC_TLB_H */ |