Linux kernel compatability enhancements (through 3.19)

[palacios.git] / linux_module / iface-pwrstat.c

diff --git a/linux_module/iface-pwrstat.c b/linux_module/iface-pwrstat.c
index 2ae1f54..8157fa2 100644 (file)
--- a/linux_module/iface-pwrstat.c
+++ b/linux_module/iface-pwrstat.c
@@ -47,7 +47,7 @@ static struct rapl_domain rapl_domains[] = {
        [RAPL_DOMAIN_PKG] = {
                .domain_id = RAPL_DOMAIN_PKG,
                .msrs   = {
-                       .limit  = MSR_PKG_RAPL_POWER_LIMIT,
+                       .limit  = MSR_PKG_POWER_LIMIT,
                        .status = MSR_PKG_ENERGY_STATUS,
                },
                .valid  = 1,
@@ -109,7 +109,7 @@ static int rapl_check_unit (void)
        power_unit_divisor = 1 << value;
 
        /* time unit: 1/time_unit_divisor Seconds */
-       value =(output & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
+       value = (output & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET;
        time_unit_divisor = 1 << value;
 
        return 0;
@@ -303,12 +303,18 @@ static int pwrstat_init (void)
        return 0;
 }
 
-/* if AMD comes up with something it can go here */
+
+static int pwrstat_deinit(void)
+{
+    // nothing to do
+    return 0;
+}
+
 
 static struct linux_ext pwrstat_ext = {
   .name = "POWERSTAT",
   .init = pwrstat_init,
-  .deinit = NULL,
+  .deinit = pwrstat_deinit,
   .guest_init = NULL,
   .guest_deinit = NULL
 };