diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /include/asm-x86/fixmap.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'include/asm-x86/fixmap.h')
| -rw-r--r-- | include/asm-x86/fixmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/fixmap.h b/include/asm-x86/fixmap.h index 44d4f8217349..78e33a1bc591 100644 --- a/include/asm-x86/fixmap.h +++ b/include/asm-x86/fixmap.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_FIXMAP_H | 1 | #ifndef ASM_X86__FIXMAP_H |
| 2 | #define _ASM_FIXMAP_H | 2 | #define ASM_X86__FIXMAP_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_X86_32 | 4 | #ifdef CONFIG_X86_32 |
| 5 | # include "fixmap_32.h" | 5 | # include "fixmap_32.h" |
| @@ -65,4 +65,4 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) | |||
| 65 | BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); | 65 | BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); |
| 66 | return __virt_to_fix(vaddr); | 66 | return __virt_to_fix(vaddr); |
| 67 | } | 67 | } |
| 68 | #endif | 68 | #endif /* ASM_X86__FIXMAP_H */ |