1 files changed, 4 insertions, 1 deletions

diff --git a/arch/sparc64/kernel/hvapi.c b/arch/sparc64/kernel/hvapi.c
index f03ffc829c7a..f34f5d6181ef 100644
--- a/arch/sparc64/kernel/hvapi.c
+++ b/arch/sparc64/kernel/hvapi.c
@@ -9,6 +9,7 @@
 
 #include <asm/hypervisor.h>
 #include <asm/oplib.h>
+#include <asm/sstate.h>
 
 /* If the hypervisor indicates that the API setting
  * calls are unsupported, by returning HV_EBADTRAP or
@@ -107,7 +108,7 @@ int sun4v_hvapi_register(unsigned long group, unsigned long major,
                                 p->minor = actual_minor;
                                 ret = 0;
                         } else if (hv_ret == HV_EBADTRAP ||
-                                   HV_ENOTSUPPORTED) {
+                                   hv_ret == HV_ENOTSUPPORTED) {
                                 if (p->flags & FLAG_PRE_API) {
                                         if (major == 1) {
                                                 p->major = 1;
@@ -179,6 +180,8 @@ void __init sun4v_hvapi_init(void)
         if (sun4v_hvapi_register(group, major, &minor))
                 goto bad;
 
+        sun4v_sstate_init();
+
         return;
 
 bad: