include/linux/efi.h: redefine type, constant, macro from generic code (ba7e34b1) · Commits · 戴 / test

Generic UUID library defines structure type, macro to define UUID, and the length of the UUID string. This patch removes duplicate data structure definition, UUID string length constant as well as macro for UUID handling. Signed-off-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by:

Matt Fleming <matt@codeblueprint.co.uk> Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/linux/efi.h

+4 −10

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <linux/pfn.h>
		#include <linux/pstore.h>
		#include <linux/reboot.h>
		#include <linux/uuid.h>
		#include <linux/screen_info.h>

		#include <asm/page.h>
		@@ -44,17 +45,10 @@ typedef u16 efi_char16_t; /* UNICODE character */
		typedef u64 efi_physical_addr_t;
		typedef void *efi_handle_t;


		typedef struct {
		u8 b[16];
		} efi_guid_t;
		typedef uuid_le efi_guid_t;

		#define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
		((efi_guid_t) \
		{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
		(b) & 0xff, ((b) >> 8) & 0xff, \
		(c) & 0xff, ((c) >> 8) & 0xff, \
		(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
		UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)

		/*
		* Generic EFI table header
		@@ -1117,7 +1111,7 @@ extern int efi_status_to_err(efi_status_t status);
		* Length of a GUID string (strlen("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"))
		* not including trailing NUL
		*/
		#define EFI_VARIABLE_GUID_LEN 36
		#define EFI_VARIABLE_GUID_LEN UUID_STRING_LEN

		/*
		* The type of search to perform when calling boottime->locate_handle

Admin message