From owner-svn-soc-all@freebsd.org Sat Jul 18 15:11:32 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41B039A57F8 for ; Sat, 18 Jul 2015 15:11:32 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25A9916A8 for ; Sat, 18 Jul 2015 15:11:32 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6IFBW8i093827 for ; Sat, 18 Jul 2015 15:11:32 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6IFBT9L093633 for svn-soc-all@FreeBSD.org; Sat, 18 Jul 2015 15:11:29 GMT (envelope-from def@FreeBSD.org) Date: Sat, 18 Jul 2015 15:11:29 GMT Message-Id: <201507181511.t6IFBT9L093633@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288535 - in soc2013/def/crashdump-head: sbin/savecore sys/amd64/amd64 sys/arm/arm sys/ddb sys/i386/i386 sys/kern sys/mips/mips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2015 15:11:32 -0000 Author: def Date: Sat Jul 18 15:11:28 2015 New Revision: 288535 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288535 Log: Kernel dump header has 512B again. Modified: soc2013/def/crashdump-head/sbin/savecore/savecore.c soc2013/def/crashdump-head/sys/amd64/amd64/minidump_machdep.c soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c soc2013/def/crashdump-head/sys/ddb/db_textdump.c soc2013/def/crashdump-head/sys/i386/i386/minidump_machdep.c soc2013/def/crashdump-head/sys/kern/kern_dump.c soc2013/def/crashdump-head/sys/mips/mips/minidump_machdep.c Modified: soc2013/def/crashdump-head/sbin/savecore/savecore.c ============================================================================== --- soc2013/def/crashdump-head/sbin/savecore/savecore.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sbin/savecore/savecore.c Sat Jul 18 15:11:28 2015 (r288535) @@ -517,7 +517,7 @@ printf("sectorsize = %u\n", sectorsize); } - lasthd = mediasize - sizeof(kdhl); + lasthd = mediasize - sectorsize; lseek(fd, lasthd, SEEK_SET); error = read(fd, &kdhl, sizeof kdhl); if (error != sizeof kdhl) { Modified: soc2013/def/crashdump-head/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- soc2013/def/crashdump-head/sys/amd64/amd64/minidump_machdep.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sys/amd64/amd64/minidump_machdep.c Sat Jul 18 15:11:28 2015 (r288535) @@ -49,7 +49,7 @@ #include #include -CTASSERT((sizeof(struct kerneldumpheader) % 512) == 0); +CTASSERT(sizeof(struct kerneldumpheader) == 512); /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This Modified: soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c ============================================================================== --- soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c Sat Jul 18 15:11:28 2015 (r288535) @@ -50,7 +50,7 @@ #include #include -CTASSERT((sizeof(struct kerneldumpheader) % 512) == 0); +CTASSERT(sizeof(struct kerneldumpheader) == 512); /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This Modified: soc2013/def/crashdump-head/sys/ddb/db_textdump.c ============================================================================== --- soc2013/def/crashdump-head/sys/ddb/db_textdump.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sys/ddb/db_textdump.c Sat Jul 18 15:11:28 2015 (r288535) @@ -113,7 +113,7 @@ * Various size assertions -- pretty much everything must be one block in * size. */ -CTASSERT((sizeof(struct kerneldumpheader) % TEXTDUMP_BLOCKSIZE) == 0); +CTASSERT(sizeof(struct kerneldumpheader) == 512); CTASSERT(sizeof(struct ustar_header) == TEXTDUMP_BLOCKSIZE); /* Modified: soc2013/def/crashdump-head/sys/i386/i386/minidump_machdep.c ============================================================================== --- soc2013/def/crashdump-head/sys/i386/i386/minidump_machdep.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sys/i386/i386/minidump_machdep.c Sat Jul 18 15:11:28 2015 (r288535) @@ -45,7 +45,7 @@ #include #include -CTASSERT((sizeof(struct kerneldumpheader) % 512) == 0); +CTASSERT(sizeof(struct kerneldumpheader) == 512); /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This Modified: soc2013/def/crashdump-head/sys/kern/kern_dump.c ============================================================================== --- soc2013/def/crashdump-head/sys/kern/kern_dump.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sys/kern/kern_dump.c Sat Jul 18 15:11:28 2015 (r288535) @@ -47,7 +47,7 @@ #include #include -CTASSERT((sizeof(struct kerneldumpheader) % 512) == 0); +CTASSERT(sizeof(struct kerneldumpheader) == 512); /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This Modified: soc2013/def/crashdump-head/sys/mips/mips/minidump_machdep.c ============================================================================== --- soc2013/def/crashdump-head/sys/mips/mips/minidump_machdep.c Sat Jul 18 13:52:05 2015 (r288534) +++ soc2013/def/crashdump-head/sys/mips/mips/minidump_machdep.c Sat Jul 18 15:11:28 2015 (r288535) @@ -47,7 +47,7 @@ #include #include -CTASSERT((sizeof(struct kerneldumpheader) % 512) == 0); +CTASSERT(sizeof(struct kerneldumpheader) == 512); /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This