diff options
| author | hauke <hauke@pkgsrc.org> | 2011-04-04 09:07:06 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2011-04-04 09:07:06 +0000 |
| commit | 112a07ae35d544a6cf7485bf72d44fdbfcff4889 (patch) | |
| tree | 64bea2ca08be515c49845861ec536f35aa7e3903 /sysutils | |
| parent | 33bd50991106c67d256e23b3d717ae363d1ac560 (diff) | |
| download | pkgsrc-112a07ae35d544a6cf7485bf72d44fdbfcff4889.tar.gz | |
Turn a non-fatal condition from a panic into a warning, pulling up
a 3.4 change
<http://xenbits.xensource.com/hg/staging/xen-3.4-testing.hg/rev/60ed1226a37c#>
as proposed by cegger (see
<http://mail-index.netbsd.org/port-xen/2011/04/01/msg006580.html> ff).
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xenkernel33/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xenkernel33/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xenkernel33/patches/patch-ad | 32 |
3 files changed, 36 insertions, 3 deletions
diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile index 0c99f4ead92..574375c6550 100644 --- a/sysutils/xenkernel33/Makefile +++ b/sysutils/xenkernel33/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2011/03/24 12:04:57 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2011/04/04 09:07:06 hauke Exp $ # VERSION= 3.3.2 DISTNAME= xen-${VERSION} PKGNAME= xenkernel33-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo index 1a234aec8b4..7f8dc1d5ad0 100644 --- a/sysutils/xenkernel33/distinfo +++ b/sysutils/xenkernel33/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2011/03/24 12:04:57 drochner Exp $ +$NetBSD: distinfo,v 1.12 2011/04/04 09:07:06 hauke Exp $ SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b @@ -6,3 +6,4 @@ Size (xen-3.3.2.tar.gz) = 11357576 bytes SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7 SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc SHA1 (patch-ac) = ed1dc87e4f1d80112befc63372bc91ee621f57e6 +SHA1 (patch-ad) = e53ac3abf2a6a10c60cf288b994b3cf52a0d6486 diff --git a/sysutils/xenkernel33/patches/patch-ad b/sysutils/xenkernel33/patches/patch-ad new file mode 100644 index 00000000000..cf9e7c69ed3 --- /dev/null +++ b/sysutils/xenkernel33/patches/patch-ad @@ -0,0 +1,32 @@ +$NetBSD: patch-ad,v 1.1 2011/04/04 09:07:06 hauke Exp $ + +Turn this non-fatal condition from a panic into a warning, pulling up a 3.4 change +<http://xenbits.xensource.com/hg/staging/xen-3.4-testing.hg/rev/60ed1226a37c#> +as proposed by cegger. + +--- xen/arch/x86/cpu/mcheck/amd_nonfatal.c.orig 2009-08-06 12:56:41.000000000 +0000 ++++ xen/arch/x86/cpu/mcheck/amd_nonfatal.c +@@ -208,14 +208,19 @@ static void mce_amd_work_fn(void *data) + + /* HW does not count *all* kinds of correctable errors. + * Thus it is possible, that the polling routine finds an +- * correctable error even if the HW reports nothing. +- * However, the other way around is not possible (= BUG). +- */ ++ * correctable error even if the HW reports nothing. */ + if (counter > 0) { + /* HW reported correctable errors, + * the polling routine did not find... + */ +- BUG_ON(adjust == 0); ++ if (adjust == 0) { ++ printk("CPU counter reports %"PRIu32 ++ " correctable hardware error%s that %s" ++ " not reported by the status MSRs\n", ++ counter, ++ (counter == 1 ? "" : "s"), ++ (counter == 1 ? "was" : "were")); ++ } + /* subtract 1 to not double count the error + * from the polling service routine */ + adjust += (counter - 1); |