x86, mkpiggy: Don't open code put_unaligned_le32()
authorMatt Fleming <matt.fleming@intel.com>
Tue, 28 Feb 2012 13:37:22 +0000 (13:37 +0000)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 28 Feb 2012 18:22:57 +0000 (10:22 -0800)
Use the new headers in tools/include instead of rolling our own
put_unaligned_le32() implementation.

Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1330436245-24875-4-git-send-email-matt@console-pimps.org
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/boot/compressed/Makefile
arch/x86/boot/compressed/mkpiggy.c

index b123b9a..fd55a2f 100644 (file)
@@ -22,6 +22,7 @@ LDFLAGS := -m elf_$(UTS_MACHINE)
 LDFLAGS_vmlinux := -T
 
 hostprogs-y    := mkpiggy
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
 VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
        $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \
index 46a8238..958a641 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-
-static uint32_t getle32(const void *p)
-{
-       const uint8_t *cp = p;
-
-       return (uint32_t)cp[0] + ((uint32_t)cp[1] << 8) +
-               ((uint32_t)cp[2] << 16) + ((uint32_t)cp[3] << 24);
-}
+#include <tools/le_byteshift.h>
 
 int main(int argc, char *argv[])
 {
@@ -69,7 +62,7 @@ int main(int argc, char *argv[])
        }
 
        ilen = ftell(f);
-       olen = getle32(&olen);
+       olen = get_unaligned_le32(&olen);
        fclose(f);
 
        /*