OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_68-39-g6c9d49d

Gerrit Code Review gerrit@openafs.org
Tue, 29 Dec 2009 18:20:46 -0800 (PST)


The following commit has been merged in the master branch:
commit 87de027fa430f67bd92153feedfc3fbab54c4c64
Author: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date:   Tue Dec 29 21:56:36 2009 +0000

    Fix ioctl32 inclusion on Sparc 64
    
    ioctl32.h only became available in Linux 2.5.44, so reduce the scope
    of the include. It went away again, in Linux 2.6.22. In its short
    life, it only ever provided prototypes for registering translation
    handlers, and for sys_ioctl.
    
    Only include it where we call those handlers, and when we call them,
    to remove compilation errors for Sparc64.
    
    Change-Id: I7816bd8b1e18ead68f7e5078e684d60bf59ac470
    Reviewed-on: http://gerrit.openafs.org/1040
    Reviewed-by: Russ Allbery <rra@stanford.edu>
    Tested-by: Russ Allbery <rra@stanford.edu>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/afs/LINUX/osi_ioctl.c        |    3 ++-
 src/afs/LINUX/osi_module.c       |    3 ---
 src/afs/LINUX/osi_pag_module.c   |    3 ---
 src/afs/LINUX24/osi_ioctl.c      |    3 ---
 src/afs/LINUX24/osi_pag_module.c |    3 ---
 5 files changed, 2 insertions(+), 13 deletions(-)

-- 
OpenAFS Master Repository