Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8316153ybl; Thu, 16 Jan 2020 14:28:55 -0800 (PST) X-Google-Smtp-Source: APXvYqzJhbtLat988jgsz9mzHm8rX6pyc3ufTjwzn0UCN5d9EETelT+OdLz3VR85rsQwLVOioOTW X-Received: by 2002:a05:6830:ce:: with SMTP id x14mr3870007oto.289.1579213735473; Thu, 16 Jan 2020 14:28:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579213735; cv=none; d=google.com; s=arc-20160816; b=FsbZRWrl1dGuaiW4SlDNe6zyvJU2Ge2Ut6hImQ4ddLiiYMQBZAkRdSuci65/ha6q18 SEk0wPCNjW82KoMslyyKeL2y8xzh45oyQsRZ0BkQb9cvlvC87LHybk0WNljnPLEU1No5 E8vsfiBtrCX9R/zN07X3Y9Z+ZyHQ3yl8zeaLuYKtjgzZMmecP7JowJt+t/VZM8mXFf3W biKK6OHdriqADdGo6aecgL2iADdHudV3qfIIrLXflYZqttLWMR0Yhm+QOQtnKRzqyH/i fEx4yV0S69siF4V/7RiPOzh96sefkQkj/IYZB8AY1hLjeNmlvyXAJEyBdqP9lxdZBePG mfZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=PWRUMcmoHAjONpDuJZiavA8lZ2SQsMCwaOs7HJNDLqQ=; b=xkPAeS2ZJvfb7M46GGN6qVJPDaZs8FGFIvYbGteUhp16fG4UD81Zn5yOab7HqRMCS8 bOW/iFpIvbCe6WlIwXDEwQ8liLKZZTBKaKre10nsezsEi19kmbPoa3EQYrUcZfAZ8kU8 lfamO/axs8aONbxuc6qN+/x8aQiTNhd4yzZZdKrTrcRqjKbwLZgK3oidUP4/BH3BV/eJ 5SUSPolL8umy0gRrPV/QJ0wOdseacBiKb1FV+0cb+hiXYzoSIBVQ5jfNX38Rc864k3mQ k8ddNBOPhKJY3ZdPw9kY8coeQMxSF5ehImmQrDfkoaabu4OqAV4aJ99QWX+hmg0CnRY4 6u2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Kxs0ezyw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h15si12223653oih.130.2020.01.16.14.28.43; Thu, 16 Jan 2020 14:28:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Kxs0ezyw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394161AbgAPR6e (ORCPT + 99 others); Thu, 16 Jan 2020 12:58:34 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:42198 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394143AbgAPR61 (ORCPT ); Thu, 16 Jan 2020 12:58:27 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 47zBkm2LMgz9v0MV; Thu, 16 Jan 2020 18:58:24 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Kxs0ezyw; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id ni5IDxU2PZjV; Thu, 16 Jan 2020 18:58:24 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 47zBkm19zpz9v0MQ; Thu, 16 Jan 2020 18:58:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1579197504; bh=PWRUMcmoHAjONpDuJZiavA8lZ2SQsMCwaOs7HJNDLqQ=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Kxs0ezywgzeua1J6Nz2TH6hRDY686ycC0eBvlT+7VEaf6BG1OMSaTqx3ZNlzL7Dmz GOomaHsGdxWUoegNBMPuu9onZpq1TYLSdQDZtpQNH2tlc65PLxh72kb0MscKCVKpF5 /iR0akD7SHPV0Z7uztGRM/gxxxo2UJ/f+WVDgXqE= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C7B508B82D; Thu, 16 Jan 2020 18:58:25 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id YBr-0Bk7q74Z; Thu, 16 Jan 2020 18:58:25 +0100 (CET) Received: from po14934vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 86BA18B82C; Thu, 16 Jan 2020 18:58:25 +0100 (CET) Received: by po14934vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 606F564A35; Thu, 16 Jan 2020 17:58:25 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [RFC PATCH v4 01/11] powerpc/64: Don't provide time functions in compat VDSO32 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , nathanl@linux.ibm.com, arnd@arndb.de, tglx@linutronix.de, vincenzo.frascino@arm.com, luto@kernel.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, x86@kernel.org Date: Thu, 16 Jan 2020 17:58:25 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to allow use of generic C VDSO, remove time functions from the 32 bits VDSO on PPC64. This (temporary) removal is needed because powerpc kernel C headers are not prepared for building 32 bits code on PPC64. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/vdso32/Makefile | 3 ++- arch/powerpc/kernel/vdso32/vdso32.lds.S | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile index 06f54d947057..738d52105392 100644 --- a/arch/powerpc/kernel/vdso32/Makefile +++ b/arch/powerpc/kernel/vdso32/Makefile @@ -3,7 +3,8 @@ # List of files in the vdso, has to be asm only for now obj-vdso32-$(CONFIG_PPC64) = getcpu.o -obj-vdso32 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o \ +obj-vdso32-$(CONFIG_PPC32) = gettimeofday.o +obj-vdso32 = sigtramp.o datapage.o cacheflush.o note.o \ $(obj-vdso32-y) # Build rules diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S index 00c025ba4a92..9400b182e163 100644 --- a/arch/powerpc/kernel/vdso32/vdso32.lds.S +++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S @@ -144,7 +144,7 @@ VERSION __kernel_datapage_offset; __kernel_get_syscall_map; -#ifndef CONFIG_PPC_BOOK3S_601 +#if defined(CONFIG_PPC32) && !defined(CONFIG_PPC_BOOK3S_601) __kernel_gettimeofday; __kernel_clock_gettime; __kernel_clock_getres; -- 2.13.3