diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-18 07:38:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-18 07:38:58 -0800 |
| commit | 70b99eff756e8995b607a9d33f242c1e4f480f32 (patch) | |
| tree | 23b62ad71f77f9cb44622d0be55ff3e4f7e55a00 /arch/powerpc/kernel | |
| parent | 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89 (diff) | |
| parent | 0f6b77ca12bea571e0a97b0588f62aa5f6012d61 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Update a BKL related comment
powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
powerpc: Fix call to subpage_protection()
powerpc: Set CONFIG_32BIT on ppc32
powerpc/mm: Fix build error in setup_initial_memory_limit
powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
powerpc: Fix div64 in bootloader
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 2a178b0ebcdf..ce6f61c6f871 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -497,9 +497,8 @@ static void __init emergency_stack_init(void) } /* - * Called into from start_kernel, after lock_kernel has been called. - * Initializes bootmem, which is unsed to manage page allocation until - * mem_init is called. + * Called into from start_kernel this initializes bootmem, which is used + * to manage page allocation until mem_init is called. */ void __init setup_arch(char **cmdline_p) { |