From patchwork Sat Jul 18 19:57:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 497397 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DA70B14077D for ; Sun, 19 Jul 2015 05:58:32 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id B33171A19FF for ; Sun, 19 Jul 2015 05:58:32 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0117.outbound.protection.outlook.com [157.56.110.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 168811A0CEC for ; Sun, 19 Jul 2015 05:57:37 +1000 (AEST) Authentication-Results: verge.net.au; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.49) by BY1PR03MB1482.namprd03.prod.outlook.com (10.162.210.140) with Microsoft SMTP Server (TLS) id 15.1.213.14; Sat, 18 Jul 2015 19:57:28 +0000 From: Scott Wood To: Simon Horman Subject: [PATCH 1/2] ppc64: Fix warnings Date: Sat, 18 Jul 2015 14:57:18 -0500 Message-ID: <1437249439-31496-1-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BN1PR02CA0026.namprd02.prod.outlook.com (10.141.56.26) To BY1PR03MB1482.namprd03.prod.outlook.com (25.162.210.140) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 2:LMKEAaNInTZGH8Y50hzrFAewN3gbw1CZEq1ArCr/g3jtdN6R3iuVYEKhRka+ZKhF; 3:RPzm8xB0YsIlKxp/IIiF7LC3g6NWG/LyX0fV2x62rivre58jimMh/r1dhKumDZqaGOsIfjWAvvUSxE1vXtjdyoVG3fbCG9V0yAxWcGHLPKxs3TCDUfjxXS6Vyee8l9zCAvZqoxIP+vWVux96wahpIg==; 25:K518KxQMsQsN1TofE7hpIP0l9XMreP0jDS3mieMod2g17aRK8EN7TdpGduGZay0DvfgSlbi9WszQiKWnICBybiC0rdQ7BnNtpgYgDn9wT//n3j212K5nkd+pymt1oJgkJwZDJ1vxfvDIc8lkDZ3x9YUqDzGP0Og0KjijOG3iHbBgHKrJ9iEKtPM5MV2odPX+EXYOz0gzKGqoys/6aQ1bHpMdv0/WB3b/mfFhMLqrhwpL4cY4g4cKzNozRIrw527EXowlCNjiQAlHHTvib6An9A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1482; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 20:5aZXO2IfXYNFe0UPC23YrcLMv8NrnW7QBVFmhy77nnwmzulcG0QmrQL6J6aoj+JhyWrGqVBycEwC5FZVd3/4bkqJ0FVihdSHZz2vVHI0Ala3/BdrtrLzlP8RtvXJJ9okmOm4N7g3ndgdJ7K0fxo7rn/yCJHSouo6qy9F7u/rHy2g8fz3sqSBmIb4L53MSuxmdUlBkoK341296UhyIx3/pvN3mdNFtRpYaDIeBYNRd9M4MiFqqvk/aNaKVWoWVt36XKJRuunDoVvAh3Jm5+yGGGpnT9fmgZ4jifG1wDSYOu4dVwoj22qLk4Yr8RKM38jPpaunfFXHEq8Gr2hM4PcOySc9gS6i9J1rRSTF/CjoxZ2Jr8CN0AN13b2FVpoFtYPXBIZHer90ETwBU2SEszdRDygtQKsCjByKHbm89bDsA+19/FHlT/BGlCHBDiX2SimFMq6Kz0VyMk3jOtjZJD3EjEXpZXrsdJyHqwL7Ri0B03eNk4mB8FEVPPRoPCkweboI; 4:8zTkEpbhZanWN0nh/1xt8JcMrz0CleSxVNm3ultTeAy/anOAg49c8+uL8yYm2rRelk0G62Ro8wB4PhGN+8WYQaxjdBlwB6CgEsILVivJfnwBE2m5W+ZhFKeH4nobiwKqWs3k9zFcVGvMMd3klWuPDg7T58TIw9w2V0Pg/veXG8vvTC3jIyc4AykKhqZFmBPR8wpZBsSrRrokcXONg8b+SuYYpJ0LAqmzaoB/hfCorHp8s51k+GjmAHHDM39dATGjZhwShkw7uMCATngNDR5jqMEzUgVmKoQj3oj3NHHmbyM= BY1PR03MB1482: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY1PR03MB1482; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1482; X-Forefront-PRVS: 0641678E68 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(229853001)(92566002)(48376002)(19580395003)(66066001)(19580405001)(86362001)(62966003)(189998001)(77156002)(47776003)(40100003)(50466002)(50986999)(110136002)(5001960100002)(107886002)(122386002)(77096005)(36756003)(42186005)(46102003)(33646002)(87976001)(5003940100001)(50226001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1482; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 23:RKzAeeT61RomVHujf8M8cx0fVdqqIFrr0cCEvODto9VkYquiJfFSpsDfwhYZ+dTjNqZ+J3y8Q4ACqAmR8IXRqzLrZ8FxOlX0KrE36u7AN/QfdgP6yZhvkNf0jnF4zo4EClHfGOcUo2iHAPAZCzwmJH22Z55snDq4gPAe7TVJcX+3BxHt7SkXOH5d83sflOnlHQoRhPoon0eUiI0SJgH5JTZVMWx7wkH8iG0iZqJ2LnJLs8jbPr+YurTHxnI+vO4VPicRDjy8DkzTP69rfkXIvXZyz/QAYI+hBz0tOr2Yx6kg5QQox1HVVpnSGTOWQfxjaIvVsZwvWKDYHgQ5aW2k43qjbu2kAqBwdU6XFgat1MtfA2kCoyaxJlyQ4nwptjP9z5yqZcYx2wC/MgeqOEQcm+rUWKlhsnsLgksJj3lp/3Z2FbRNopSGW1o+ztkHQ2wolgRIyRSCPzPutX+TlDlc70abPvL0ZCvsbI8CiYNIjbUlU5C0XG+YN0CWlKvR/UQrwRX/N9ntf6mrEOpP4s9GzuLY69fsjXtisj3IkPjawx+4LL1CCoESxNZGHso1gKAg9r8Mbv64H0rfeoaioDCk7H8r3Td1QqxXQaRvPXOAK3WZUwEVWNG08/FKBVtkR26W1cSrSCIh/2AV+6bxzeJH/p7+HE9SN1+LmhW8sQE6zr78VVNk+i1Uw1YErcpBNd/WY9Kmq0DfdpzLNV2cxwyY++2FJUEyMsxJd7jYiP2HI96H6ZYugDk8NbGmRiv3PveJcU4lsxokaco1BBmbiMF4Q0OrYhPtZrbQ1/zWW/RxdpE=; 5:QnMc+wTk9E0P6Uc2EUxvfM+qcHzXPjsJe6LFkyZODqx/9+zPsmosrnekZL4Qjdk4xOGGAJvjrQ3fYe2pQzTn7k1B9pUSvZbXtClPy+/kRQG6RjdKRC9XKiTAblF1TlPk2pwg6EraEop3hBwshaqWvg== X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1482; 24:Vl6G1KylOyR7m3SXuIX9iEobmmBSuNkHqVVytjxECmbxjGHOoq8jHrZIttxv9cttXN/ZIKARqHxNPvwLGND37A9bOlVBlSzhF2olOzDrMOM=; 20:se6B/m30lob8naxEI8Bbwgcncnr3dlLh5gnO6J/pJbmCGtTKUldbU6KYV76Y5c9/kMEGKd23MRm59Fz+eCtf9w== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 19:57:28.8985 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1482 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Produce a warning-free build on ppc64 (at least, when built as 64-bit userspace -- if a 64-bit binary for ppc64 is a requirement, why is -m64 set only on purgatory?). Mostly unused (or write-only) variable warnings, but also one nasty one where reserve() was used without a prototype, causing long long arguments to be passed as int. Signed-off-by: Scott Wood --- kexec/arch/ppc64/crashdump-ppc64.c | 3 ++- kexec/arch/ppc64/kexec-elf-ppc64.c | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kexec/arch/ppc64/crashdump-ppc64.c b/kexec/arch/ppc64/crashdump-ppc64.c index 6214b83..b3c8928 100644 --- a/kexec/arch/ppc64/crashdump-ppc64.c +++ b/kexec/arch/ppc64/crashdump-ppc64.c @@ -33,6 +33,7 @@ #include "../../kexec-syscall.h" #include "../../crashdump.h" #include "kexec-ppc64.h" +#include "../../fs2dt.h" #include "crashdump-ppc64.h" static struct crash_elf_info elf_info64 = @@ -187,7 +188,7 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges) DIR *dir, *dmem; FILE *file; struct dirent *dentry, *mentry; - int i, n, crash_rng_len = 0; + int n, crash_rng_len = 0; unsigned long long start, end; int page_size; diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c index 4a1540e..adcee4c 100644 --- a/kexec/arch/ppc64/kexec-elf-ppc64.c +++ b/kexec/arch/ppc64/kexec-elf-ppc64.c @@ -97,7 +97,6 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, struct mem_ehdr ehdr; char *cmdline, *modified_cmdline = NULL; const char *devicetreeblob; - int cmdline_len, modified_cmdline_len; uint64_t max_addr, hole_addr; char *seg_buf = NULL; off_t seg_size = 0; @@ -107,7 +106,6 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, uint64_t *rsvmap_ptr; struct bootblock *bb_ptr; #endif - int i; int result, opt; uint64_t my_kernel, my_dt_offset; uint64_t my_opal_base = 0, my_opal_entry = 0; @@ -162,10 +160,7 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, } } - cmdline_len = 0; - if (cmdline) - cmdline_len = strlen(cmdline) + 1; - else + if (!cmdline) fprintf(stdout, "Warning: append= option is not passed. Using the first kernel root partition\n"); if (ramdisk && reuse_initrd) @@ -181,7 +176,6 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, strncpy(modified_cmdline, cmdline, COMMAND_LINE_SIZE); modified_cmdline[COMMAND_LINE_SIZE - 1] = '\0'; } - modified_cmdline_len = strlen(modified_cmdline); } /* Parse the Elf file */ @@ -219,7 +213,6 @@ int elf_ppc64_load(int argc, char **argv, const char *buf, off_t len, return -1; /* Use new command line. */ cmdline = modified_cmdline; - cmdline_len = strlen(modified_cmdline) + 1; } /* Add v2wrap to the current image */