diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /arch/sparc64/kernel/ioctl32.c | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'arch/sparc64/kernel/ioctl32.c')
| -rw-r--r-- | arch/sparc64/kernel/ioctl32.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c index b7a0f312d..81eb45e42 100644 --- a/arch/sparc64/kernel/ioctl32.c +++ b/arch/sparc64/kernel/ioctl32.c @@ -1,4 +1,4 @@ -/* $Id: ioctl32.c,v 1.13 1997/07/17 02:20:38 davem Exp $ +/* $Id: ioctl32.c,v 1.14 1997/07/17 06:21:12 davem Exp $ * ioctl32.c: Conversion between 32bit and 64bit native ioctls. * * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -30,6 +30,7 @@ #include <asm/kbio.h> #include <asm/vuid_event.h> #include <asm/rtc.h> +#include <asm/openpromio.h> /* As gcc will warn about casting u32 to some ptr, we have to cast it to * unsigned long first, and that's what is A() for. @@ -697,6 +698,22 @@ asmlinkage int sys32_ioctl(unsigned int fd, unsigned int cmd, u32 arg) case RTCGET: case RTCSET: + /* OPENPROMIO, SunOS/Solaris only, the NetBSD one's have + * embedded pointers in the arg which we'd need to clean up... + */ + case OPROMGETOPT: + case OPROMSETOPT: + case OPROMNXTOPT: + case OPROMSETOPT2: + case OPROMNEXT: + case OPROMCHILD: + case OPROMGETPROP: + case OPROMNXTPROP: + case OPROMU2P: + case OPROMGETCONS: + case OPROMGETFBNAME: + case OPROMGETBOOTARGS: + /* Socket level stuff */ case FIOSETOWN: case SIOCSPGRP: |