aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-04-01 14:32:43 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-04-01 16:12:48 -0700
commit042be38e6106ed70b42d096ab4a1ed4187e510e6 (patch)
treefb3599873f28cf36dbc76b6cd0a84f3e89e5e8cb /include
parentb4a5e8a1deca7e61ebaffb37344766b0f0e9f327 (diff)
downloadmrst-s0i3-test-042be38e6106ed70b42d096ab4a1ed4187e510e6.tar.gz
mrst-s0i3-test-042be38e6106ed70b42d096ab4a1ed4187e510e6.tar.xz
mrst-s0i3-test-042be38e6106ed70b42d096ab4a1ed4187e510e6.zip
ibft, x86: Change reserve_ibft_region() to find_ibft_region()
This allows arch code could decide the way to reserve the ibft. And we should reserve ibft as early as possible, instead of BOOTMEM stage, in case the table is in RAM range and is not reserved by BIOS (this will often be the case.) Move to just after find_smp_config(). Also when CONFIG_NO_BOOTMEM=y, We will not have reserve_bootmem() anymore. -v2: fix typo about ibft pointed by Konrad Rzeszutek Wilk <konrad@darnok.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <4BB510FB.80601@kernel.org> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Peter Jones <pjones@redhat.com> Cc: Konrad Rzeszutek Wilk <konrad@kernel.org> CC: Jan Beulich <jbeulich@novell.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/iscsi_ibft.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h
index 6092487e295..d2e4042f8f5 100644
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
@@ -42,9 +42,13 @@ extern struct ibft_table_header *ibft_addr;
* mapped address is set in the ibft_addr variable.
*/
#ifdef CONFIG_ISCSI_IBFT_FIND
-extern void __init reserve_ibft_region(void);
+unsigned long find_ibft_region(unsigned long *sizep);
#else
-static inline void reserve_ibft_region(void) { }
+static inline unsigned long find_ibft_region(unsigned long *sizep)
+{
+ *sizep = 0;
+ return 0;
+}
#endif
#endif /* ISCSI_IBFT_H */