From patchwork Fri Dec 11 22:32:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 555919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 60E4D1402CD for ; Sat, 12 Dec 2015 09:33:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=cF3z0F9o; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=Ag9Z5wS2vt3UuXgt53W+73ISPuI9uX+GjdkpUSCA6116qcOPPewFT rFxuZ0h3WU0X+NSc1QzMsjJOS+k0rRUD7M0Pdm45fHw/OJguDoyLQTNBu4/kekKX e3p+sODBrFBuNwVN7nPKDAA2Oy06dsXEwnrj8nz3LItI+ugk/MJo/8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=uUPgnx9QFNrqTrdxe2WX/JSVCqE=; b=cF3z0F9oCM9ik6BcWHORfhwYFxmC 1PS7N3hX8ckTWBVD2O9EM1sWS/gg1TXaIPDDZ/AJAG1avC+c9dyNLyjteHgZGevI KfsJcPEGhb5PyKS+TjtfpdSt/kYiuZ4vsFP6cWYFC7qWfHXRmk9aKjp653Tz8WUb 7OHGqv7isO+bLSY= Received: (qmail 94395 invoked by alias); 11 Dec 2015 22:33:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 94383 invoked by uid 89); 11 Dec 2015 22:33:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Aurelien Jarno Subject: [PATCH] Cleanup ARM ioperm implementation Date: Fri, 11 Dec 2015 23:32:51 +0100 Message-Id: <1449873171-7158-1-git-send-email-aurelien@aurel32.net> Since GLIBC requires a minimum 2.6.32 kernel, the patch cleanups the ARM ioperm by removing pre-2.4.23 kernel support. --- ChangeLog | 9 +++++++++ sysdeps/unix/sysv/linux/arm/ioperm.c | 11 ++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bda934..13be8a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-12-11 Aurelien Jarno + + * sysdeps/unix/sysv/linux/arm/ioperm.c: Do not include + . + [LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)]: Remove + conditional code. + (init_iosys): Use CTL_BUS_ISA instead of BUS_ISA in iobase_name + and ioshift_name initialization. + 2015-12-11 Steve Ellcey * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f): diff --git a/sysdeps/unix/sysv/linux/arm/ioperm.c b/sysdeps/unix/sysv/linux/arm/ioperm.c index 2291def..053d53b 100644 --- a/sysdeps/unix/sysv/linux/arm/ioperm.c +++ b/sysdeps/unix/sysv/linux/arm/ioperm.c @@ -43,7 +43,6 @@ #include #include -#include #include #define PATH_ARM_SYSTYPE "/etc/arm_systype" @@ -94,19 +93,13 @@ static struct platform { * values. */ -/* The Linux kernel headers renamed this constant between 2.5.26 and - 2.5.27. It was backported to 2.4 between 2.4.22 and 2.4.23. */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23) -# define BUS_ISA CTL_BUS_ISA -#endif - static int init_iosys (void) { char systype[256]; int i, n; - static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE }; - static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT }; + static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE }; + static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT }; size_t len = sizeof(io.base); if (! __sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)