* include/grub/efi/api.h (GRUB_EFI_DEVICE_PATH_LENGTH): Use

	grub_get_unaligned16 rather than shifts.

diff --git a/ChangeLog b/ChangeLog
index da92415d3cce32e899624df2dede8ce177e4811c..727a8c8e3e49c512a9cf3c94503472041f4400cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/efi/api.h (GRUB_EFI_DEVICE_PATH_LENGTH): Use
+       grub_get_unaligned16 rather than shifts.
+
 2013-04-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/file.c: Use const char * rather than casting to

diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 2917d142685ee4c7442dbbc31263d72487adba2b..69bcd0ccf8f0a62ac9910747f1be556539791d2d 100644 (file)
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -553,8 +553,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
 
 #define GRUB_EFI_DEVICE_PATH_TYPE(dp)          ((dp)->type & 0x7f)
 #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp)       ((dp)->subtype)
-#define GRUB_EFI_DEVICE_PATH_LENGTH(dp)                \
-  ((dp)->length[0] | ((grub_efi_uint16_t) ((dp)->length[1]) << 8))
+#define GRUB_EFI_DEVICE_PATH_LENGTH(dp)                (grub_get_unaligned16 ((dp)->length))
 
 /* The End of Device Path nodes.  */
 #define GRUB_EFI_END_DEVICE_PATH_TYPE                  (0xff & 0x7f)