author | Vladimir Marek <Vladimir.Marek@oracle.com> |
Mon, 25 Nov 2013 17:42:18 +0100 | |
branch | s11u1-sru |
changeset 2846 | 308d0c192664 |
parent 805 | 23c55a2f8a8e |
permissions | -rw-r--r-- |
805
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
1 |
diff -rupN INIT.2011-02-08.clean/src/lib/libast/sfio/sfmode.c INIT.2011-02-08/src/lib/libast/sfio/sfmode.c |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
2 |
--- INIT.2011-02-08.clean/src/lib/libast/sfio/sfmode.c 2012-05-07 15:45:04.418751281 +0100 |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
3 |
+++ INIT.2011-02-08/src/lib/libast/sfio/sfmode.c 2012-05-07 15:49:09.326244280 +0100 |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
4 |
@@ -400,7 +400,7 @@ reg int local; /* a local call */ |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
5 |
|
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
6 |
if(f->mode&SF_GETR) |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
7 |
{ f->mode &= ~SF_GETR; |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
8 |
-#ifdef MAP_TYPE |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
9 |
+#if defined(MAP_TYPE) && (_ptr_bits < 64) |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
10 |
if((f->bits&SF_MMAP) && (f->tiny[0] += 1) >= (4*SF_NMAP) ) |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
11 |
{ /* turn off mmap to avoid page faulting */ |
23c55a2f8a8e
7165565 ksh93 in userland misses several bug fixes made in ON
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
12 |
sfsetbuf(f,(Void_t*)f->tiny,(size_t)SF_UNBOUND); |