diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-20 19:11:48 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-20 19:11:48 +0100 |
| commit | dd19802f2a224486c7f9a43bccd92e36c25afed9 (patch) | |
| tree | fff94fd674f5d25604dc13447577f9a9f84a1835 /lib/vsprintf.c | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
Merge branch 'uuid-types' of git://git.infradead.org/users/hch/uuid into aarch64/for-next/ras-apei
Pull in uuid-types branch from Christoph, since this conflicts heavily
with the ACPI/APEI RAS work from Tyler Baicer and was created as an
immutable branch to avoid conflicts with ACPI development.
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 2d41de3f98a1..9f37d6208e99 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1308,14 +1308,14 @@ char *uuid_string(char *buf, char *end, const u8 *addr, char uuid[UUID_STRING_LEN + 1]; char *p = uuid; int i; - const u8 *index = uuid_be_index; + const u8 *index = uuid_index; bool uc = false; switch (*(++fmt)) { case 'L': uc = true; /* fall-through */ case 'l': - index = uuid_le_index; + index = guid_index; break; case 'B': uc = true; |