Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2015-06-10 14:30:15 +0200
committerHannes Reinecke <hare@suse.de>2015-06-10 14:47:26 +0200
commitf64b71ddde1b981d44edb6b5e40b5768e90d4b3f (patch)
tree72e5302d9b9b714f2f9beed09f74d5837564d02f
parent15d79c2d2a91ea9b475bff169ad1a3ef46567f34 (diff)
iscsi_ibft: Define missing 'ibft_addr' (bsc#932047).
-rw-r--r--patches.suse/iscsi_ibft-Define-missing-ibft_addr.patch40
-rw-r--r--series.conf1
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.suse/iscsi_ibft-Define-missing-ibft_addr.patch b/patches.suse/iscsi_ibft-Define-missing-ibft_addr.patch
new file mode 100644
index 0000000000..7447c41516
--- /dev/null
+++ b/patches.suse/iscsi_ibft-Define-missing-ibft_addr.patch
@@ -0,0 +1,40 @@
+From afa16a942ceca5cf360e010f7cfc1151eefd9a5d Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Wed, 10 Jun 2015 14:25:55 +0200
+Subject: iscsi_ibft: Define missing 'ibft_addr'
+References: bsc#932047
+Patch-Mainline: n/a
+
+When compiling with CONFIG_ISCSI_IBFT_FIND disabled the 'ibft_addr'
+symbol is missing. So define it in iscsi_ibft.c for these cases.
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+---
+ drivers/firmware/iscsi_ibft.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
+index 70441f8..8e477b9 100644
+--- a/drivers/firmware/iscsi_ibft.c
++++ b/drivers/firmware/iscsi_ibft.c
+@@ -93,6 +93,17 @@ MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information");
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(IBFT_ISCSI_VERSION);
+
++#ifndef CONFIG_ISCSI_IBFT_FIND
++/*
++ * Physical location of iSCSI Boot Format Table.
++ * Normally defined in iscsi_ibft_find.c, which
++ * is statically compiled in if enabled.
++ * All others need to define it here.
++ */
++struct acpi_table_ibft *ibft_addr;
++EXPORT_SYMBOL_GPL(ibft_addr);
++#endif /* CONFIG_ISCSI_IBFT_FIND */
++
+ struct ibft_hdr {
+ u8 id;
+ u8 version;
+--
+1.8.5.2
+
diff --git a/series.conf b/series.conf
index 38d3b20832..355231b04c 100644
--- a/series.conf
+++ b/series.conf
@@ -18577,6 +18577,7 @@
patches.drivers/qla4xxx-Disable-INTx-interrupt-for-ISP82XX.patch
patches.drivers/qla4xxx-v5.03.00.00.11.4-k0.patch
patches.suse/firmware-iBFT-firmware-is-also-supported-on-EFI-mach.patch
+ patches.suse/iscsi_ibft-Define-missing-ibft_addr.patch
########################################################
# PCMCIA