From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D599A481FD1; Tue, 9 Jun 2026 15:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781017448; cv=none; b=OjSp4Wy+sDHUkLKnjSoXdpHqFGX7V6IuPf76ZlkAJvao9GV+FgtB50kjUOifhk+eNh9yFfTxAwzjbJMA8qzDnz/QtNbc9RwwMnpXt5Anug3NPddKO8WvhZcKzkeBd80qwtSUn2nuPtuBHW5IFju6UyCMaovhaqxL5r+q4KeQfM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781017448; c=relaxed/simple; bh=MZD1Wb8zP5MqVmXvIXDD5mq5h+lrBn9xKaETok2v4RU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=GYre0080VulzyfS9yYkOUMg8rtHUOdKhTpVniGjMwuWlg2wGQpB8pMmjFKnLCVRZlS0OhUbAtfuMOFG3OI6Pc/ZmLJZYUkaL/fh5h5/L3gypKtWbpwjrYvSdBqQ81nkRQKnBNaSekNL39V5cs6SyyHD87vu7WztPgMASs/cROZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=aUNhD4Pk; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=d+DNGUcV; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aUNhD4Pk"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="d+DNGUcV" Date: Tue, 09 Jun 2026 15:04:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1781017445; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZUOYcKJxTpakggk3aWz2De9RmuGt02w0eO4UFQVtRCM=; b=aUNhD4PkMFiLh0DvshxLiBJQnXg3H9nOgtmnXya8agHRadLviohW3RKEXhfRM9VklTNKRi 3a/bk4zk7Xw5Q8AYKyd8imISh2b9WVa02bfMI63UUI3CQAkp7Djb4hqZKFDqdRaM9VO74l Z/b2CCpyXJCtplgE0SnJJQtYMbtqa5gkaU+af9K3xltiD/mNsyiC7HYCPR+NjtNCsTCzyr AyBW9oVhI447KiuhZXxyalWc2wbOc5PCeU8duMdP70PZLsEAd7yNKrGhNwVcahyrPo8f+g OiKe7gyR7SlfGqXSEbdFxxZ4RxXf/PmzJDe2H+9VzHMS7+ItG3IiTUqNdYvXnQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1781017445; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZUOYcKJxTpakggk3aWz2De9RmuGt02w0eO4UFQVtRCM=; b=d+DNGUcVFjoQgw3fF0YjrZVZXMNsMHhbSCnYbKppmRMVtWl7wxu0wAR+80CsA+xHLWMD4o ShXk4gt6cKFLEACw== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/vdso] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Thomas Bogendoerfer , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178101744404.529383.17545185239822381726.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/vdso branch of tip: Commit-ID: 66e0b2e3e3817efe0e0f283c04a9dd773ec4ac5e Gitweb: https://git.kernel.org/tip/66e0b2e3e3817efe0e0f283c04a9dd773ec= 4ac5e Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 21 May 2026 08:53:20 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00 clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a = available VDSO_CLOCKMODE_GIC is only defined if CONFIG_GENERIC_GETTIMEOFDAY is enabled. Right now this is always the case, but it will change soon. Prepare for the potential unavailability of VDSO_CLOCKMODE_GIC. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Cc: Thomas Bogendoerfer Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@l= inutronix.de --- drivers/clocksource/mips-gic-timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-= gic-timer.c index 1501c7d..a166926 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -198,7 +198,9 @@ static struct clocksource gic_clocksource =3D { .name =3D "GIC", .read =3D gic_hpt_read, .flags =3D CLOCK_SOURCE_IS_CONTINUOUS, +#ifdef CONFIG_GENERIC_GETTIMEOFDAY .vdso_clock_mode =3D VDSO_CLOCKMODE_GIC, +#endif }; =20 static void gic_clocksource_unstable(char *reason)