From 9267dbffba1af973a801a9e454f8d5b6ea55cf40 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Fri, 7 Sep 2007 03:47:29 +1000 Subject: [PATCH] --- yaml --- r: 67303 b: refs/heads/master c: 3c607ce2a3213f33b8b6b854b5f7db876021e466 h: refs/heads/master i: 67301: 9034cd68313b8e9f5b1eed3def660955f4fe6f54 67299: 3b8c0ab4ba6b8bbc75e9fbd1b88781d03da8d548 67295: 4267760480a85a9e5468e08bd674aa5cafada2ea v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom.c | 8 +++++--- trunk/arch/powerpc/kernel/setup_64.c | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 82e9f2a21bf2..c805a3da27e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70c6cc37db342d9f970884e12744ab5ee290d4ad +refs/heads/master: 3c607ce2a3213f33b8b6b854b5f7db876021e466 diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c index b081413c72d4..172dcc3849a0 100644 --- a/trunk/arch/powerpc/kernel/prom.c +++ b/trunk/arch/powerpc/kernel/prom.c @@ -430,9 +430,11 @@ static int __init early_parse_mem(char *p) } early_param("mem", early_parse_mem); -/* - * The device tree may be allocated below our memory limit, or inside the - * crash kernel region for kdump. If so, move it out now. +/** + * move_device_tree - move tree to an unused area, if needed. + * + * The device tree may be allocated beyond our memory limit, or inside the + * crash kernel region for kdump. If so, move it out of the way. */ static void move_device_tree(void) { diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c index 6018178708a5..3089eaed3256 100644 --- a/trunk/arch/powerpc/kernel/setup_64.c +++ b/trunk/arch/powerpc/kernel/setup_64.c @@ -181,9 +181,9 @@ void __init early_setup(unsigned long dt_ptr) DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr); /* - * Do early initializations using the flattened device - * tree, like retreiving the physical memory map or - * calculating/retreiving the hash table size + * Do early initialization using the flattened device + * tree, such as retrieving the physical memory map or + * calculating/retrieving the hash table size. */ early_init_devtree(__va(dt_ptr));