mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
x86, asm: Cleanup unnecssary macros in asm-offsets.c
PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm can be safely removed from asm-offsets.c, and be replaced by their non-'_asm' counterparts in the code that uses them, since the _AC macro defined in include/linux/const.h makes PAGE_SIZE/PAGE_SHIFT/THREAD_SIZE work with as. Signed-off-by: Stratos Psomadakis <psomas@cslab.ece.ntua.gr> LKML-Reference: <1298666774-17646-2-git-send-email-psomas@cslab.ece.ntua.gr> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
parent
2b15cd96e5
commit
7bf04be8f4
4 changed files with 7 additions and 12 deletions
|
@ -28,11 +28,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void common(void) {
|
void common(void) {
|
||||||
BLANK();
|
|
||||||
DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
|
|
||||||
DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
|
|
||||||
DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
|
|
||||||
|
|
||||||
BLANK();
|
BLANK();
|
||||||
OFFSET(TI_flags, thread_info, flags);
|
OFFSET(TI_flags, thread_info, flags);
|
||||||
OFFSET(TI_status, thread_info, status);
|
OFFSET(TI_status, thread_info, status);
|
||||||
|
|
|
@ -395,7 +395,7 @@ sysenter_past_esp:
|
||||||
* A tiny bit of offset fixup is necessary - 4*4 means the 4 words
|
* A tiny bit of offset fixup is necessary - 4*4 means the 4 words
|
||||||
* pushed above; +8 corresponds to copy_thread's esp0 setting.
|
* pushed above; +8 corresponds to copy_thread's esp0 setting.
|
||||||
*/
|
*/
|
||||||
pushl_cfi ((TI_sysenter_return)-THREAD_SIZE_asm+8+4*4)(%esp)
|
pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
|
||||||
CFI_REL_OFFSET eip, 0
|
CFI_REL_OFFSET eip, 0
|
||||||
|
|
||||||
pushl_cfi %eax
|
pushl_cfi %eax
|
||||||
|
|
|
@ -73,7 +73,7 @@ MAPPING_BEYOND_END = PAGE_TABLE_SIZE(LOWMEM_PAGES) << PAGE_SHIFT
|
||||||
*/
|
*/
|
||||||
KERNEL_PAGES = LOWMEM_PAGES
|
KERNEL_PAGES = LOWMEM_PAGES
|
||||||
|
|
||||||
INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm
|
INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
|
||||||
RESERVE_BRK(pagetables, INIT_MAP_SIZE)
|
RESERVE_BRK(pagetables, INIT_MAP_SIZE)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -623,7 +623,7 @@ ENTRY(initial_code)
|
||||||
* BSS section
|
* BSS section
|
||||||
*/
|
*/
|
||||||
__PAGE_ALIGNED_BSS
|
__PAGE_ALIGNED_BSS
|
||||||
.align PAGE_SIZE_asm
|
.align PAGE_SIZE
|
||||||
#ifdef CONFIG_X86_PAE
|
#ifdef CONFIG_X86_PAE
|
||||||
initial_pg_pmd:
|
initial_pg_pmd:
|
||||||
.fill 1024*KPMDS,4,0
|
.fill 1024*KPMDS,4,0
|
||||||
|
@ -644,7 +644,7 @@ ENTRY(swapper_pg_dir)
|
||||||
#ifdef CONFIG_X86_PAE
|
#ifdef CONFIG_X86_PAE
|
||||||
__PAGE_ALIGNED_DATA
|
__PAGE_ALIGNED_DATA
|
||||||
/* Page-aligned for the benefit of paravirt? */
|
/* Page-aligned for the benefit of paravirt? */
|
||||||
.align PAGE_SIZE_asm
|
.align PAGE_SIZE
|
||||||
ENTRY(initial_page_table)
|
ENTRY(initial_page_table)
|
||||||
.long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
|
.long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
|
||||||
# if KPMDS == 3
|
# if KPMDS == 3
|
||||||
|
@ -662,7 +662,7 @@ ENTRY(initial_page_table)
|
||||||
# else
|
# else
|
||||||
# error "Kernel PMDs should be 1, 2 or 3"
|
# error "Kernel PMDs should be 1, 2 or 3"
|
||||||
# endif
|
# endif
|
||||||
.align PAGE_SIZE_asm /* needs to be page-sized too */
|
.align PAGE_SIZE /* needs to be page-sized too */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
.data
|
.data
|
||||||
|
|
|
@ -28,9 +28,9 @@ ENTRY(startup_xen)
|
||||||
__FINIT
|
__FINIT
|
||||||
|
|
||||||
.pushsection .text
|
.pushsection .text
|
||||||
.align PAGE_SIZE_asm
|
.align PAGE_SIZE
|
||||||
ENTRY(hypercall_page)
|
ENTRY(hypercall_page)
|
||||||
.skip PAGE_SIZE_asm
|
.skip PAGE_SIZE
|
||||||
.popsection
|
.popsection
|
||||||
|
|
||||||
ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux")
|
ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux")
|
||||||
|
|
Loading…
Reference in a new issue