diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 13:52:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 13:52:41 -0400 |
commit | 587a9e1f95794c05419d3bdb4c409a3274849f93 (patch) | |
tree | 0c0e8041fbfa45210345ee58e47f329955e65692 /arch/m68k/mm | |
parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
parent | 9e2760d18b3cf179534bbc27692c84879c61b97c (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Make sys_atomic_cmpxchg_32 work on classic m68k
m68k/apollo: Rename "timer" to "apollo_timer"
zorro: Remove unused zorro_bus.devices
m68k: Remove never used asm/shm.h
m68k/sun3: Remove unselectable code in prom_init()
m68k: Use asm-generic version of <asm/sections.h>
m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop}
mtd/uclinux: Use generic __bss_stop instead of _ebss
m68knommu: Allow ColdFire CPUs to use unaligned accesses
m68k: Remove five unused headers
m68k: CPU32 does not support unaligned accesses
m68k: Introduce config option CPU_HAS_NO_UNALIGNED
m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64
m68k: Move CPU_HAS_* config options
m68k: Remove duplicate FPU config option
m68knommu: Clean up printing of sections
m68k: Use asm-generic version of <asm/types.h>
m68k: Use Kbuild logic to import asm-generic headers
Diffstat (limited to 'arch/m68k/mm')
-rw-r--r-- | arch/m68k/mm/init_mm.c | 2 | ||||
-rw-r--r-- | arch/m68k/mm/init_no.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c index f77f258dce3a..282f9de68966 100644 --- a/arch/m68k/mm/init_mm.c +++ b/arch/m68k/mm/init_mm.c | |||
@@ -104,7 +104,7 @@ void __init print_memmap(void) | |||
104 | MLK_ROUNDUP(__init_begin, __init_end), | 104 | MLK_ROUNDUP(__init_begin, __init_end), |
105 | MLK_ROUNDUP(_stext, _etext), | 105 | MLK_ROUNDUP(_stext, _etext), |
106 | MLK_ROUNDUP(_sdata, _edata), | 106 | MLK_ROUNDUP(_sdata, _edata), |
107 | MLK_ROUNDUP(_sbss, _ebss)); | 107 | MLK_ROUNDUP(__bss_start, __bss_stop)); |
108 | } | 108 | } |
109 | 109 | ||
110 | void __init mem_init(void) | 110 | void __init mem_init(void) |
diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c index 345ec0d83e3d..688e3664aea0 100644 --- a/arch/m68k/mm/init_no.c +++ b/arch/m68k/mm/init_no.c | |||
@@ -91,7 +91,7 @@ void __init mem_init(void) | |||
91 | totalram_pages = free_all_bootmem(); | 91 | totalram_pages = free_all_bootmem(); |
92 | 92 | ||
93 | codek = (_etext - _stext) >> 10; | 93 | codek = (_etext - _stext) >> 10; |
94 | datak = (_ebss - _sdata) >> 10; | 94 | datak = (__bss_stop - _sdata) >> 10; |
95 | initk = (__init_begin - __init_end) >> 10; | 95 | initk = (__init_begin - __init_end) >> 10; |
96 | 96 | ||
97 | tmp = nr_free_pages() << PAGE_SHIFT; | 97 | tmp = nr_free_pages() << PAGE_SHIFT; |