Deleted Added
full compact
minidump_machdep.c (221173) minidump_machdep.c (236503)
1/*-
2 * Copyright (c) 2006 Peter Wemm
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006 Peter Wemm
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/i386/i386/minidump_machdep.c 221173 2011-04-28 16:02:05Z attilio $");
28__FBSDID("$FreeBSD: head/sys/i386/i386/minidump_machdep.c 236503 2012-06-03 08:01:12Z avg $");
29
30#include "opt_watchdog.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/conf.h>
35#include <sys/cons.h>
36#include <sys/kernel.h>
37#include <sys/kerneldump.h>
38#include <sys/msgbuf.h>
29
30#include "opt_watchdog.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/conf.h>
35#include <sys/cons.h>
36#include <sys/kernel.h>
37#include <sys/kerneldump.h>
38#include <sys/msgbuf.h>
39#ifdef SW_WATCHDOG
40#include <sys/watchdog.h>
39#include <sys/watchdog.h>
41#endif
42#include <vm/vm.h>
43#include <vm/pmap.h>
44#include <machine/atomic.h>
45#include <machine/elf.h>
46#include <machine/md_var.h>
47#include <machine/vmparam.h>
48#include <machine/minidump.h>
49

--- 88 unchanged lines hidden (view full) ---

138 if (len > sz)
139 len = sz;
140 counter += len;
141 progress -= len;
142 if (counter >> 24) {
143 printf(" %lld", PG2MB(progress >> PAGE_SHIFT));
144 counter &= (1<<24) - 1;
145 }
40#include <vm/vm.h>
41#include <vm/pmap.h>
42#include <machine/atomic.h>
43#include <machine/elf.h>
44#include <machine/md_var.h>
45#include <machine/vmparam.h>
46#include <machine/minidump.h>
47

--- 88 unchanged lines hidden (view full) ---

136 if (len > sz)
137 len = sz;
138 counter += len;
139 progress -= len;
140 if (counter >> 24) {
141 printf(" %lld", PG2MB(progress >> PAGE_SHIFT));
142 counter &= (1<<24) - 1;
143 }
146#ifdef SW_WATCHDOG
144
147 wdog_kern_pat(WD_LASTVAL);
145 wdog_kern_pat(WD_LASTVAL);
148#endif
146
149 if (ptr) {
150 error = dump_write(di, ptr, 0, dumplo, len);
151 if (error)
152 return (error);
153 dumplo += len;
154 ptr += len;
155 sz -= len;
156 } else {

--- 261 unchanged lines hidden ---
147 if (ptr) {
148 error = dump_write(di, ptr, 0, dumplo, len);
149 if (error)
150 return (error);
151 dumplo += len;
152 ptr += len;
153 sz -= len;
154 } else {

--- 261 unchanged lines hidden ---