diff options
| author | phk <phk@FreeBSD.org> | 1996-05-09 07:16:00 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1996-05-09 07:16:00 +0000 |
| commit | 37b4c046b896694291284f351c7bc95a1819cda1 (patch) | |
| tree | a82edd2de9a6e67c434ae185491e701e89ed3c8c /sys/amd64 | |
| parent | c55a4da98078442d79cdd2aa2aa3ffc0f487f318 (diff) | |
| download | FreeBSD-src-37b4c046b896694291284f351c7bc95a1819cda1.zip FreeBSD-src-37b4c046b896694291284f351c7bc95a1819cda1.tar.gz | |
Fix brino on my part. _etext doesn't include the padding to a page
boundary, which means that it doesn't mark the start of the data
section (which is then inaccessible to the programmer ??).
Hopefully fixes recent locore reboot problems.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/locore.S | 4 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.s | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index de52777..f1ac3c5 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.69 1996/05/02 14:19:43 phk Exp $ + * $Id: locore.s,v 1.70 1996/05/02 22:24:55 phk Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -740,6 +740,8 @@ over_symalloc: /* Map read-write, data, bss and symbols */ movl $R(_etext),%eax + addl $PAGE_MASK, %eax + andl $~PAGE_MASK, %eax map_read_write: movl R(_KERNend),%ecx subl %eax,%ecx diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index de52777..f1ac3c5 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.69 1996/05/02 14:19:43 phk Exp $ + * $Id: locore.s,v 1.70 1996/05/02 22:24:55 phk Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -740,6 +740,8 @@ over_symalloc: /* Map read-write, data, bss and symbols */ movl $R(_etext),%eax + addl $PAGE_MASK, %eax + andl $~PAGE_MASK, %eax map_read_write: movl R(_KERNend),%ecx subl %eax,%ecx |
