Hi,
the second half of this patch is in CVS, but the first one isn't.
The second half was checked in silently from revision 1.2.1.6 to 1.2.1.7 in
the oskit branch (no changelog entry for that function, only one for the
added include directive string.h).
Roland, apparently you checked this in by accident. But we are definitely
hitting the assertion in the alloc case with the PCMCIA patches.
Thanks,
Marcus
On Sun, Oct 28, 2001 at 12:22:24PM +0100, Daniel Wagner wrote:
> The following patch dissables a test on the OSENV_NONBLOCKING flag.
> This is needed because there is a discrepancy between the oskit
> docs and the code. Though the docs says it is set, it is not. This
> prevents oskit-mach from correct working.
>
> 2001-10-28 Daniel Wagner <[EMAIL PROTECTED]>
>
> * oskit/osenv_mem.c (alloc_for_oskit, free_for_oskit): Don't test
> the OSENV_NONBLOCKING flag. The flag is not set, though it is
> mention in the oskit documentation (Version 0.97-20010214).
>
>
>
>
> Index: osenv_mem.c
> ===================================================================
> RCS file: /cvsroot/hurd/gnumach/oskit/Attic/osenv_mem.c,v
> retrieving revision 1.1.2.6
> diff -c -p -r1.1.2.6 osenv_mem.c
> *** osenv_mem.c 2000/10/28 02:27:06 1.1.2.6
> --- osenv_mem.c 2001/10/28 11:06:30
> *************** alloc_for_oskit (oskit_size_t size, osen
> *** 101,109 ****
> --- 101,113 ----
> Always go directly to physical memory. */
> flags |= OSENV_VIRT_EQ_PHYS|OSENV_PHYS_WIRED|OSENV_PHYS_CONTIG;
>
> + /* XXX The version of oskit we are working with (20010214) does not
> + seem to respect this requirement */
> + #if 0
> if (in_oskit_interrupt)
> /* The oskit documentation says an interrupt caller must set the
> * flag. */
> assert (flags & OSENV_NONBLOCKING);
> + #endif
>
> if (!(flags & (OSENV_NONBLOCKING|OSENV_PHYS_WIRED)))
> {
> *************** free_for_oskit (void *block, osenv_memfl
> *** 194,202 ****
> --- 198,210 ----
> Always go directly to physical memory. */
> flags |= OSENV_VIRT_EQ_PHYS|OSENV_PHYS_WIRED|OSENV_PHYS_CONTIG;
>
> + /* XXX The version of oskit we are working with (20010214) does not
> + seem to respect this requirement */
> + #if 0
> if (in_oskit_interrupt)
> /* The oskit documentation says an interrupt caller must set the
> * flag. */
> assert (flags & OSENV_NONBLOCKING);
> + #endif
>
> if ((oskit_addr_t) block < phys_mem_max)
> {
>
>
> --
> Daniel Wagner "use quit to exit"
> email: [EMAIL PROTECTED]
>
> GnuPG: 1024D/DCDE890A (public key available on any keyserver)
>
> _______________________________________________
> Bug-hurd mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/bug-hurd
>
--
`Rhubarb is no Egyptian god.' GNU http://www.gnu.org [EMAIL PROTECTED]
Marcus Brinkmann The Hurd http://www.gnu.org/software/hurd/
[EMAIL PROTECTED]
http://www.marcus-brinkmann.de/
_______________________________________________
Bug-hurd mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-hurd
