diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:02:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:23 -0400 |
commit | dca13fb0fc89d4214090a0ae14aeeaa50c42a6c4 (patch) | |
tree | 5441c681a7b3e778283c1c39cfdbaa3f198b4295 /include | |
parent | cb7d0617b776b91a0643b8c5988f236414129b7d (diff) |
include/asm-x86/fixmap_64.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/fixmap_64.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/asm-x86/fixmap_64.h b/include/asm-x86/fixmap_64.h index 70ddb21e6458..f3d76858c0e6 100644 --- a/include/asm-x86/fixmap_64.h +++ b/include/asm-x86/fixmap_64.h | |||
@@ -34,32 +34,34 @@ | |||
34 | 34 | ||
35 | enum fixed_addresses { | 35 | enum fixed_addresses { |
36 | VSYSCALL_LAST_PAGE, | 36 | VSYSCALL_LAST_PAGE, |
37 | VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1, | 37 | VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE |
38 | + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1, | ||
38 | VSYSCALL_HPET, | 39 | VSYSCALL_HPET, |
39 | FIX_DBGP_BASE, | 40 | FIX_DBGP_BASE, |
40 | FIX_EARLYCON_MEM_BASE, | 41 | FIX_EARLYCON_MEM_BASE, |
41 | FIX_HPET_BASE, | 42 | FIX_HPET_BASE, |
42 | FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ | 43 | FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ |
43 | FIX_IO_APIC_BASE_0, | 44 | FIX_IO_APIC_BASE_0, |
44 | FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1, | 45 | FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1, |
45 | FIX_EFI_IO_MAP_LAST_PAGE, | 46 | FIX_EFI_IO_MAP_LAST_PAGE, |
46 | FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE+MAX_EFI_IO_PAGES-1, | 47 | FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE |
48 | + MAX_EFI_IO_PAGES - 1, | ||
47 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | 49 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
48 | FIX_OHCI1394_BASE, | 50 | FIX_OHCI1394_BASE, |
49 | #endif | 51 | #endif |
50 | __end_of_fixed_addresses | 52 | __end_of_fixed_addresses |
51 | }; | 53 | }; |
52 | 54 | ||
53 | extern void __set_fixmap (enum fixed_addresses idx, | 55 | extern void __set_fixmap(enum fixed_addresses idx, |
54 | unsigned long phys, pgprot_t flags); | 56 | unsigned long phys, pgprot_t flags); |
55 | 57 | ||
56 | #define set_fixmap(idx, phys) \ | 58 | #define set_fixmap(idx, phys) \ |
57 | __set_fixmap(idx, phys, PAGE_KERNEL) | 59 | __set_fixmap(idx, phys, PAGE_KERNEL) |
58 | /* | 60 | /* |
59 | * Some hardware wants to get fixmapped without caching. | 61 | * Some hardware wants to get fixmapped without caching. |
60 | */ | 62 | */ |
61 | #define set_fixmap_nocache(idx, phys) \ | 63 | #define set_fixmap_nocache(idx, phys) \ |
62 | __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) | 64 | __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) |
63 | 65 | ||
64 | #define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE) | 66 | #define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE) |
65 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) | 67 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) |