Rev 6934 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6934 | Rev 6936 | ||
---|---|---|---|
Line 17... | Line 17... | ||
17 | #ifndef __ASSEMBLY__ |
17 | #ifndef __ASSEMBLY__ |
18 | #include |
18 | #include |
19 | #include |
19 | #include |
20 | #include |
20 | #include |
21 | #include |
21 | #include |
22 | #include |
- | |
23 | #ifdef CONFIG_X86_32 |
22 | #ifdef CONFIG_X86_32 |
24 | #include |
23 | #include |
25 | #include |
24 | #include |
26 | #else |
25 | #else |
27 | #include |
26 | #include |
Line 70... | Line 69... | ||
70 | FIX_HOLE, |
69 | FIX_HOLE, |
71 | #else |
70 | #else |
72 | #ifdef CONFIG_X86_VSYSCALL_EMULATION |
71 | #ifdef CONFIG_X86_VSYSCALL_EMULATION |
73 | VSYSCALL_PAGE = (FIXADDR_TOP - VSYSCALL_ADDR) >> PAGE_SHIFT, |
72 | VSYSCALL_PAGE = (FIXADDR_TOP - VSYSCALL_ADDR) >> PAGE_SHIFT, |
74 | #endif |
73 | #endif |
75 | #ifdef CONFIG_PARAVIRT_CLOCK |
- | |
76 | PVCLOCK_FIXMAP_BEGIN, |
- | |
77 | PVCLOCK_FIXMAP_END = PVCLOCK_FIXMAP_BEGIN+PVCLOCK_VSYSCALL_NR_PAGES-1, |
- | |
78 | #endif |
- | |
79 | #endif |
74 | #endif |
80 | FIX_DBGP_BASE, |
75 | FIX_DBGP_BASE, |
81 | FIX_EARLYCON_MEM_BASE, |
76 | FIX_EARLYCON_MEM_BASE, |
82 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
77 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
83 | FIX_OHCI1394_BASE, |
78 | FIX_OHCI1394_BASE, |