Bartlomiej pointed out that the sgiioc4.c changes have made their way into Linus' tree. Here's an updated change set. Thanks, P.