File 0025-uImage-use-char-instead-of-unsigned-char-f... of Package kexec-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch of Package kexec-tools (Revision 12a07694ad13e6a4c9469bd4bd7aaa37)

Currently displaying revision 12a07694ad13e6a4c9469bd4bd7aaa37 , Show latest

From f25146afc5a90bdaa5b518d05eda40410f6744a2 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw@amazon.co.uk>
Date: Wed, 8 Mar 2017 22:41:11 +0000
Subject: [PATCH 25/45] uImage: use 'char *' instead of 'unsigned char *' for
 uImage_load()

This was only ever used on PPC, where they are equivalent and we
never saw the resulting -Wpointer-sign warnings.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 include/kexec-uImage.h            | 4 ++--
 kexec/arch/ppc/kexec-uImage-ppc.c | 2 +-
 kexec/kexec-uImage.c              | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/kexec-uImage.h b/include/kexec-uImage.h
index 4725157bd576..483b578adee1 100644
--- a/include/kexec-uImage.h
+++ b/include/kexec-uImage.h
@@ -2,7 +2,7 @@
 #define __KEXEC_UIMAGE_H__
 
 struct Image_info {
-	const unsigned char *buf;
+	const char *buf;
 	off_t len;
 	unsigned int base;
 	unsigned int ep;
@@ -11,5 +11,5 @@ struct Image_info {
 int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch);
 int uImage_probe_kernel(const unsigned char *buf, off_t len, unsigned int arch);
 int uImage_probe_ramdisk(const unsigned char *buf, off_t len, unsigned int arch);
-int uImage_load(const unsigned char *buf, off_t len, struct Image_info *info);
+int uImage_load(const char *buf, off_t len, struct Image_info *info);
 #endif
diff --git a/kexec/arch/ppc/kexec-uImage-ppc.c b/kexec/arch/ppc/kexec-uImage-ppc.c
index c89a1a77926d..5eec6e418a58 100644
--- a/kexec/arch/ppc/kexec-uImage-ppc.c
+++ b/kexec/arch/ppc/kexec-uImage-ppc.c
@@ -55,7 +55,7 @@ char *slurp_ramdisk_ppc(const char *filename, off_t *r_size)
 {
 	struct Image_info img;
 	off_t size;
-	const unsigned char *buf = slurp_file(filename, &size);
+	const char *buf = slurp_file(filename, &size);
 	int rc;
 
 	/* Check if this is a uImage RAMDisk */
diff --git a/kexec/kexec-uImage.c b/kexec/kexec-uImage.c
index 49f266aa4ecb..2740a26b6d6c 100644
--- a/kexec/kexec-uImage.c
+++ b/kexec/kexec-uImage.c
@@ -136,7 +136,7 @@ int uImage_probe_ramdisk(const unsigned char *buf, off_t len, unsigned int arch)
 #define COMMENT		0x10 /* bit 4 set: file comment present */
 #define RESERVED	0xE0 /* bits 5..7: reserved */
 
-static int uImage_gz_load(const unsigned char *buf, off_t len,
+static int uImage_gz_load(const char *buf, off_t len,
 		struct Image_info *image)
 {
 	int ret;
@@ -225,14 +225,14 @@ static int uImage_gz_load(const unsigned char *buf, off_t len,
 	return 0;
 }
 #else
-static int uImage_gz_load(const unsigned char *UNUSED(buf), off_t UNUSED(len),
+static int uImage_gz_load(const char *UNUSED(buf), off_t UNUSED(len),
 		struct Image_info *UNUSED(image))
 {
 	return -1;
 }
 #endif
 
-int uImage_load(const unsigned char *buf, off_t len, struct Image_info *image)
+int uImage_load(const char *buf, off_t len, struct Image_info *image)
 {
 	const struct image_header *header = (const struct image_header *)buf;
 	const unsigned char *img_buf = buf + sizeof(struct image_header);
-- 
2.13.0

Places

File 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch of Package kexec-tools (Revision 12a07694ad13e6a4c9469bd4bd7aaa37)

Places