diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:49:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 08:49:42 -0700 |
| commit | 66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f (patch) | |
| tree | 98967791a802b95d37bc4035d7bdd27cf260097e /arch/xtensa/kernel/head.S | |
| parent | 6e57559022a2c6e3decfb77a228f8a354ac23ba1 (diff) | |
| parent | 66630f71e23a3b5fe778d38aea2f0c6d017602bf (diff) | |
| download | kernel_samsung_crespo-66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f.zip kernel_samsung_crespo-66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f.tar.gz kernel_samsung_crespo-66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Disable PCI and nfsroot on simulation target
xtensa: Add missing include in coprocessor.h
xtensa: Fix the network driver for the simulator target
xtensa: Shuffle include statements to fix linker script
xtensa: Add -mforce-no-pic option is supported
xtensa: Fixes due to bss boundary symbol name changes.
xtensa: Fix linker script patch-up
xtensa: Fix FLUSH_DCACHE macro for some variants.
Diffstat (limited to 'arch/xtensa/kernel/head.S')
| -rw-r--r-- | arch/xtensa/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index d215adc..3ef91a7 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S @@ -184,8 +184,8 @@ _startup: * Now clear the BSS segment. */ - movi a2, _bss_start # start of BSS - movi a3, _bss_end # end of BSS + movi a2, __bss_start # start of BSS + movi a3, __bss_stop # end of BSS __loopt a2, a3, a4, 2 s32i a0, a2, 0 |