From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751606AbcFNO7l (ORCPT ); Tue, 14 Jun 2016 10:59:41 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:60391 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751339AbcFNO7j (ORCPT ); Tue, 14 Jun 2016 10:59:39 -0400 X-IBM-Helo: d24dlp01.br.ibm.com X-IBM-MailFrom: bauerman@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: Thiago Jung Bauermann To: linuxppc-dev@lists.ozlabs.org Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Thiago Jung Bauermann , Eric Biederman Subject: [PATCH v2 1/9] kexec_file: Remove unused members from struct kexec_buf. Date: Tue, 14 Jun 2016 11:59:01 -0300 X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465916349-3398-1-git-send-email-bauerman@linux.vnet.ibm.com> References: <1465916349-3398-1-git-send-email-bauerman@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16061414-0032-0000-0000-00000257F7C1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16061414-0033-0000-0000-00000E855AE3 Message-Id: <1465916349-3398-2-git-send-email-bauerman@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-14_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606140164 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kexec_add_buffer uses kexec_buf.buffer and kexec_buf.bufsz to pass along its own arguments buffer and bufsz, but since they aren't used anywhere else, it's pointless. Signed-off-by: Thiago Jung Bauermann Cc: Eric Biederman Cc: kexec@lists.infradead.org Cc: linux-kernel@vger.kernel.org Acked-by: Dave Young --- kernel/kexec_file.c | 6 ++---- kernel/kexec_internal.h | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 01ab82a40d22..b6eec7527e9f 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -464,8 +464,6 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, memset(&buf, 0, sizeof(struct kexec_buf)); kbuf = &buf; kbuf->image = image; - kbuf->buffer = buffer; - kbuf->bufsz = bufsz; kbuf->memsz = ALIGN(memsz, PAGE_SIZE); kbuf->buf_align = max(buf_align, PAGE_SIZE); @@ -489,8 +487,8 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, /* Found a suitable memory range */ ksegment = &image->segment[image->nr_segments]; - ksegment->kbuf = kbuf->buffer; - ksegment->bufsz = kbuf->bufsz; + ksegment->kbuf = buffer; + ksegment->bufsz = bufsz; ksegment->mem = kbuf->mem; ksegment->memsz = kbuf->memsz; image->nr_segments++; diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index 0a52315d9c62..eefd5bf960c2 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -26,8 +26,6 @@ struct kexec_sha_region { */ struct kexec_buf { struct kimage *image; - char *buffer; - unsigned long bufsz; unsigned long mem; unsigned long memsz; unsigned long buf_align; -- 1.9.1