Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bf04be8 authored by Stratos Psomadakis's avatar Stratos Psomadakis Committed by H. Peter Anvin
Browse files

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: default avatarStratos Psomadakis <psomas@cslab.ece.ntua.gr>
LKML-Reference: <1298666774-17646-2-git-send-email-psomas@cslab.ece.ntua.gr>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 2b15cd96

arch/x86/kernel/asm-offsets.c

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#endif



void common(void) {

	BLANK();

	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);

	DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);

	DEFINE(THREAD_SIZE_asm, THREAD_SIZE);



	BLANK();

	OFFSET(TI_flags, thread_info, flags);

	OFFSET(TI_status, thread_info, status);

arch/x86/kernel/entry_32.S

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ sysenter_past_esp: 
	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words

	 * 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



	pushl_cfi %eax

arch/x86/kernel/head_32.S

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ MAPPING_BEYOND_END = PAGE_TABLE_SIZE(LOWMEM_PAGES) << PAGE_SHIFT 
 */

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)



/*
@@ -623,7 +623,7 @@ ENTRY(initial_code) 
 * BSS section

 */

__PAGE_ALIGNED_BSS

	.align PAGE_SIZE_asm

	.align PAGE_SIZE

#ifdef CONFIG_X86_PAE

initial_pg_pmd:

	.fill 1024*KPMDS,4,0
@@ -644,7 +644,7 @@ ENTRY(swapper_pg_dir) 
#ifdef CONFIG_X86_PAE

__PAGE_ALIGNED_DATA

	/* Page-aligned for the benefit of paravirt? */

	.align PAGE_SIZE_asm

	.align PAGE_SIZE

ENTRY(initial_page_table)

	.long	pa(initial_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */

# if KPMDS == 3
@@ -662,7 +662,7 @@ ENTRY(initial_page_table) 
# else

#  error "Kernel PMDs should be 1, 2 or 3"

# endif

	.align PAGE_SIZE_asm		/* needs to be page-sized too */

	.align PAGE_SIZE		/* needs to be page-sized too */

#endif



.data

arch/x86/xen/xen-head.S

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ ENTRY(startup_xen) 
	__FINIT



.pushsection .text

	.align PAGE_SIZE_asm

	.align PAGE_SIZE

ENTRY(hypercall_page)

	.skip PAGE_SIZE_asm

	.skip PAGE_SIZE

.popsection



	ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS,       .asciz "linux")