Skip to content

Commit

Permalink
FRV: Make NOMMU-mode work with base addresses other than 0xC0000000 […
Browse files Browse the repository at this point in the history
…try #2]

Make NOMMU-mode work with base addresses other than 0xC0000000 by:

 (1) Giving the code that sets up the protection registers the right address
     in __sdram_base.  Rather than being hard coded to 0xC0000000, the value
     of __page_offset is obtained from the linker script.

 (2) Eliminate the check in __switch_to() that verifies the current thread
     info is in the 0xCxxxxxxx region.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
David Howells authored and Linus Torvalds committed Apr 10, 2008
1 parent e31c243 commit ed9b949
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion arch/frv/kernel/head.inc
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
#ifdef CONFIG_MMU
__sdram_base = 0x00000000 /* base address to which SDRAM relocated */
#else
__sdram_base = 0xc0000000 /* base address to which SDRAM relocated */
__sdram_base = __page_offset /* base address to which SDRAM relocated */
#endif
7 changes: 0 additions & 7 deletions arch/frv/kernel/switch_to.S
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ __switch_to:
movgs gr14,lr
bar

srli gr15,#28,gr5
subicc gr5,#0xc,gr0,icc0
beq icc0,#0,111f
break
nop
111:

# jump to __switch_back or ret_from_fork as appropriate
# - move prev to GR8
movgs gr4,psr
Expand Down

0 comments on commit ed9b949

Please sign in to comment.