Module Name: src Committed By: pooka Date: Tue May 11 20:07:40 UTC 2010
Modified Files: src/sys/kern: subr_disk_mbr.c Log Message: This not working on ews4800mips has nothing to do with rump, so: _RUMPKERNEL -> _MACHINE != ews4800mips To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/kern/subr_disk_mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_disk_mbr.c diff -u src/sys/kern/subr_disk_mbr.c:1.40 src/sys/kern/subr_disk_mbr.c:1.41 --- src/sys/kern/subr_disk_mbr.c:1.40 Tue May 4 12:20:50 2010 +++ src/sys/kern/subr_disk_mbr.c Tue May 11 20:07:40 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_disk_mbr.c,v 1.40 2010/05/04 12:20:50 tsutsui Exp $ */ +/* $NetBSD: subr_disk_mbr.c,v 1.41 2010/05/11 20:07:40 pooka Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.40 2010/05/04 12:20:50 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.41 2010/05/11 20:07:40 pooka Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,7 +86,7 @@ #define SCANBLOCKS 3 #define DISKLABEL_SIZE 404 #if LABELSECTOR*DEV_BSIZE + LABELOFFSET > SCANBLOCKS*DEV_BSIZE - DISKLABEL_SIZE -#ifndef _RUMPKERNEL /* XXX: see src/sys/rump/dev/lib/libdisk/Makefile */ +#if _MACHINE != ews4800mips /* XXX: fail silently, ews4800mips LABELSECTOR */ #error Invalid LABELSECTOR or LABELOFFSET #endif #endif