Skip to content

Commit

Permalink
sparc: unify sections.h
Browse files Browse the repository at this point in the history
While doing this use standard names for start/end
so we could use definitions straight from asm-generic
for all the typical symbols.

This also allowed us to drop the use of PROVIDE in the linker
script so sprc is less non-standard on this area.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Dec 27, 2008
1 parent b74e34d commit 86ed40b
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 35 deletions.
16 changes: 9 additions & 7 deletions arch/sparc/include/asm/sections.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#ifndef ___ASM_SPARC_SECTIONS_H
#define ___ASM_SPARC_SECTIONS_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm/sections_64.h>
#else
#include <asm/sections_32.h>
#endif
#ifndef __SPARC_SECTIONS_H
#define __SPARC_SECTIONS_H

/* nothing to see, move along */
#include <asm-generic/sections.h>

/* sparc entry point */
extern char _start[];

#endif
6 changes: 0 additions & 6 deletions arch/sparc/include/asm/sections_32.h

This file was deleted.

9 changes: 0 additions & 9 deletions arch/sparc/include/asm/sections_64.h

This file was deleted.

2 changes: 1 addition & 1 deletion arch/sparc/kernel/head_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ sun4c_continue_boot:

/* Zero out our BSS section. */
set __bss_start , %o0 ! First address of BSS
set end , %o1 ! Last address of BSS
set _end , %o1 ! Last address of BSS
add %o0, 0x1, %o0
1:
stb %g0, [%o0]
Expand Down
3 changes: 0 additions & 3 deletions arch/sparc/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ SECTIONS
*(.gnu.warning)
} = 0
_etext = .;
PROVIDE (etext = .);

RO_DATA(PAGE_SIZE)
.data : {
Expand All @@ -69,7 +68,6 @@ SECTIONS
}
/* End of data section */
_edata = .;
PROVIDE (edata = .);

/* init_task */
. = ALIGN(THREAD_SIZE);
Expand Down Expand Up @@ -172,7 +170,6 @@ SECTIONS
*(COMMON)
}
_end = . ;
PROVIDE (end = .);

/DISCARD/ : {
EXIT_TEXT
Expand Down
14 changes: 7 additions & 7 deletions arch/sparc/mm/init_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/pagemap.h>
#include <linux/poison.h>

#include <asm/sections.h>
#include <asm/system.h>
#include <asm/vac-ops.h>
#include <asm/page.h>
Expand All @@ -48,9 +49,6 @@ unsigned long sparc_unmapped_base;

struct pgtable_cache_struct pgt_quicklists;

/* References to section boundaries */
extern char __init_begin, __init_end, _start, _end, etext , edata;

/* Initial ramdisk setup */
extern unsigned int sparc_ramdisk_image;
extern unsigned int sparc_ramdisk_size;
Expand Down Expand Up @@ -450,9 +448,9 @@ void __init mem_init(void)

totalram_pages += totalhigh_pages;

codepages = (((unsigned long) &etext) - ((unsigned long)&_start));
codepages = (((unsigned long) &_etext) - ((unsigned long)&_start));
codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
datapages = (((unsigned long) &edata) - ((unsigned long)&etext));
datapages = (((unsigned long) &_edata) - ((unsigned long)&_etext));
datapages = PAGE_ALIGN(datapages) >> PAGE_SHIFT;
initpages = (((unsigned long) &__init_end) - ((unsigned long) &__init_begin));
initpages = PAGE_ALIGN(initpages) >> PAGE_SHIFT;
Expand All @@ -476,8 +474,10 @@ void __init mem_init(void)
void free_initmem (void)
{
unsigned long addr;
unsigned long freed;

addr = (unsigned long)(&__init_begin);
freed = (unsigned long)(&__init_end) - addr;
for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
struct page *p;

Expand All @@ -490,8 +490,8 @@ void free_initmem (void)
totalram_pages++;
num_physpages++;
}
printk(KERN_INFO "Freeing unused kernel memory: %dk freed\n",
(&__init_end - &__init_begin) >> 10);
printk(KERN_INFO "Freeing unused kernel memory: %ldk freed\n",
freed >> 10);
}

#ifdef CONFIG_BLK_DEV_INITRD
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc/mm/sun4c.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/seq_file.h>
#include <linux/scatterlist.h>

#include <asm/sections.h>
#include <asm/page.h>
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
Expand Down Expand Up @@ -1951,7 +1952,6 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
}

extern void sparc_context_init(int);
extern unsigned long end;
extern unsigned long bootmem_init(unsigned long *pages_avail);
extern unsigned long last_valid_pfn;

Expand All @@ -1962,7 +1962,7 @@ void __init sun4c_paging_init(void)
extern struct resource sparc_iomap;
unsigned long end_pfn, pages_avail;

kernel_end = (unsigned long) &end;
kernel_end = (unsigned long) &_end;
kernel_end = SUN4C_REAL_PGDIR_ALIGN(kernel_end);

pages_avail = 0;
Expand Down

0 comments on commit 86ed40b

Please sign in to comment.