From 7807aa7a21cc49420d927103817749dc93e785cc Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Fri, 20 Jul 2007 17:20:56 -0700 Subject: [PATCH] --- yaml --- r: 62299 b: refs/heads/master c: 1256efd5519a8eca2dfa6039ce5cf58f44d1626d h: refs/heads/master i: 62297: 60d3c5aef5c07031843630cdc38289f2209830aa 62295: 6d36d90d5a99384a9bb233ff20e0e7d9152acec8 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/mdesc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3d6e80bc061a..7aa5c723b821 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0429bf7a099c28b4806b68812b821ef6d1ddbcb +refs/heads/master: 1256efd5519a8eca2dfa6039ce5cf58f44d1626d diff --git a/trunk/arch/sparc64/kernel/mdesc.c b/trunk/arch/sparc64/kernel/mdesc.c index 13a79fe5115b..cce4d0ddf5d5 100644 --- a/trunk/arch/sparc64/kernel/mdesc.c +++ b/trunk/arch/sparc64/kernel/mdesc.c @@ -83,7 +83,7 @@ static void mdesc_handle_init(struct mdesc_handle *hp, hp->handle_size = handle_size; } -static struct mdesc_handle *mdesc_bootmem_alloc(unsigned int mdesc_size) +static struct mdesc_handle * __init mdesc_bootmem_alloc(unsigned int mdesc_size) { struct mdesc_handle *hp; unsigned int handle_size, alloc_size; @@ -123,7 +123,7 @@ static void mdesc_bootmem_free(struct mdesc_handle *hp) } } -static struct mdesc_mem_ops bootmem_mdesc_memops = { +static struct mdesc_mem_ops bootmem_mdesc_ops = { .alloc = mdesc_bootmem_alloc, .free = mdesc_bootmem_free, }; @@ -860,7 +860,7 @@ void __init sun4v_mdesc_init(void) printk("MDESC: Size is %lu bytes.\n", len); - hp = mdesc_alloc(len, &bootmem_mdesc_memops); + hp = mdesc_alloc(len, &bootmem_mdesc_ops); if (hp == NULL) { prom_printf("MDESC: alloc of %lu bytes failed.\n", len); prom_halt();