Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756810AbXF0KNf (ORCPT ); Wed, 27 Jun 2007 06:13:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753319AbXF0KN2 (ORCPT ); Wed, 27 Jun 2007 06:13:28 -0400 Received: from 81-174-11-161.static.ngi.it ([81.174.11.161]:55128 "EHLO mail.enneenne.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752470AbXF0KN1 (ORCPT ); Wed, 27 Jun 2007 06:13:27 -0400 Date: Wed, 27 Jun 2007 12:14:49 +0200 From: Rodolfo Giometti To: David Woodhouse Cc: linux-kernel@vger.kernel.org, Andrew Morton Message-ID: <20070627101449.GH13886@enneenne.com> References: <20070626100628.GO24183@enneenne.com> <1182855427.12109.203.camel@pmac.infradead.org> <20070626170622.GA13886@enneenne.com> <1182879520.3263.19.camel@shinybook.infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1182879520.3263.19.camel@shinybook.infradead.org> Organization: GNU/Linux Device Drivers, Embedded Systems and Courses X-PGP-Key: gpg --keyserver keyserver.linux.it --recv-keys D25A5633 User-Agent: Mutt/1.5.13 (2006-08-11) X-SA-Exim-Connect-IP: 192.168.32.1 X-SA-Exim-Mail-From: giometti@enneenne.com Subject: Re: [PATCH] LinuxPPS (with new syscalls API) X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100) X-SA-Exim-Scanned: Yes (on mail.enneenne.com) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2706 Lines: 72 On Tue, Jun 26, 2007 at 06:38:40PM +0100, David Woodhouse wrote: > > 64-bit kernels can run 32-bit userspace programs. But some structures > come out _differently_ between 32-bit and 64-bit compilation, so the > system call needs a special 'compat' handler instead of just running the > normal 64-bit system call. > > The 'struct timespec' is one structure which is sometimes different for > 32-bit vs. 64-bit, so any system call taking a 'struct timespec' must > have a separate compat_sys_xxxx() to handle that. See something like > compat_sys_clock_settime() in kernel/compat.c for an example (but don't > use set_fs() like it does; just see how it handles the compat_timespec). Did you mean something like this? diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c index befe292..3e401e5 100644 --- a/drivers/pps/pps.c +++ b/drivers/pps/pps.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -284,9 +285,15 @@ sys_time_pps_getcap_exit: return ret; } +#ifdef CONFIG_COMPAT asmlinkage long sys_time_pps_fetch(int source, const int tsformat, - struct pps_info __user *info, - const struct timespec __user *timeout) + struct pps_info __user *info, + const struct compat_timespec __user *timeout) +#else +asmlinkage long sys_time_pps_fetch(int source, const int tsformat, + struct pps_info __user *info, + const struct timespec __user *timeout) +#endif { unsigned long ticks; struct pps_info pi; @@ -318,7 +325,11 @@ asmlinkage long sys_time_pps_fetch(int source, const int ts /* Manage the timeout */ if (timeout) { +#ifdef CONFIG_COMPAT + ret = get_compat_timespec(&to, timeout); +#else ret = copy_from_user(&to, timeout, sizeof(struct timespec)); +#endif if (ret) goto sys_time_pps_fetch_exit; if (to.tv_sec != -1) { Ciao, Rodolfo -- GNU/Linux Solutions e-mail: giometti@enneenne.com Linux Device Driver giometti@gnudd.com Embedded Systems giometti@linux.it UNIX programming phone: +39 349 2432127 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/