diff options
Diffstat (limited to 'include/asm-x86/fixmap_32.h')
-rw-r--r-- | include/asm-x86/fixmap_32.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/asm-x86/fixmap_32.h b/include/asm-x86/fixmap_32.h index a7404d50686b..eb1665125c44 100644 --- a/include/asm-x86/fixmap_32.h +++ b/include/asm-x86/fixmap_32.h | |||
@@ -99,8 +99,7 @@ enum fixed_addresses { | |||
99 | */ | 99 | */ |
100 | #define NR_FIX_BTMAPS 64 | 100 | #define NR_FIX_BTMAPS 64 |
101 | #define FIX_BTMAPS_NESTING 4 | 101 | #define FIX_BTMAPS_NESTING 4 |
102 | FIX_BTMAP_END = | 102 | FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 512 - |
103 | __end_of_permanent_fixed_addresses + 512 - | ||
104 | (__end_of_permanent_fixed_addresses & 511), | 103 | (__end_of_permanent_fixed_addresses & 511), |
105 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, | 104 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, |
106 | FIX_WP_TEST, | 105 | FIX_WP_TEST, |
@@ -110,20 +109,20 @@ enum fixed_addresses { | |||
110 | __end_of_fixed_addresses | 109 | __end_of_fixed_addresses |
111 | }; | 110 | }; |
112 | 111 | ||
113 | extern void __set_fixmap (enum fixed_addresses idx, | 112 | extern void __set_fixmap(enum fixed_addresses idx, |
114 | unsigned long phys, pgprot_t flags); | 113 | unsigned long phys, pgprot_t flags); |
115 | extern void reserve_top_address(unsigned long reserve); | 114 | extern void reserve_top_address(unsigned long reserve); |
116 | 115 | ||
117 | #define set_fixmap(idx, phys) \ | 116 | #define set_fixmap(idx, phys) \ |
118 | __set_fixmap(idx, phys, PAGE_KERNEL) | 117 | __set_fixmap(idx, phys, PAGE_KERNEL) |
119 | /* | 118 | /* |
120 | * Some hardware wants to get fixmapped without caching. | 119 | * Some hardware wants to get fixmapped without caching. |
121 | */ | 120 | */ |
122 | #define set_fixmap_nocache(idx, phys) \ | 121 | #define set_fixmap_nocache(idx, phys) \ |
123 | __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) | 122 | __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE) |
124 | 123 | ||
125 | #define clear_fixmap(idx) \ | 124 | #define clear_fixmap(idx) \ |
126 | __set_fixmap(idx, 0, __pgprot(0)) | 125 | __set_fixmap(idx, 0, __pgprot(0)) |
127 | 126 | ||
128 | #define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP) | 127 | #define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP) |
129 | 128 | ||
@@ -156,7 +155,7 @@ static __always_inline unsigned long fix_to_virt(const unsigned int idx) | |||
156 | if (idx >= __end_of_fixed_addresses) | 155 | if (idx >= __end_of_fixed_addresses) |
157 | __this_fixmap_does_not_exist(); | 156 | __this_fixmap_does_not_exist(); |
158 | 157 | ||
159 | return __fix_to_virt(idx); | 158 | return __fix_to_virt(idx); |
160 | } | 159 | } |
161 | 160 | ||
162 | static inline unsigned long virt_to_fix(const unsigned long vaddr) | 161 | static inline unsigned long virt_to_fix(const unsigned long vaddr) |