From patchwork Tue Oct 6 22:55:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 527047 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 6B2C0140D93 for ; Wed, 7 Oct 2015 09:57:06 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4C0281A0281 for ; Wed, 7 Oct 2015 09:57:06 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0140.outbound.protection.outlook.com [207.46.100.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 433FE1A0017 for ; Wed, 7 Oct 2015 09:56:07 +1100 (AEDT) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from snotra.am.freescale.net (192.88.168.49) by BN3PR03MB1477.namprd03.prod.outlook.com (10.163.35.140) with Microsoft SMTP Server (TLS) id 15.1.286.20; Tue, 6 Oct 2015 22:55:59 +0000 From: Scott Wood To: Simon Horman Subject: [PATCH v2 1/3] ppc64: Fix warnings Date: Tue, 6 Oct 2015 17:55:48 -0500 Message-ID: <1444172150-29493-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: BY2PR1001CA0051.namprd10.prod.outlook.com (25.164.163.19) To BN3PR03MB1477.namprd03.prod.outlook.com (25.163.35.140) X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1477; 2:kzEsV+CHAr83+VRdEOsBBZjsFPqdX+v4v6/DRKHv2aWbXfAj3vczPPmZebDssgF6Ljs5DULdKQanGmv3cDRche/F8iNEm9ez2F7KHbnlYFx43VuywhE4iSEAP2Tdlzp8wOTkkLHRaNiqoYHnAXMjVP2HlHVGhleInF4uvCW8r50=; 3:Frj9Pql7PV4/pfrYwwhGIdK32O3lspG6Z/v7PF/fe62zPBQhZKfjG1X68iLGvylFByRS2YI/GqK/wMTbeA6b8u4o9+QvcNND9JbjEAjlZJw/GgEQ2Se6E8y3qcTr4YMTzHCrlUpuHrvVBFowXgSZtw==; 25:SG0Zc5+xHSatbfSWWgo7zOWalJWjBFjI1WJ5o2Kg7Hh4ZR7vC5n+OxmVPBcKL7uA/OW7pYy8uB5t8o/RyKC0cf2gx6fNEH6vuvgxfAKc6PZkt6tc1dRT7Pgz1ZyCKQR3M8ZW2P8v+V5skk6gUqmlxAKX5pH0S64WxGc0m8WNuuZ+/zBvNi5Gf4HVVO+RpNYiFgmbi7EgEhr+9GqiQkOSPLbZDJc3q9wX1V3emju5zftTJv3r8zP1W7ql9gr89OMQBdDZzIKwKft8N+Ldm1+JSQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1477; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1477; 20:w1++P0XbegXkQXq9ulz7LA7QltHqhOw+46IgmgtgkbGM0hALBzeAYGrZG81/7Qol9FvPVKKXyj3xeMQLPZrXV9XrA0vdsyFedMXtAIgYoP83fBcsaFt0BcZLWU45y/KEdvzIulhR/5NY74yzW4z2TXeTzS4rw1mEPByr/xw1Qp4cr0zc9e9CZXwi5YToWI/QrkM7S65+RGcQOo+WyBZMBy/lJmune1RrRm7EBBa+a88VcmXlRG4kU2ArSCLBiN3XBHmsHD4GHKrbglAwLOYKwpNnS/QMkR+7dKg8ZeWzz/2eY/HkDa/+xPcy8+3GcXzk1icGOK/dRuOoBnnV7/goAY5JYQIa27nT9HjDGb1Hpojlk1GPoA0kGFZGozyVn2hy3PxL3y4eGxpSnCyhfHBHnJLnk+vWf9Sn3iLA2KWeZeDcaulXkxX9qG4/0DSZjMttcQkXrLL7qtvHBHm8FPiAm9YV80Il7wzl0bTMre1yrc89n/huXxzShg37w0bfxEB9; 4:FyOqo1ZZHhodiP0kQn6hSPttgHr4E1z9eQRnPysn3tk2+Zgp8TRPH6OnoqecE7bPYPtIEbilZBtz4JrP1A6zCCYUi9DtbVQONL8S9XyTLH0Y9bD6y27EYCNicqjmemFBR99HF/UJLnqe2osGsZyFzY//G/J8bs5PCoRHxmYocCgXBtoGpzVqSC/Ij5Z15VaEg4FgLlVKXzk1LSKUZKY+6vxsDIye/3K/Hy8MGTS2UY6a0dKbzwSeEOOl59xr7KaxIu9TvflqJ3DftQtd7QaEy4QYW5dp+4aCK0kMz6zzP+qhba6QdzY0K3XN7JCLz+6BUQBNnIxE2koUEahl7fbDJ+1BI8DmDuRfdldqyEbIb48= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001); SRVR:BN3PR03MB1477; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1477; X-Forefront-PRVS: 07215D0470 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(50466002)(87976001)(19580405001)(77096005)(66066001)(64706001)(47776003)(110136002)(5001960100002)(105586002)(48376002)(189998001)(107886002)(46102003)(33646002)(40100003)(229853001)(5003940100001)(5008740100001)(5004730100002)(122386002)(86362001)(19580395003)(106356001)(97736004)(36756003)(5001920100001)(50226001)(101416001)(81156007)(50986999)(92566002)(5007970100001)(42186005)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB1477; H:snotra.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1477; 23:8zh0EII00p6FRJjpnZ+it6N7Wp+1BtSnUWwTyiijd?= =?us-ascii?Q?Ww0C8eD636j+NuQaL0UP+Y5b+mg6/UHOThQyJiycMSlIkGJUAT6RRg28FBP7?= =?us-ascii?Q?X3OuLX2frvhZWMqNoT4p8hWRlX0gaY2auydjk4yPYJ58Hasezdl6zI0Q0nS/?= =?us-ascii?Q?t06oJIsr8HQxwlUx70jga4/us/q2vaB1lGYOA97ainpcIR76t4fuOUdKBfD8?= =?us-ascii?Q?kl4Fk8YgtbGdxW0i3QYYHMS5hHSsqFybTdAN3maQGIQdj6J9MtcPY7DAZVb5?= =?us-ascii?Q?mulZyRuQXi1CrOaualNnYStq5rVKq6qM1nQY8qhi44iFMcOwzYy6TCfgF/7j?= =?us-ascii?Q?CTyR42gO74Yt7o8LrRJX8ZudZAqltsEPU8YGVCj1C3+0Ad0FimU59pPXY4xX?= =?us-ascii?Q?7Fx6i1uxMrLuNx43tXlko1XkQEEfBARzSMjPJ3bXTfuxz9Ix9VIDsdupmnq6?= =?us-ascii?Q?7sZzbwIc5rkUDMxf/aUbpKYZ+GCBnmYtz/NlpH6+wViDbR9w59k6Y1SEbBnU?= =?us-ascii?Q?sJPGVdohNrR3dtxowyDLTt+fDEiT0KYBm7/9DVS7DTbNcuatlrOZowwz9IwA?= =?us-ascii?Q?/bFu47MnUV4VAiqwoUPMsh5lsLW5n/NvL4IFoUeMK/LkJTpf7TJh6p0jQx8B?= =?us-ascii?Q?FRzYNlrqmtV13s04UixL8srcnkJbV9LutkqunccZ23I5yx58oBlyx84v6gZv?= =?us-ascii?Q?H4xKtnM0QdXnSRj6lg+iuJUm5xEW8ffnHqy9d+AefIvIQdkC58XcvlpzBjp6?= =?us-ascii?Q?s5r/YqVybjs1/u2AMu/v2A+To6m1mpAbeyfTQWoS2kwkDhOlbjtGqntls54Z?= =?us-ascii?Q?tNl3ZrpsntWptbM5shykTxCdky9PDB82xEjy5i2DzEU2glC2BQNc7MjrzhFW?= =?us-ascii?Q?MEgVkSDMVd4YSnGww1z4ZVAePdPI+OKLo5aImMbBFH+FywxMQT2qxjOZtaCK?= =?us-ascii?Q?469BWv2Ouy2YFTao5wqJp8g2JSowK7nvTDVBb27z0iPIf6iihirIbYZQMNUC?= =?us-ascii?Q?8oVHMn/SY4rhgxuwwmRmko6XFZM1y/7MRGa7i97EvnpSZ20ympY/kzxhewJS?= =?us-ascii?Q?vvNAs4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1477; 5:7uSGe63iSghd6H93yN4dXj76Ioxz9vBJG0ym01CZ6fx1zBsjE/GY5vbL5aXSW2kfvhAxTD8EdFVZaWfSBnf0rGKiyfN7ObfHgTTRGbx81xk+PlZCGxJEV5qbe61CwZkoLucFwxLhmbvhIHTxKcELaA==; 24:TfhTY8755fJ20UfKFCNnTizd7VirEUR134kRbJFEfhmh0/+1lyrDZ4KgKuoDx6DyGErPw09dvTHu9CXWsS/Y9a6Kh6G/XNHQ7IHsbtxfcr8=; 20:irWw5eRdff84Wp/AItDcJvpgzMx3dTwSq4KOvpUElTxrrUnY4q9J7GZqd04tz5LTlFAf+WxnhtkO2LQ5xITXhg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2015 22:55:59.9031 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1477 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 --- v2: no change 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 */