From patchwork Fri Dec 14 22:53:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 1013756 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="otbUFubi"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Gm761z6Qz9s47 for ; Sat, 15 Dec 2018 09:53:34 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8C8163E7443 for ; Fri, 14 Dec 2018 23:53:30 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) by picard.linux.it (Postfix) with ESMTP id 951413E70A5 for ; Fri, 14 Dec 2018 23:53:28 +0100 (CET) Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id D44D410005B4 for ; Fri, 14 Dec 2018 23:53:27 +0100 (CET) Received: by mail-pg1-x544.google.com with SMTP id d72so3318300pga.9 for ; Fri, 14 Dec 2018 14:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NtA2hBAHFhHkv/6tXd9kBuYdGMfOHiQuCOxsv9d3XD0=; b=otbUFubi3pA6QrFQd+n3A8xa6BBCO2veatJSb+dfvpyuNKwPK8dR4shHKzZ0YtvbUC B4/Q8h4VQxsgoPiHXkqXJCgEXn1sFHto4ABEqGqpWPp+SH7zKDyTlHBBDjpjAdIsen4d U1s29N6hojboAfuMWqvT/DnX5fBIhrKGZjAuMEKUEeSGPRC//9Jov1IVZ0JL5HihIph5 RKLgDgRKBUE47UEZRraVYyWW9ylYYAIDo7DtFttMdOM5J1odZTtDnDqRkb3cbvI5FWrj ZoVxm4DqkBN2NIoxS6jUN8ow1Znmb6glbqkYrrk2VNatbaA0ZB/UTmCODN3agGPi7x9g efRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NtA2hBAHFhHkv/6tXd9kBuYdGMfOHiQuCOxsv9d3XD0=; b=PAMFjl4OqY/jYVuun+DeP3FJ9qYgr+LZ3J4nm7lPQPgVWFEa4LGmFitpK4a5ddlwng rOv72zVw+xjAjqLSeuoTyg6FbiHjIDqT0xoPvhx9oB5Xgq14ksl/jEsUXNq0J1PIw11B /SgfIMOKZjJeY3hU1WDPpovakErFnoy8cYX9V2a/GHpLMa2dyyxOzY9HzWRaxytV477l 57hDrA7jQPVG6sOV6GzFC6k3FdMqR/NfVbEPUmXJmZwLqCdwyOO7VwsFfbVu71FafQeh xcWcb5ePGzypZyy+Bau0NfKXqtk4526h6Yukt3MRHCbO2MYsyJrpm9axw/OjGMUkODG2 LfHQ== X-Gm-Message-State: AA+aEWYxVwnbt4KL/oQI1xJxhX+TXQC7B3To8uhi1Jez9HgM2KFGnabd HG+R4puz4MH64Xi1dVCGySbQus87Wrk= X-Google-Smtp-Source: AFSGD/WX62vz/32kwoZu/TzCUOHvX5Vi9PrkmatHq9afi1FDHF331xGbJ2lwUuroBQMudOu3TNC76g== X-Received: by 2002:a62:e30d:: with SMTP id g13mr4502559pfh.151.1544828005556; Fri, 14 Dec 2018 14:53:25 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::6872]) by smtp.gmail.com with ESMTPSA id j9sm7215161pfi.86.2018.12.14.14.53.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 14:53:24 -0800 (PST) From: Khem Raj To: ltp@lists.linux.it Date: Fri, 14 Dec 2018 14:53:16 -0800 Message-Id: <20181214225316.43732-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH] getcpu01: Rename getcpu to avoid conflict with glibc >= 2.29 X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" glibc has added getcpu() API starting with glibc 2.29 release, this makes the static function in conflict and signatures are not same as well. Renaming helps to keep ltp build going Signed-off-by: Khem Raj --- testcases/kernel/syscalls/getcpu/getcpu01.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c index c927512ca..e850fe844 100644 --- a/testcases/kernel/syscalls/getcpu/getcpu01.c +++ b/testcases/kernel/syscalls/getcpu/getcpu01.c @@ -82,7 +82,7 @@ int sys_support = 0; void cleanup(void); void setup(void); -static inline int getcpu(unsigned int *, unsigned int *, void *); +static inline int get_cpu(unsigned int *, unsigned int *, void *); unsigned int set_cpu_affinity(void); unsigned int get_nodeid(unsigned int); unsigned int max_cpuid(size_t, cpu_set_t *); @@ -124,7 +124,7 @@ int main(int ac, char **av) #ifdef __i386__ node_set = get_nodeid(cpu_set); #endif - TEST(getcpu(&cpu_id, &node_id, NULL)); + TEST(get_cpu(&cpu_id, &node_id, NULL)); if (TEST_RETURN == 0) { if (cpu_id != cpu_set) { tst_resm(TFAIL, "getcpu() returned wrong value" @@ -157,10 +157,10 @@ int main(int ac, char **av) } /* - * getcpu() - calls the system call + * get_cpu() - calls the system call */ -static inline int getcpu(unsigned *cpu_id, unsigned *node_id, - void *cache_struct) +static inline int get_cpu(unsigned *cpu_id, unsigned *node_id, + void *cache_struct) { #if defined(__i386__) return syscall(318, cpu_id, node_id, cache_struct);