summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/amd64/stand/boot/conf.c4
-rw-r--r--sys/arch/amd64/stand/cdboot/conf.c4
-rw-r--r--sys/arch/amd64/stand/pxeboot/conf.c4
-rw-r--r--sys/arch/armish/stand/boot/conf.c4
-rw-r--r--sys/arch/hppa/stand/boot/conf.c4
-rw-r--r--sys/arch/hppa64/stand/boot/conf.c4
-rw-r--r--sys/arch/i386/stand/boot/conf.c4
-rw-r--r--sys/arch/i386/stand/cdboot/conf.c4
-rw-r--r--sys/arch/i386/stand/pxeboot/conf.c4
-rw-r--r--sys/arch/landisk/stand/boot/conf.c4
-rw-r--r--sys/arch/macppc/stand/conf.c2
-rw-r--r--sys/lib/libsa/loadfile_elf.c8
12 files changed, 25 insertions, 25 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c
index 145f7b4d705..f79deb6a09c 100644
--- a/sys/arch/amd64/stand/boot/conf.c
+++ b/sys/arch/amd64/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.12 2007/05/30 01:25:43 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.13 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -41,7 +41,7 @@
#include <biosdev.h>
#include <dev/cons.h>
-const char version[] = "3.00";
+const char version[] = "3.01";
int debug = 1;
diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c
index 7172579a38d..cd26ad30624 100644
--- a/sys/arch/amd64/stand/cdboot/conf.c
+++ b/sys/arch/amd64/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.12 2007/05/30 01:25:43 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.13 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -42,7 +42,7 @@
#include <biosdev.h>
#include <dev/cons.h>
-const char version[] = "2.00";
+const char version[] = "2.01";
int debug = 1;
diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c
index 8c90c92c7d1..3a15193e1a2 100644
--- a/sys/arch/amd64/stand/pxeboot/conf.c
+++ b/sys/arch/amd64/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.16 2007/07/27 17:48:01 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.17 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -44,7 +44,7 @@
#include "pxeboot.h"
#include "pxe_net.h"
-const char version[] = "2.01";
+const char version[] = "2.02";
int debug = 0;
#undef _TEST
diff --git a/sys/arch/armish/stand/boot/conf.c b/sys/arch/armish/stand/boot/conf.c
index 94961592fc3..e597cc4c890 100644
--- a/sys/arch/armish/stand/boot/conf.c
+++ b/sys/arch/armish/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2006/07/30 21:38:12 drahn Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2008/04/19 23:20:22 weingart Exp $ */
/* $NetBSD: conf.c,v 1.4 2005/12/11 12:17:06 christos Exp $ */
/*
@@ -39,7 +39,7 @@
#include "libsa.h"
#include <lib/libsa/ufs.h>
-const char version[] = "1.0";
+const char version[] = "1.1";
int debug = 0;
/*
diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c
index b13b68cb625..b37e6b61f79 100644
--- a/sys/arch/hppa/stand/boot/conf.c
+++ b/sys/arch/hppa/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.21 2008/03/04 22:33:11 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.22 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -32,7 +32,7 @@
#include <lib/libsa/cd9660.h>
#include <dev/cons.h>
-const char version[] = "1.0";
+const char version[] = "1.1";
int debug = 0;
struct fs_ops file_system[] = {
diff --git a/sys/arch/hppa64/stand/boot/conf.c b/sys/arch/hppa64/stand/boot/conf.c
index 91ecd77b2b1..2dfb1fced8f 100644
--- a/sys/arch/hppa64/stand/boot/conf.c
+++ b/sys/arch/hppa64/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.1 2005/04/01 10:40:48 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.2 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -23,7 +23,7 @@
#include <lib/libsa/cd9660.h>
#include <dev/cons.h>
-const char version[] = "0.8";
+const char version[] = "0.9";
int debug = 0;
struct fs_ops file_system[] = {
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index c43dd385011..dd06827a90d 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.38 2007/05/31 21:43:57 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.39 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "3.01";
+const char version[] = "3.02";
int debug = 1;
diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c
index 3e3bc297769..7c30d06302b 100644
--- a/sys/arch/i386/stand/cdboot/conf.c
+++ b/sys/arch/i386/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.10 2007/05/31 21:43:57 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.11 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -43,7 +43,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "2.01";
+const char version[] = "2.02";
int debug = 1;
#undef _TEST
diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c
index bd33bae866a..9ef52e122ef 100644
--- a/sys/arch/i386/stand/pxeboot/conf.c
+++ b/sys/arch/i386/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.15 2007/07/27 17:46:57 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.16 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -45,7 +45,7 @@
#include "pxeboot.h"
#include "pxe_net.h"
-const char version[] = "2.02";
+const char version[] = "2.03";
int debug = 1;
#undef _TEST
diff --git a/sys/arch/landisk/stand/boot/conf.c b/sys/arch/landisk/stand/boot/conf.c
index 07e406b0944..e890db05245 100644
--- a/sys/arch/landisk/stand/boot/conf.c
+++ b/sys/arch/landisk/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.2 2006/11/16 23:27:52 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.3 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2006 Michael Shalayeff
@@ -29,7 +29,7 @@
#endif
#include <dev/cons.h>
-const char version[] = "1.00";
+const char version[] = "1.01";
int debug = 1;
struct fs_ops file_system[] = {
diff --git a/sys/arch/macppc/stand/conf.c b/sys/arch/macppc/stand/conf.c
index db2a9896685..96438196be0 100644
--- a/sys/arch/macppc/stand/conf.c
+++ b/sys/arch/macppc/stand/conf.c
@@ -20,7 +20,7 @@
#include <lib/libsa/stand.h>
-const char version[] = "1.0";
+const char version[] = "1.1";
int debug = 0;
void ofc_probe(struct consdev *);
diff --git a/sys/lib/libsa/loadfile_elf.c b/sys/lib/libsa/loadfile_elf.c
index 016aeb18eda..3ebc9c69cb4 100644
--- a/sys/lib/libsa/loadfile_elf.c
+++ b/sys/lib/libsa/loadfile_elf.c
@@ -1,5 +1,5 @@
/* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.1 2007/05/30 01:25:43 tom Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.2 2008/04/19 23:20:22 weingart Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@ ELFNAME(exec)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
FREE(phdr, sz);
return 1;
}
- if (READ(fd, phdr[i].p_vaddr, phdr[i].p_filesz) !=
+ if (READ(fd, phdr[i].p_paddr, phdr[i].p_filesz) !=
phdr[i].p_filesz) {
WARN(("read text"));
FREE(phdr, sz);
@@ -136,7 +136,7 @@ ELFNAME(exec)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
}
if ((IS_TEXT(phdr[i]) && (flags & (LOAD_TEXT|COUNT_TEXT))) ||
(IS_DATA(phdr[i]) && (flags & (LOAD_DATA|COUNT_TEXT)))) {
- pos = phdr[i].p_vaddr;
+ pos = phdr[i].p_paddr;
if (minp > pos)
minp = pos;
pos += phdr[i].p_filesz;
@@ -148,7 +148,7 @@ ELFNAME(exec)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
if (IS_BSS(phdr[i]) && (flags & LOAD_BSS)) {
PROGRESS(("+%lu",
(u_long)(phdr[i].p_memsz - phdr[i].p_filesz)));
- BZERO((phdr[i].p_vaddr + phdr[i].p_filesz),
+ BZERO((phdr[i].p_paddr + phdr[i].p_filesz),
phdr[i].p_memsz - phdr[i].p_filesz);
}
if (IS_BSS(phdr[i]) && (flags & (LOAD_BSS|COUNT_BSS))) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 08:48:51 +0000