Merge branches 'pm-domains', 'pm-avs' and 'powercap'

[sfrench/cifs-2.6.git] / kernel / sysctl_binary.c

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 4ee3e49530d2e1d468fe04917cd824cf991f8d26..939a158eab11d2b2cca4f8412f0423449f964efd 100644 (file)
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -197,7 +197,6 @@ static const struct bin_table bin_net_core_table[] = {
        { CTL_INT,      NET_CORE_AEVENT_ETIME,  "xfrm_aevent_etime" },
        { CTL_INT,      NET_CORE_AEVENT_RSEQTH, "xfrm_aevent_rseqth" },
        { CTL_INT,      NET_CORE_WARNINGS,      "warnings" },
-       { CTL_INT,      NET_CORE_BUDGET_USECS,  "netdev_budget_usecs" },
        {},
 };
 
@@ -1120,7 +1119,7 @@ static ssize_t bin_uuid(struct file *file,
        /* Only supports reads */
        if (oldval && oldlen) {
                char buf[UUID_STRING_LEN + 1];
-               uuid_be uuid;
+               uuid_t uuid;
 
                result = kernel_read(file, 0, buf, sizeof(buf) - 1);
                if (result < 0)
@@ -1129,7 +1128,7 @@ static ssize_t bin_uuid(struct file *file,
                buf[result] = '\0';
 
                result = -EIO;
-               if (uuid_be_to_bin(buf, &uuid))
+               if (uuid_parse(buf, &uuid))
                        goto out;
 
                if (oldlen > 16)