Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346343
b: refs/heads/master
c: 3515b73
h: refs/heads/master
i:
  346341: 1fdb297
  346339: ded773b
  346335: 70f3e9b
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Dec 18, 2012
1 parent f7af251 commit ebd9160
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 275b8b8917b92822442d6739807a3e033ddbeb5e
refs/heads/master: 3515b737d3c1377874c5cba8b7db3d2477da3af3
12 changes: 5 additions & 7 deletions trunk/arch/frv/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,20 +804,18 @@ void __init setup_arch(char **cmdline_p)

BUG_ON(memory_start == memory_end);

init_mm.start_code = (unsigned long) &_stext;
init_mm.end_code = (unsigned long) &_etext;
init_mm.end_data = (unsigned long) &_edata;
init_mm.start_code = (unsigned long) _stext;
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
#if 0 /* DAVIDM - don't set brk just incase someone decides to use it */
init_mm.brk = (unsigned long) &_end;
#else
init_mm.brk = (unsigned long) 0;
#endif

#ifdef DEBUG
printk("KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x BSS=0x%06x-0x%06x\n",
(int) &_stext, (int) &_etext,
(int) &_sdata, (int) &_edata,
(int) &__bss_start, (int) &__bss_stop);
printk("KERNEL -> TEXT=0x%p-0x%p DATA=0x%p-0x%p BSS=0x%p-0x%p\n",
_stext, _etext, _sdata, _edata, __bss_start, __bss_stop);
#endif

#ifdef CONFIG_VT
Expand Down

0 comments on commit ebd9160

Please sign in to comment.