diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2012-10-15 01:55:37 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2012-10-16 06:43:15 +0200 |
| commit | f4349b6e01c8927a04795885702a173b6a60573c (patch) | |
| tree | 4e25fba2ed13d82c7fe2d65651be47b58aa15292 /arch/xtensa | |
| parent | xtensa: fix missing return in do_page_fault for SIGBUS case (diff) | |
| download | linux-f4349b6e01c8927a04795885702a173b6a60573c.tar.xz linux-f4349b6e01c8927a04795885702a173b6a60573c.zip | |
xtensa: fix boot parameters parsing
Boot parameter tags with handlers are ignored like this:
[ 0.000000] Ignoring tag 0x00001003
[ 0.000000] Ignoring tag 0x00001001
[ 0.000000] Ignoring tag 0x00001004
because neither tagtable entries nor tag handlers appear in the vmlinux.
Fix tagtable definition attributes so that tag entries are not dropped.
Fix end of memory bank calculation in parse_tag_mem: it is intended to
round down to page size, but instead did something strange leading to
hang right after boot.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 270360d9806c..b237988ba6d7 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -100,7 +100,7 @@ typedef struct tagtable { } tagtable_t; #define __tagtable(tag, fn) static tagtable_t __tagtable_##fn \ - __attribute__((unused, __section__(".taglist"))) = { tag, fn } + __attribute__((used, section(".taglist"))) = { tag, fn } /* parse current tag */ @@ -120,7 +120,7 @@ static int __init parse_tag_mem(const bp_tag_t *tag) } sysmem.bank[sysmem.nr_banks].type = mi->type; sysmem.bank[sysmem.nr_banks].start = PAGE_ALIGN(mi->start); - sysmem.bank[sysmem.nr_banks].end = mi->end & PAGE_SIZE; + sysmem.bank[sysmem.nr_banks].end = mi->end & PAGE_MASK; sysmem.nr_banks++; return 0; |