Skip to content

Commit

Permalink
xtensa: use the declarations provided by <asm/sections.h>
Browse files Browse the repository at this point in the history
Cleanups:
  - Include <asm/sections.h>,
  - Remove the (different) extern declarations,
  - Remove the no longer needed address-of ('&') operators,
  - Use %p to format pointer differences.

Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: Chris Zankel <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
geertu authored and torvalds committed Jun 20, 2012
1 parent 0eff08b commit f022d0f
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions arch/xtensa/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@

#include <asm/bootparam.h>
#include <asm/page.h>

/* References to section boundaries */

extern char _stext, _etext, _sdata, _edata, _rodata_end;
extern char __init_begin, __init_end;
#include <asm/sections.h>

/*
* mem_reserve(start, end, must_exist)
Expand Down Expand Up @@ -197,9 +193,9 @@ void __init mem_init(void)
reservedpages++;
}

codesize = (unsigned long) &_etext - (unsigned long) &_stext;
datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
codesize = (unsigned long) _etext - (unsigned long) _stext;
datasize = (unsigned long) _edata - (unsigned long) _sdata;
initsize = (unsigned long) __init_end - (unsigned long) __init_begin;

printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
"%ldk data, %ldk init %ldk highmem)\n",
Expand Down Expand Up @@ -237,7 +233,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)

void free_initmem(void)
{
free_reserved_mem(&__init_begin, &__init_end);
printk("Freeing unused kernel memory: %dk freed\n",
(&__init_end - &__init_begin) >> 10);
free_reserved_mem(__init_begin, __init_end);
printk("Freeing unused kernel memory: %zuk freed\n",
(__init_end - __init_begin) >> 10);
}

0 comments on commit f022d0f

Please sign in to comment.