UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Don't do hypervisor calls on non-sun4v in DS driver.
This commit is contained in:
Linus Torvalds 2011-08-12 00:35:46 -07:00
parent 8cf1fb2163 c92761fd9e
commit eeca7360f7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/sparc/kernel/ds.c
View File

@ -1256,13 +1256,14 @@ static int __init ds_init(void)
{ {
unsigned long hv_ret, major, minor; unsigned long hv_ret, major, minor;
hv_ret = sun4v_get_version(HV_GRP_REBOOT_DATA, &major, &minor); if (tlb_type == hypervisor) {
if (hv_ret == HV_EOK) { hv_ret = sun4v_get_version(HV_GRP_REBOOT_DATA, &major, &minor);
pr_info("SUN4V: Reboot data supported (maj=%lu,min=%lu).\n", if (hv_ret == HV_EOK) {
major, minor); pr_info("SUN4V: Reboot data supported (maj=%lu,min=%lu).\n",
reboot_data_supported = 1; major, minor);
reboot_data_supported = 1;
}
} }
kthread_run(ds_thread, NULL, "kldomd"); kthread_run(ds_thread, NULL, "kldomd");
return vio_register_driver(&ds_driver); return vio_register_driver(&ds_driver);