summaryrefslogtreecommitdiff
path: root/include/linux/iscsi_ibft.h
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2010-02-25 23:37:17 +0300
committerKonrad Rzeszutek Wilk <konrad@kernel.org>2010-05-11 21:02:23 +0400
commit4e639fdf0d0d745648aa62228ab8a0d9c03a563f (patch)
treec6cb611ffc6f3e17e10ca3f39ac00f0e39b1ee4b /include/linux/iscsi_ibft.h
parent94b849aaf6e22ab7bf54b0d0377a882d4892396d (diff)
downloadlinux-4e639fdf0d0d745648aa62228ab8a0d9c03a563f.tar.xz
ibft: Update iBFT handling for v1.03 of the spec.
- Use struct acpi_table_ibft instead of struct ibft_table_header - Don't do reserve_ibft_region() on UEFI machines (section 1.4.3.1) - If ibft_addr isn't initialized when ibft_init() is called, check for ACPI-based tables. - Fix compiler error when CONFIG_ACPI is not defined. Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org> Signed-off-by: Peter Jones <pjones@redhat.com> Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Diffstat (limited to 'include/linux/iscsi_ibft.h')
-rw-r--r--include/linux/iscsi_ibft.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h
index d2e4042f8f5e..8ba7e5b9d62c 100644
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
@@ -21,21 +21,13 @@
#ifndef ISCSI_IBFT_H
#define ISCSI_IBFT_H
-struct ibft_table_header {
- char signature[4];
- u32 length;
- u8 revision;
- u8 checksum;
- char oem_id[6];
- char oem_table_id[8];
- char reserved[24];
-} __attribute__((__packed__));
+#include <acpi/acpi.h>
/*
* Logical location of iSCSI Boot Format Table.
* If the value is NULL there is no iBFT on the machine.
*/
-extern struct ibft_table_header *ibft_addr;
+extern struct acpi_table_ibft *ibft_addr;
/*
* Routine used to find and reserve the iSCSI Boot Format Table. The