From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Date: Thu, 04 Nov 2004 02:57:21 +0000 Subject: Re: [PATCH] fix HPET time_interpolator registration Message-Id: <20041103185721.743d9317.akpm@osdl.org> List-Id: References: <200411031024.43782.bjorn.helgaas@hp.com> In-Reply-To: <200411031024.43782.bjorn.helgaas@hp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bjorn Helgaas Cc: Robert.Picco@hp.com, venkatesh.pallipadi@intel.com, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, clameter@sgi.com Bjorn Helgaas wrote: > > Fixup after mid-air collision between Christoph adding time_interpolator.mask, > and me removing a static time_interpolator struct from hpet. > > Signed-off-by: Bjorn Helgaas > > === drivers/char/hpet.c 1.14 vs edited ==> --- 1.14/drivers/char/hpet.c 2004-11-02 07:40:42 -07:00 > +++ edited/drivers/char/hpet.c 2004-11-03 10:05:26 -07:00 > @@ -712,6 +712,7 @@ > ti->addr = &hpetp->hp_hpet->hpet_mc; > ti->frequency = hpet_time_div(hpets->hp_period); > ti->drift = ti->frequency * HPET_DRIFT / 1000000; > + ti->mask = 0xffffffffffffffffLL; > > hpetp->hp_interpolator = ti; > register_time_interpolator(ti); > ti->mask is u64, and on some architectures u64 is `long'. Compilers might whine about this. I'll make it ti->mask = -1; which just works.