On Thu, 2011-08-11 at 18:11 -0700, David Miller wrote: > Ben, please add the following bug fix on top of the Sparc Niagara-T3 > patch set I sent the other week, otherwise all pre-Niagara boxes > won't boot.
I think there may have been a miscommunication. I assumed Jurij would
apply the SPARC changes, as he generally takes care of SPARC-specific
stuff in our kernel package.
Jurij, please go ahead and apply this and the previous patch.
Ben.
> Thanks!
>
> --------------------
> From c92761fd9efcbbcb59e7bf4db88e29ce03229889 Mon Sep 17 00:00:00 2001
> From: "David S. Miller" <da...@davemloft.net>
> Date: Thu, 11 Aug 2011 17:58:59 -0700
> Subject: [PATCH] sparc: Don't do hypervisor calls on non-sun4v in DS driver.
>
> Reported-by: Pieter-Paul Giesberts <piete...@broadcom.com>
> Signed-off-by: David S. Miller <da...@davemloft.net>
> ---
> arch/sparc/kernel/ds.c | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
> index 490e541..7429b47 100644
> --- a/arch/sparc/kernel/ds.c
> +++ b/arch/sparc/kernel/ds.c
> @@ -1256,13 +1256,14 @@ static int __init ds_init(void)
> {
> unsigned long hv_ret, major, minor;
>
> - hv_ret = sun4v_get_version(HV_GRP_REBOOT_DATA, &major, &minor);
> - if (hv_ret == HV_EOK) {
> - pr_info("SUN4V: Reboot data supported (maj=%lu,min=%lu).\n",
> - major, minor);
> - reboot_data_supported = 1;
> + if (tlb_type == hypervisor) {
> + hv_ret = sun4v_get_version(HV_GRP_REBOOT_DATA, &major, &minor);
> + if (hv_ret == HV_EOK) {
> + pr_info("SUN4V: Reboot data supported
> (maj=%lu,min=%lu).\n",
> + major, minor);
> + reboot_data_supported = 1;
> + }
> }
> -
> kthread_run(ds_thread, NULL, "kldomd");
>
> return vio_register_driver(&ds_driver);
signature.asc
Description: This is a digitally signed message part
