svn commit: r224823 - stable/7/sys/sparc64/sparc64
Marius Strobl
marius at FreeBSD.org
Sat Aug 13 12:43:35 UTC 2011
Author: marius
Date: Sat Aug 13 12:43:35 2011
New Revision: 224823
URL: http://svn.freebsd.org/changeset/base/224823
Log:
MFC: r224682 (partial)
- Merge from r147740:
When the last, possibly partially filled buffer is flushed, we didn't
reset fragsz to 0 and as such would stop reflecting reality.
- Use __FBSDID.
Modified:
stable/7/sys/sparc64/sparc64/dump_machdep.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/sparc64/sparc64/dump_machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/dump_machdep.c Sat Aug 13 12:43:33 2011 (r224822)
+++ stable/7/sys/sparc64/sparc64/dump_machdep.c Sat Aug 13 12:43:35 2011 (r224823)
@@ -23,10 +23,11 @@
* 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.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
@@ -113,6 +114,7 @@ buf_flush(struct dumperinfo *di)
error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE);
dumplo += DEV_BSIZE;
+ fragsz = 0;
return (error);
}
More information about the svn-src-stable-7
mailing list