[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnumach] 01/03: Imported Upstream version 1.7+git20160607
|
From: |
Samuel Thibault |
|
Subject: |
[gnumach] 01/03: Imported Upstream version 1.7+git20160607 |
|
Date: |
Tue, 07 Jun 2016 14:08:06 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository gnumach.
commit 01d76ab8c2d00f49f5fa368439648b67f8bb3947
Author: Samuel Thibault <address@hidden>
Date: Tue Jun 7 13:56:27 2016 +0000
Imported Upstream version 1.7+git20160607
---
ChangeLog | 37 +++++++++++++++++++++++++++++++++++++
configure | 20 ++++++++++----------
ddb/db_elf.c | 10 +++++-----
doc/mach.info | 2 +-
doc/mach.info-1 | 4 ++--
doc/mach.info-2 | 2 +-
doc/stamp-vti | 4 ++--
doc/version.texi | 4 ++--
i386/i386at/lpr.c | 6 +++++-
kern/debug.c | 4 ++--
kern/macros.h | 35 +++++++++++++++++++++++------------
kern/rdxtree_i.h | 32 ++++++++++++++++++++------------
linux/src/drivers/scsi/sd.c | 4 ++--
linux/src/drivers/scsi/sr.c | 4 ++--
linux/src/drivers/scsi/sr_ioctl.c | 2 +-
version.m4 | 2 +-
vm/vm_map.c | 2 +-
17 files changed, 117 insertions(+), 57 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5435bb5..96c1da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2016-06-07 Richard Braun <address@hidden>
+
+ Fix deadlock
+ * vm/vm_map.c (vm_map_copyout_page_list): Fix call to
+ vm_map_find_entry_anywhere to avoid relocking VM map.
+
+2016-06-02 Richard Braun <address@hidden>
+
+ Fix some license headers.
+ As the original author of the files imported, I explicitely dual
+ license them to something compatible with GPLv2.
+
+ kern/macros.h: Switch license from GPLv3 to BSD 2-clause.
+ kern/rdxtree_i.h: Likewise.
+
+2016-05-26 Samuel Thibault <address@hidden>
+
+ Fix buffer size passed to scsi_do_cmd
+ * linux/src/drivers/scsi/eata_dma_proc.c (eata_proc_info): Increase cmd
size
+ to 12.
+ * linux/src/drivers/scsi/sd.c (do_sd_request, sd_init_done): Likewise.
+ * linux/src/drivers/scsi/sr.c (do_sr_request, sr_init_done): Likewise.
+ * linux/src/drivers/scsi/sr_ioctl.c (sr_ioctl): Likewise with sr_cmd.
+
+ Cope with getc returning -1
+ * i386/i386at/lpr.c (lprstart): Use int instead of char to store result
of
+ getc, so as to return in case of getting -1.
+
+ Fix potential divisal by zero
+ * kern/debug.c (panic, log): Pass 16 as default radix to _doprnt.
+
+2016-05-23 Samuel Thibault <address@hidden>
+
+ Fix getting ELF symbol bind and type
+ ddb/db_elf.c (elf_db_search_symbol): Use ELF32_ST_BIND and
ELF32_ST_TYPE to
+ access symbol bind and type.
+
2016-05-20 Richard Braun <address@hidden>
vm_map: back allocations with a red-black tree
diff --git a/configure b/configure
index 8a82bf7..2ba3469 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU Mach 1.7+git20160522.
+# Generated by GNU Autoconf 2.69 for GNU Mach 1.7+git20160607.
#
# Report bugs to <address@hidden>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Mach'
PACKAGE_TARNAME='gnumach'
-PACKAGE_VERSION='1.7+git20160522'
-PACKAGE_STRING='GNU Mach 1.7+git20160522'
+PACKAGE_VERSION='1.7+git20160607'
+PACKAGE_STRING='GNU Mach 1.7+git20160607'
PACKAGE_BUGREPORT='address@hidden'
PACKAGE_URL=''
@@ -1599,7 +1599,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Mach 1.7+git20160522 to adapt to many kinds of
systems.
+\`configure' configures GNU Mach 1.7+git20160607 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1670,7 +1670,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Mach 1.7+git20160522:";;
+ short | recursive ) echo "Configuration of GNU Mach 1.7+git20160607:";;
esac
cat <<\_ACEOF
@@ -2026,7 +2026,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Mach configure 1.7+git20160522
+GNU Mach configure 1.7+git20160607
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2118,7 +2118,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Mach $as_me 1.7+git20160522, which was
+It was created by GNU Mach $as_me 1.7+git20160607, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2984,7 +2984,7 @@ fi
# Define the identity of the package.
PACKAGE='gnumach'
- VERSION='1.7+git20160522'
+ VERSION='1.7+git20160607'
# Some tools Automake needs.
@@ -12189,7 +12189,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Mach $as_me 1.7+git20160522, which was
+This file was extended by GNU Mach $as_me 1.7+git20160607, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12260,7 +12260,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU Mach config.status 1.7+git20160522
+GNU Mach config.status 1.7+git20160607
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/ddb/db_elf.c b/ddb/db_elf.c
index 547453b..7b7eed7 100644
--- a/ddb/db_elf.c
+++ b/ddb/db_elf.c
@@ -165,23 +165,23 @@ elf_db_search_symbol (db_symtab_t *stab,
if (s->st_name == 0)
continue;
- if (strategy == DB_STGY_XTRN && (s->st_info & STB_GLOBAL) == 0)
+ if (strategy == DB_STGY_XTRN && (ELF32_ST_BIND(s->st_info) != STB_GLOBAL))
continue;
if (off >= s->st_value) {
- if (s->st_info == STT_FUNC)
+ if (ELF32_ST_TYPE(s->st_info) != STT_FUNC)
continue;
if (off - s->st_value < diff) {
diff = off - s->st_value;
symp = s;
- if (diff == 0 && (s->st_info & STB_GLOBAL))
+ if (diff == 0 && (ELF32_ST_BIND(s->st_info) == STB_GLOBAL))
break;
} else if (off - s->st_value == diff) {
if (symp == NULL)
symp = s;
- else if ((symp->st_info & STB_GLOBAL) == 0
- && (s->st_info & STB_GLOBAL) != 0)
+ else if ((ELF32_ST_BIND(symp->st_info) != STB_GLOBAL)
+ && (ELF32_ST_BIND(s->st_info) == STB_GLOBAL))
symp = s; /* pick the external symbol */
}
}
diff --git a/doc/mach.info b/doc/mach.info
index efb3a8d..9a4c09f 100644
--- a/doc/mach.info
+++ b/doc/mach.info
@@ -3,7 +3,7 @@ This is mach.info, produced by makeinfo version 6.1 from
mach.texi.
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 20 April 2016, of 'The GNU Mach
-Reference Manual', for version 1.7+git20160522.
+Reference Manual', for version 1.7+git20160607.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
diff --git a/doc/mach.info-1 b/doc/mach.info-1
index 702faf4..5fef384 100644
--- a/doc/mach.info-1
+++ b/doc/mach.info-1
@@ -3,7 +3,7 @@ This is mach.info, produced by makeinfo version 6.1 from
mach.texi.
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 20 April 2016, of 'The GNU Mach
-Reference Manual', for version 1.7+git20160522.
+Reference Manual', for version 1.7+git20160607.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
@@ -46,7 +46,7 @@ Main Menu
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 20 April 2016, of 'The GNU Mach
-Reference Manual', for version 1.7+git20160522.
+Reference Manual', for version 1.7+git20160607.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
diff --git a/doc/mach.info-2 b/doc/mach.info-2
index 5ea617d..50e97f5 100644
--- a/doc/mach.info-2
+++ b/doc/mach.info-2
@@ -3,7 +3,7 @@ This is mach.info, produced by makeinfo version 6.1 from
mach.texi.
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 20 April 2016, of 'The GNU Mach
-Reference Manual', for version 1.7+git20160522.
+Reference Manual', for version 1.7+git20160607.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 4f8403b..06c8e2a 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
@set UPDATED 20 April 2016
@set UPDATED-MONTH April 2016
address@hidden EDITION 1.7+git20160522
address@hidden VERSION 1.7+git20160522
address@hidden EDITION 1.7+git20160607
address@hidden VERSION 1.7+git20160607
diff --git a/doc/version.texi b/doc/version.texi
index 4f8403b..06c8e2a 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
@set UPDATED 20 April 2016
@set UPDATED-MONTH April 2016
address@hidden EDITION 1.7+git20160522
address@hidden VERSION 1.7+git20160522
address@hidden EDITION 1.7+git20160607
address@hidden VERSION 1.7+git20160607
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index 73c4261..8303be5 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -232,7 +232,7 @@ void lprstart(struct tty *tp)
spl_t s = spltty();
u_short addr = (natural_t) tp->t_addr;
int status = inb(STATUS(addr));
- char nch;
+ int nch;
if (tp->t_state & (TS_TIMEOUT|TS_TTSTOP|TS_BUSY)) {
splx(s);
@@ -253,6 +253,10 @@ void lprstart(struct tty *tp)
return;
}
nch = getc(&tp->t_outq);
+ if (nch == -1) {
+ splx(s);
+ return;
+ }
if ((tp->t_flags & LITOUT) == 0 && (nch & 0200)) {
timeout((timer_func_t *)ttrstrt, (char *)tp, (nch & 0x7f) + 6);
tp->t_state |= TS_TIMEOUT;
diff --git a/kern/debug.c b/kern/debug.c
index fd392d2..fce9ba6 100644
--- a/kern/debug.c
+++ b/kern/debug.c
@@ -161,7 +161,7 @@ panic(const char *s, ...)
#endif
printf(": ");
va_start(listp, s);
- _doprnt(s, listp, do_cnputc, 0, 0);
+ _doprnt(s, listp, do_cnputc, 16, 0);
va_end(listp);
printf("\n");
@@ -193,7 +193,7 @@ log(int level, const char *fmt, ...)
va_list listp;
va_start(listp, fmt);
- _doprnt(fmt, listp, do_cnputc, 0, 0);
+ _doprnt(fmt, listp, do_cnputc, 16, 0);
va_end(listp);
}
diff --git a/kern/macros.h b/kern/macros.h
index c2e8545..01deab6 100644
--- a/kern/macros.h
+++ b/kern/macros.h
@@ -1,21 +1,32 @@
/*
- * Copyright (c) 2009, 2010, 2013 Richard Braun.
+ * Copyright (c) 2009-2015 Richard Braun.
+ * All rights reserved.
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* Helper macros.
+ *
+ * Upstream site with license notes :
+ * http://git.sceen.net/rbraun/librbraun.git/
*/
#ifndef _KERN_MACROS_H
diff --git a/kern/rdxtree_i.h b/kern/rdxtree_i.h
index 1bd1f64..d9a59bf 100644
--- a/kern/rdxtree_i.h
+++ b/kern/rdxtree_i.h
@@ -1,18 +1,26 @@
/*
- * Copyright (c) 2013-2015 Richard Braun.
+ * Copyright (c) 2011-2015 Richard Braun.
+ * All rights reserved.
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* Upstream site with license notes :
diff --git a/linux/src/drivers/scsi/sd.c b/linux/src/drivers/scsi/sd.c
index d5f1524..eab64dd 100644
--- a/linux/src/drivers/scsi/sd.c
+++ b/linux/src/drivers/scsi/sd.c
@@ -577,7 +577,7 @@ static void do_sd_request (void)
static void requeue_sd_request (Scsi_Cmnd * SCpnt)
{
int dev, devm, block, this_count;
- unsigned char cmd[10];
+ unsigned char cmd[12];
int bounce_size, contiguous;
int max_sg;
struct buffer_head * bh, *bhp;
@@ -1028,7 +1028,7 @@ static void sd_init_done (Scsi_Cmnd * SCpnt)
static int sd_init_onedisk(int i)
{
- unsigned char cmd[10];
+ unsigned char cmd[12];
unsigned char *buffer;
unsigned long spintime;
int the_result, retries;
diff --git a/linux/src/drivers/scsi/sr.c b/linux/src/drivers/scsi/sr.c
index 8f44246..be64fb1 100644
--- a/linux/src/drivers/scsi/sr.c
+++ b/linux/src/drivers/scsi/sr.c
@@ -719,7 +719,7 @@ static void do_sr_request (void)
void requeue_sr_request (Scsi_Cmnd * SCpnt)
{
unsigned int dev, block, realcount;
- unsigned char cmd[10], *buffer, tries;
+ unsigned char cmd[12], *buffer, tries;
int this_count, start, end_rec;
tries = 2;
@@ -1056,7 +1056,7 @@ static void sr_init_done (Scsi_Cmnd * SCpnt)
}
void get_sectorsize(int i){
- unsigned char cmd[10];
+ unsigned char cmd[12];
unsigned char *buffer;
int the_result, retries;
Scsi_Cmnd * SCpnt;
diff --git a/linux/src/drivers/scsi/sr_ioctl.c
b/linux/src/drivers/scsi/sr_ioctl.c
index be62eb8..6d8b633 100644
--- a/linux/src/drivers/scsi/sr_ioctl.c
+++ b/linux/src/drivers/scsi/sr_ioctl.c
@@ -92,7 +92,7 @@ static int do_ioctl(int target, unsigned char * sr_cmd, void
* buffer, unsigned
int sr_ioctl(struct inode * inode, struct file * file, unsigned int cmd,
unsigned long arg)
{
- u_char sr_cmd[10];
+ u_char sr_cmd[12];
kdev_t dev = inode->i_rdev;
int result, target, err;
diff --git a/version.m4 b/version.m4
index 3dc231a..96cfef9 100644
--- a/version.m4
+++ b/version.m4
@@ -1,4 +1,4 @@
m4_define([AC_PACKAGE_NAME],[GNU Mach])
-m4_define([AC_PACKAGE_VERSION],[1.7+git20160522])
+m4_define([AC_PACKAGE_VERSION],[1.7+git20160607])
m4_define([AC_PACKAGE_BUGREPORT],address@hidden)
m4_define([AC_PACKAGE_TARNAME],[gnumach])
diff --git a/vm/vm_map.c b/vm/vm_map.c
index 7a90551..4476812 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -2789,7 +2789,7 @@ kern_return_t vm_map_copyout_page_list(
vm_map_lock(dst_map);
- last = vm_map_find_entry_anywhere(dst_map, size, 0, FALSE, &start);
+ last = vm_map_find_entry_anywhere(dst_map, size, 0, TRUE, &start);
if (last == NULL) {
vm_map_unlock(dst_map);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/gnumach.git