Fix to binfmt_xout.c when Xenix 286 support is not configured.
Default to not building a versioned module.
This commit is contained in:
parent
5b7669f61e
commit
e18e7d000a
13
CONFIG
13
CONFIG
|
@ -3,10 +3,15 @@
|
|||
# Edit, make clean, make install
|
||||
|
||||
|
||||
# If you want to use versioned symbol names (recommended) in an attempt
|
||||
# to allow the iBCS module to load against other, compatible kernel
|
||||
# versions enable this.
|
||||
USE_VERSIONS=yes
|
||||
# If you want to use versioned symbol names in an attempt to allow the
|
||||
# iBCS module to load against other, compatible kernel versions enable
|
||||
# this. Be warned that I have observed that two different builds of
|
||||
# the same kernel version have resulted in different versioned symbol
|
||||
# names leading to modules not working with different builds of the
|
||||
# *same* kernel version. I don't know why. I don't recommend you use
|
||||
# this option if you build several slightly different kernels for
|
||||
# different machines/purposes.
|
||||
USE_VERSIONS=no
|
||||
|
||||
# SOCKSYS_MAJOR is the major number to use for the /dev/socksys socket
|
||||
# interface to streams based TCP/IP (i.e. Lachman as used by many SVR3s).
|
||||
|
|
18
ChangeLog
18
ChangeLog
|
@ -1,3 +1,21 @@
|
|||
Thu Jul 4 12:24:06 GMT/BST 1996
|
||||
|
||||
* The default is now *not* to build a versioned module. I got
|
||||
too many questions about why it wouldn't compile.
|
||||
-- Mike
|
||||
|
||||
* Fix to binfmt_xout.c when Xenix 286 is emulation is not
|
||||
configured.
|
||||
-- Mike
|
||||
|
||||
|
||||
Fri Jun 14 13:36:18 GMT/BST 1996
|
||||
|
||||
* Added code to explicitly fail the SCO LD?MAP ioctls used
|
||||
for channel mapping.
|
||||
-- Mike
|
||||
|
||||
|
||||
Thu Jun 6 17:21:00 GMT/BST 1996
|
||||
|
||||
* Cleaned up Stephans SCO tape ioctls and added the
|
||||
|
|
|
@ -79,7 +79,7 @@ console|Standard Linux Console,
|
|||
use=console-keys,
|
||||
|
||||
|
||||
con80x25,
|
||||
linux|con80x25,
|
||||
lines#25, cols#80, use=console,
|
||||
|
||||
con80x29,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* Copyright (C) 1994 Mike Jagdis (jaggy@purplet.demon.co.uk)
|
||||
*
|
||||
* $Id: binfmt_xout.c,v 1.30 1996/03/29 17:33:30 mike Exp $
|
||||
* $Id: binfmt_xout.c,v 1.31 1996/07/04 11:30:52 mike Exp $
|
||||
* $Source: /nfs4/sophia/home/mjagdis/src/ibcs.cvs/ibcs/iBCSemul/binfmt_xout.c,v $
|
||||
*
|
||||
* This file is based upon code written by Al Longyear for the COFF file
|
||||
|
@ -567,6 +567,7 @@ seg_again:
|
|||
addr = PAGE_ALIGN(addr + s->xs_vsize);
|
||||
s->xs_rbase = ldt_info.base_addr;
|
||||
}
|
||||
#endif
|
||||
bss_size = seglist[i].xs_vsize-seglist[i].xs_psize;
|
||||
bss_base = seglist[i].xs_rbase+seglist[i].xs_psize;
|
||||
|
||||
|
@ -607,7 +608,7 @@ seg_again:
|
|||
if (s->xs_rbase+s->xs_vsize > current->MM(brk))
|
||||
current->MM(start_brk) =
|
||||
current->MM(brk) = PAGE_ALIGN(s->xs_rbase+s->xs_vsize);
|
||||
|
||||
#ifdef XOUT_SEGMENTS
|
||||
if (ldt_info.seg_32bit) {
|
||||
ldt_info.limit = (TASK_SIZE-1) >> 12;
|
||||
ldt_info.limit_in_pages = 1;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Written by Drew Sullivan.
|
||||
* Rewritten by Mike Jagdis.
|
||||
*
|
||||
* $Id: ioctl.c,v 1.47 1996/06/06 16:23:02 mike Exp $
|
||||
* $Id: ioctl.c,v 1.48 1996/07/04 11:30:54 mike Exp $
|
||||
* $Source: /nfs4/sophia/home/mjagdis/src/ibcs.cvs/ibcs/iBCSemul/ioctl.c,v $
|
||||
*/
|
||||
#include <linux/config.h>
|
||||
|
@ -165,6 +165,13 @@ do_ioctl(struct pt_regs *regs, int fd, unsigned long ioctl_num, void *arg)
|
|||
*/
|
||||
case 'E'|0x80:
|
||||
return -EINVAL;
|
||||
|
||||
/* SCO channel mapping. I can't find any documentation
|
||||
* for this. These are the LD?MAP ioctls defined in
|
||||
* sys/termio.h and sys/emap.h. They are used by mapchan.
|
||||
*/
|
||||
case 'D':
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* If we haven't handled it yet it must be a BSD style ioctl
|
||||
|
|
Loading…
Reference in a new issue