From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756157AbdE0LF0 (ORCPT ); Sat, 27 May 2017 07:05:26 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41141 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752602AbdE0LFZ (ORCPT ); Sat, 27 May 2017 07:05:25 -0400 Date: Sat, 27 May 2017 04:04:04 -0700 From: tip-bot for Dimitri Sivanich Message-ID: Cc: sivanich@sgi.com, rja@sgi.com, hpa@zytor.com, sivanich@hpe.com, linux-kernel@vger.kernel.org, hch@lst.de, mingo@kernel.org, mike.travis@hpe.com, tglx@linutronix.de, nzimmer@sgi.com Reply-To: hpa@zytor.com, sivanich@sgi.com, rja@sgi.com, sivanich@hpe.com, linux-kernel@vger.kernel.org, mingo@kernel.org, hch@lst.de, mike.travis@hpe.com, tglx@linutronix.de, nzimmer@sgi.com In-Reply-To: <20170526130534.GE30788@hpe.com> References: <20170526130534.GE30788@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] posix-timers: Remove mmtimer leftovers Git-Commit-ID: f822798e3ced63427d57d128ee8d118126455f84 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f822798e3ced63427d57d128ee8d118126455f84 Gitweb: http://git.kernel.org/tip/f822798e3ced63427d57d128ee8d118126455f84 Author: Dimitri Sivanich AuthorDate: Fri, 26 May 2017 23:30:52 +0200 Committer: Thomas Gleixner CommitDate: Sat, 27 May 2017 12:58:46 +0200 posix-timers: Remove mmtimer leftovers After removing mmtimer, the mmtimer struct can be removed from the k_itimer struct. Signed-off-by: Thomas Gleixner Cc: Russ Anderson Cc: Dimitri Sivanich Cc: Mike Travis Cc: Nate Zimmer Cc: Christoph Hellwig Link: http://lkml.kernel.org/r/20170526130534.GE30788@hpe.com --- include/linux/posix-timers.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index b313ef2..34e893a 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -73,12 +73,6 @@ struct k_itimer { } real; struct cpu_timer_list cpu; struct { - unsigned int clock; - unsigned int node; - unsigned long incr; - unsigned long expires; - } mmtimer; - struct { struct alarm alarmtimer; ktime_t interval; } alarm;