|
@@ -34,32 +34,34 @@
|
|
|
|
|
|
enum fixed_addresses {
|
|
enum fixed_addresses {
|
|
VSYSCALL_LAST_PAGE,
|
|
VSYSCALL_LAST_PAGE,
|
|
- VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
|
|
|
|
|
|
+ VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE
|
|
|
|
+ + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
|
|
VSYSCALL_HPET,
|
|
VSYSCALL_HPET,
|
|
FIX_DBGP_BASE,
|
|
FIX_DBGP_BASE,
|
|
FIX_EARLYCON_MEM_BASE,
|
|
FIX_EARLYCON_MEM_BASE,
|
|
FIX_HPET_BASE,
|
|
FIX_HPET_BASE,
|
|
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
|
|
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
|
|
FIX_IO_APIC_BASE_0,
|
|
FIX_IO_APIC_BASE_0,
|
|
- FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
|
|
|
|
|
|
+ FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
|
|
FIX_EFI_IO_MAP_LAST_PAGE,
|
|
FIX_EFI_IO_MAP_LAST_PAGE,
|
|
- FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE+MAX_EFI_IO_PAGES-1,
|
|
|
|
|
|
+ FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
|
|
|
|
+ + MAX_EFI_IO_PAGES - 1,
|
|
#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
|
|
#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
|
|
FIX_OHCI1394_BASE,
|
|
FIX_OHCI1394_BASE,
|
|
#endif
|
|
#endif
|
|
__end_of_fixed_addresses
|
|
__end_of_fixed_addresses
|
|
};
|
|
};
|
|
|
|
|
|
-extern void __set_fixmap (enum fixed_addresses idx,
|
|
|
|
- unsigned long phys, pgprot_t flags);
|
|
|
|
|
|
+extern void __set_fixmap(enum fixed_addresses idx,
|
|
|
|
+ unsigned long phys, pgprot_t flags);
|
|
|
|
|
|
-#define set_fixmap(idx, phys) \
|
|
|
|
- __set_fixmap(idx, phys, PAGE_KERNEL)
|
|
|
|
|
|
+#define set_fixmap(idx, phys) \
|
|
|
|
+ __set_fixmap(idx, phys, PAGE_KERNEL)
|
|
/*
|
|
/*
|
|
* Some hardware wants to get fixmapped without caching.
|
|
* Some hardware wants to get fixmapped without caching.
|
|
*/
|
|
*/
|
|
-#define set_fixmap_nocache(idx, phys) \
|
|
|
|
- __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
|
|
|
|
|
|
+#define set_fixmap_nocache(idx, phys) \
|
|
|
|
+ __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
|
|
|
|
|
|
#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
|
|
#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
|
|
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
|
|
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
|