Cleanup of asm-offsets.c(PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm)
Subsystems (2)
PATCH 1/1 Cleanup of asm-offsets.c(PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm)
I noticed that PAGE_SIZE_asm, PAGE_SHIFT_asm, and THREAD_SIZE_asm in asm-offsets.c were no longer needed(since the _AC macro defined in include/linux/const.h makes PAGE_SIZE etc 'work' with as).
Unless I'm missing something here, 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.
Right?
The kernel builds cleanly after the patch is applied.
(I know that even if the patch is 'correct', it's as 'important', as a patch fixing typos in comments/documentation, but anyway :/ )
--- arch/mn10300/kernel/asm-offsets.c | 2 +- arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 +- arch/x86/kernel/asm-offsets_32.c | 4 ---- arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/head_32.S | 8 ++++---- arch/x86/xen/xen-head.S | 4 ++-- 7 files changed, 9 insertions(+), 14 deletions(-)
arch/mn10300/kernel/asm-offsets.c +1 -1
@@ -89,7 +89,7 @@ void foo(void)OFFSET (EXEC_DOMAIN_handler, exec_domain, handler);OFFSET (RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); +DEFINE (PAGE_SIZE ,PAGE_SIZE );OFFSET (__rx_buffer, mn10300_serial_port, rx_buffer);OFFSET (__rx_inp, mn10300_serial_port, rx_inp);
arch/mn10300/kernel/gdb-io-ttysm-low.S +1 -1
@@ -38,7 +38,7 @@ gdbstub_io_rx_handler: gdbstub_io_rx_more: mov a3,a2 add 2,a3 - and PAGE_SIZE_asm-1,a3 + and PAGE_SIZE-1,a3 mov (gdbstub_rx_outp),d3 cmp a3,d3 beq gdbstub_io_rx_overflow
arch/x86/kernel/asm-offsets_32.c +0 -4
@@ -97,10 +97,6 @@ void foo(void) DEFINE(TSS_sysenter_sp0, offsetof(struct tss_struct, x86_tss.sp0) -sizeof (struct tss_struct )); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); -DEFINE (PAGE_SHIFT_asm,PAGE_SHIFT ); -DEFINE (THREAD_SIZE_asm,THREAD_SIZE ); -OFFSET (crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);#ifdef CONFIG_PARAVIRT
arch/x86/kernel/asm-offsets_64.c +0 -1
@@ -129,7 +129,6 @@ int main(void)OFFSET (BP_kernel_alignment, boot_params, hdr.kernel_alignment);BLANK (); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE );#ifdef CONFIG_XEN BLANK ();OFFSET (XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
arch/x86/kernel/entry_32.S +1 -1
@@ -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
@@ -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
@@ -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")
Signature · 1 line
1.7.4.1
[ Added Cc to those that may care ]
Quoted 9 lines · Stratos Psomadakis
I noticed that
PAGE_SIZE_asm,PAGE_SHIFT_asm, andTHREAD_SIZE_asminasm-offsets.cwere no longerneeded(since the _AC macro defined in include/linux/const.h makes PAGE_SIZE etc 'work' with as).Unless I'm missing something here, 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.
Right?
Quoted 4 lines
The kernel builds cleanly after the patch is applied.
(I know that even if the patch is 'correct', it's as 'important', as a patch fixing typos in comments/documentation, but anyway :/ )
This patch makes sense to me.
-- Steve
Quoted 143 lines
Signed-off-by Stratos Psomadakis <[email protected]>--- arch/mn10300/kernel/asm-offsets.c | 2 +- arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 +- arch/x86/kernel/asm-offsets_32.c | 4 ---- arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/head_32.S | 8 ++++---- arch/x86/xen/xen-head.S | 4 ++-- 7 files changed, 9 insertions(+), 14 deletions(-)arch/mn10300/kernel/asm-offsets.c +1
-1@@ -89,7 +89,7 @@ void foo(void)OFFSET (EXEC_DOMAIN_handler, exec_domain, handler);OFFSET (RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); +DEFINE (PAGE_SIZE ,PAGE_SIZE );OFFSET (__rx_buffer, mn10300_serial_port, rx_buffer);OFFSET (__rx_inp, mn10300_serial_port, rx_inp);arch/mn10300/kernel/gdb-io-ttysm-low.S +1
-1@@ -38,7 +38,7 @@ gdbstub_io_rx_handler: gdbstub_io_rx_more: mov a3,a2 add 2,a3 - and PAGE_SIZE_asm-1,a3 + and PAGE_SIZE-1,a3 mov (gdbstub_rx_outp),d3 cmp a3,d3 beq gdbstub_io_rx_overflowarch/x86/kernel/asm-offsets_32.c +0
-4@@ -97,10 +97,6 @@ void foo(void) DEFINE(TSS_sysenter_sp0, offsetof(struct tss_struct, x86_tss.sp0) -sizeof (struct tss_struct )); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); -DEFINE (PAGE_SHIFT_asm,PAGE_SHIFT ); -DEFINE (THREAD_SIZE_asm,THREAD_SIZE ); -OFFSET (crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);#ifdef CONFIG_PARAVIRT arch/x86/kernel/asm-offsets_64.c +0
-1@@ -129,7 +129,6 @@ int main(void)OFFSET (BP_kernel_alignment, boot_params, hdr.kernel_alignment);BLANK (); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE );#ifdef CONFIG_XEN BLANK ();OFFSET (XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);arch/x86/kernel/entry_32.S +1
-1@@ -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 %eaxarch/x86/kernel/head_32.S +4
-4@@ -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 .dataarch/x86/xen/xen-head.S +2
-2@@ -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")Signature · 7 lines
1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
cover Cleanup of asm-offsets.c(PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm)
In reply to Stratos PsomadakisFixed a typo, resending.
PATCH RESEND 1/1 Cleanup of asm-offsets.c(PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm)
Cleanup of 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.
--- arch/mn10300/kernel/asm-offsets.c | 2 -- arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 +- arch/x86/kernel/asm-offsets_32.c | 4 ---- arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/head_32.S | 8 ++++---- arch/x86/xen/xen-head.S | 4 ++-- 7 files changed, 8 insertions(+), 15 deletions(-)
arch/mn10300/kernel/asm-offsets.c +0 -2
@@ -89,8 +89,6 @@ void foo(void)OFFSET (EXEC_DOMAIN_handler, exec_domain, handler);OFFSET (RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); -OFFSET (__rx_buffer, mn10300_serial_port, rx_buffer);OFFSET (__rx_inp, mn10300_serial_port, rx_inp);OFFSET (__rx_outp, mn10300_serial_port, rx_outp);
arch/mn10300/kernel/gdb-io-ttysm-low.S +1 -1
@@ -38,7 +38,7 @@ gdbstub_io_rx_handler: gdbstub_io_rx_more: mov a3,a2 add 2,a3 - and PAGE_SIZE_asm-1,a3 + and PAGE_SIZE-1,a3 mov (gdbstub_rx_outp),d3 cmp a3,d3 beq gdbstub_io_rx_overflow
arch/x86/kernel/asm-offsets_32.c +0 -4
@@ -97,10 +97,6 @@ void foo(void) DEFINE(TSS_sysenter_sp0, offsetof(struct tss_struct, x86_tss.sp0) -sizeof (struct tss_struct )); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); -DEFINE (PAGE_SHIFT_asm,PAGE_SHIFT ); -DEFINE (THREAD_SIZE_asm,THREAD_SIZE ); -OFFSET (crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);#ifdef CONFIG_PARAVIRT
arch/x86/kernel/asm-offsets_64.c +0 -1
@@ -129,7 +129,6 @@ int main(void)OFFSET (BP_kernel_alignment, boot_params, hdr.kernel_alignment);BLANK (); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE );#ifdef CONFIG_XEN BLANK ();OFFSET (XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
arch/x86/kernel/entry_32.S +1 -1
@@ -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
@@ -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
@@ -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")
Signature · 1 line
1.7.4.1
H. Peter Anvin
reviewerQuoted 8 lines · Stratos Psomadakis
Cleanup of
asm-offsets.c.
PAGE_SIZE_asm,PAGE_SHIFT_asm,THREAD_SIZE_asmcan be safely removed fromasm-offsets.c, and be replaced by their non-'_asm' counterparts in the code that uses them, since the_ACmacro defined ininclude/linux/const.hmakes PAGE_SIZE/PAGE_SHIFT/THREAD_SIZE work with as.Signed-off-by Stratos Psomadakis <[email protected]>
Quoted 10 lines
--- arch/mn10300/kernel/asm-offsets.c | 2 -- arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 +- arch/x86/kernel/asm-offsets_32.c | 4 ---- arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/head_32.S | 8 ++++---- arch/x86/xen/xen-head.S | 4 ++-- 7 files changed, 8 insertions(+), 15 deletions(-)
Looks good, but please separate the mn10300 and x86 chunks into separate patches.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
cover Cleanup asm-offsets.c(PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm)
In reply to Stratos PsomadakisSplit into separate x86 and mn10300 patches.
PATCH 1/2 Cleanup x86 asm-offsets.c(PAGE_SIZE_asm, PAGE_SHIFT_asm, THREAD_SIZE_asm)
--- arch/x86/kernel/asm-offsets_32.c | 4 ---- arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/head_32.S | 8 ++++---- arch/x86/xen/xen-head.S | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-)
arch/x86/kernel/asm-offsets_32.c +0 -4
@@ -97,10 +97,6 @@ void foo(void) DEFINE(TSS_sysenter_sp0, offsetof(struct tss_struct, x86_tss.sp0) -sizeof (struct tss_struct )); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); -DEFINE (PAGE_SHIFT_asm,PAGE_SHIFT ); -DEFINE (THREAD_SIZE_asm,THREAD_SIZE ); -OFFSET (crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);#ifdef CONFIG_PARAVIRT
arch/x86/kernel/asm-offsets_64.c +0 -1
@@ -129,7 +129,6 @@ int main(void)OFFSET (BP_kernel_alignment, boot_params, hdr.kernel_alignment);BLANK (); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE );#ifdef CONFIG_XEN BLANK ();OFFSET (XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
arch/x86/kernel/entry_32.S +1 -1
@@ -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
@@ -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
@@ -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")
Signature · 1 line
1.7.4.1
[tip:x86/asm] x86, asm: Cleanup unnecssary macros in asm-offsets.c
Commit-ID: 7bf04be8f48ceeeffa5b5a79734d6d6e0d59e5f8 Gitweb: http://git.kernel.org/tip/7bf04be8f48ceeeffa5b5a79734d6d6e0d59e5f8 Author: Stratos Psomadakis <[email protected]> AuthorDate: Fri, 25 Feb 2011 22:46:13 +0200 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 25 Feb 2011 16:37:32 -0800
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.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/asm-offsets.c | 5 ----- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/head_32.S | 8 ++++---- arch/x86/xen/xen-head.S | 4 ++-- 4 files changed, 7 insertions(+), 12 deletions(-)
arch/x86/kernel/asm-offsets.c +0 -5
@@ -29,11 +29,6 @@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);OFFSET (TI_addr_limit, thread_info, addr_limit);
arch/x86/kernel/entry_32.S +1 -1
@@ -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
@@ -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
@@ -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")
PATCH 2/2 Cleanup mn10300 asm-offsets.c(PAGE_SIZE_asm)
In reply to Stratos Psomadakis--- arch/mn10300/kernel/asm-offsets.c | 2 -- arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)
arch/mn10300/kernel/asm-offsets.c +0 -2
@@ -89,8 +89,6 @@ void foo(void)OFFSET (EXEC_DOMAIN_handler, exec_domain, handler);OFFSET (RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext); -DEFINE (PAGE_SIZE_asm,PAGE_SIZE ); -OFFSET (__rx_buffer, mn10300_serial_port, rx_buffer);OFFSET (__rx_inp, mn10300_serial_port, rx_inp);OFFSET (__rx_outp, mn10300_serial_port, rx_outp);
arch/mn10300/kernel/gdb-io-ttysm-low.S +1 -1
@@ -38,7 +38,7 @@ gdbstub_io_rx_handler: gdbstub_io_rx_more: mov a3,a2 add 2,a3 - and PAGE_SIZE_asm-1,a3 + and PAGE_SIZE-1,a3 mov (gdbstub_rx_outp),d3 cmp a3,d3 beq gdbstub_io_rx_overflow
Signature · 1 line
1.7.4.1