Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4180326ybl; Mon, 13 Jan 2020 09:11:15 -0800 (PST) X-Google-Smtp-Source: APXvYqwz7XeKznWyVRmun9VVlh0ZLeR+UJ1VrB+j1kW+vf6o2KvpwyugwhJhW3uS46ZDn+18wXOD X-Received: by 2002:a9d:7e8a:: with SMTP id m10mr12841085otp.27.1578935475592; Mon, 13 Jan 2020 09:11:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578935475; cv=none; d=google.com; s=arc-20160816; b=w5HYsT2if1l82DybDpmtWXV6be4uyvL0fnqvQUQqupR9dFfMADwAq3vUO6xFP3vZRt B0M15rX+nU8EgavCotVc0potZ1b41kLDXn6ZmKBJ3QCbHIyNNaiu8bX7LKpeqt8Qizgk mXGH6dyPFHxoAJpoB9afFA2OXK60QhdgyOrJBj53u56b7/AqGOXZA5pdJnd392m2kAeb E5suYw1HPNtyp9/6mJJTfCAQtHZYBEmTrbfCO26nYRrBD2i+udO8e6XJOApluPf6+jPQ USwYsBkAlY6uWGbd7yWI08peLTsgQfn32hCYATYz4W+s9vYZoQ6zPNXOot/OAGFPQ+yP sQQA== 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=XM3/r+SdC6feuOTYbv1rGQIeU9F2vpYMjV75b6q5vI5l/56xQxIcQs9P0EJk1/4ROS zTgHHRbw2t0BLh1SgvgraJa9YRIQedJdlnwNc39qqJOpIM/N9KlbnoNfm4ftsjXhu0lS MjyVnsEn9mdKwfB3PDI/Z9RBAJeCJ67ZxTMni50lzvSmD64psWBi2ogEi09Ho0BG4kKh 6urj06at9XXrInnw9MJLKjbxFFZwft/wBNwlMAtV2re4jlFnHJVokg8YPyF8G0WI3/nq bJgrJI1OQzDfhA0gyXN7b8oIaYQnthLoVqmrFqWvnt5OZwMySgSfsHk4n8Wrhl/95Atx 7HfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Q0nb64Sa; 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 w19si7088152otj.209.2020.01.13.09.11.03; Mon, 13 Jan 2020 09:11:15 -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=Q0nb64Sa; 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 S1728769AbgAMRIn (ORCPT + 99 others); Mon, 13 Jan 2020 12:08:43 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:8701 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727331AbgAMRIm (ORCPT ); Mon, 13 Jan 2020 12:08:42 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 47xKmf61Mcz9txyt; Mon, 13 Jan 2020 18:08:34 +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=Q0nb64Sa; 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 oKTfeMayUSd4; Mon, 13 Jan 2020 18:08:34 +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 47xKmf4yBYz9txys; Mon, 13 Jan 2020 18:08:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1578935314; bh=PWRUMcmoHAjONpDuJZiavA8lZ2SQsMCwaOs7HJNDLqQ=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Q0nb64Sam3YtaHJEU52QFKqYqgpJJHb/XChp51T/PS7nWsqFdJS8sst/ZieoEKNds weZzhlZwBJJo0ppwwuE/BtXDBWlGIBCFOxvwz1S7ttIduzhOZlvDibtpmkI820d8YF Zbv15zKrt8Wyk58vDkR8leDrBY1Fv19FRz3fOhhs= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 087988B7C9; Mon, 13 Jan 2020 18:08:40 +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 2sWrwDBoPypz; Mon, 13 Jan 2020 18:08:39 +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 C4A9B8B7BE; Mon, 13 Jan 2020 18:08:39 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 9A82B64A1D; Mon, 13 Jan 2020 17:08:39 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [RFC PATCH v3 01/12] powerpc/64: Don't provide time functions in compat VDSO32 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , 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: Mon, 13 Jan 2020 17:08:39 +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