Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758437Ab3HBJQb (ORCPT ); Fri, 2 Aug 2013 05:16:31 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:20795 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1758281Ab3HBJQQ (ORCPT ); Fri, 2 Aug 2013 05:16:16 -0400 X-IronPort-AV: E=Sophos;i="4.89,800,1367942400"; d="scan'208";a="8098121" From: Tang Chen To: robert.moore@intel.com, lv.zheng@intel.com, rjw@sisk.pl, lenb@kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com, zhangyanfei@cn.fujitsu.com, yanghy@cn.fujitsu.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org Subject: [PATCH v2 RESEND 09/18] x86: Make get_ramdisk_{image|size}() global. Date: Fri, 2 Aug 2013 17:14:28 +0800 Message-Id: <1375434877-20704-10-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1375434877-20704-1-git-send-email-tangchen@cn.fujitsu.com> References: <1375434877-20704-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/02 17:14:47, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/02 17:14:53, Serialize complete at 2013/08/02 17:14:53 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2337 Lines: 84 In the following patches, we need to call get_ramdisk_{image|size}() to get initrd file's address and size. So make these two functions global. v1 -> v2: As tj suggested, make these two function static inline in arch/x86/include/asm/setup.h. Signed-off-by: Tang Chen Reviewed-by: Zhang Yanfei --- arch/x86/include/asm/setup.h | 21 +++++++++++++++++++++ arch/x86/kernel/setup.c | 18 ------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index b7bf350..cfdb55d 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -106,6 +106,27 @@ void *extend_brk(size_t size, size_t align); RESERVE_BRK(name, sizeof(type) * entries) extern void probe_roms(void); + +#ifdef CONFIG_BLK_DEV_INITRD +static inline u64 __init get_ramdisk_image(void) +{ + u64 ramdisk_image = boot_params.hdr.ramdisk_image; + + ramdisk_image |= (u64)boot_params.ext_ramdisk_image << 32; + + return ramdisk_image; +} + +static inline u64 __init get_ramdisk_size(void) +{ + u64 ramdisk_size = boot_params.hdr.ramdisk_size; + + ramdisk_size |= (u64)boot_params.ext_ramdisk_size << 32; + + return ramdisk_size; +} +#endif /* CONFIG_BLK_DEV_INITRD */ + #ifdef __i386__ void __init i386_start_kernel(void); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 53d4ac7..b2ce0dc 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -296,24 +296,6 @@ static void __init reserve_brk(void) } #ifdef CONFIG_BLK_DEV_INITRD - -static u64 __init get_ramdisk_image(void) -{ - u64 ramdisk_image = boot_params.hdr.ramdisk_image; - - ramdisk_image |= (u64)boot_params.ext_ramdisk_image << 32; - - return ramdisk_image; -} -static u64 __init get_ramdisk_size(void) -{ - u64 ramdisk_size = boot_params.hdr.ramdisk_size; - - ramdisk_size |= (u64)boot_params.ext_ramdisk_size << 32; - - return ramdisk_size; -} - #define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT) static void __init relocate_initrd(void) { -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/