3 files changed, 3 insertions, 4 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 80ecab0942..bce9ecdb77 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1615,7 +1615,7 @@ static void audit_copy_inode(struct audit_names *name, const struct inode *inode
 /**
  * audit_inode - store the inode and device from a lookup
  * @name: name being audited
- * @inode: inode being audited
+ * @dentry: dentry being audited
  *
  * Called from fs/namei.c:path_lookup().
  */
@@ -1650,7 +1650,7 @@ void __audit_inode(const char *name, const struct dentry *dentry)
 /**
  * audit_inode_child - collect inode info for created/removed objects
  * @dname: inode's dentry name
- * @inode: inode being audited
+ * @dentry: dentry being audited
  * @parent: inode of dentry parent
  *
  * For syscalls that create or remove filesystem objects, audit_inode
diff --git a/kernel/sched.c b/kernel/sched.c
index 7581e331b1..2810e562a9 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3375,7 +3375,6 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
 
         if (p->flags & PF_VCPU) {
                 account_guest_time(p, cputime);
-                p->flags &= ~PF_VCPU;
                 return;
         }
 
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index 3c9ef5a7d5..ed6fe51df7 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -731,7 +731,7 @@ static struct trans_ctl_table trans_net_table[] = {
         { NET_UNIX,             "unix",         trans_net_unix_table },
         { NET_IPV4,             "ipv4",         trans_net_ipv4_table },
         { NET_IPX,              "ipx",          trans_net_ipx_table },
-        { NET_ATALK,            "atalk",        trans_net_atalk_table },
+        { NET_ATALK,            "appletalk",    trans_net_atalk_table },
         { NET_NETROM,           "netrom",       trans_net_netrom_table },
         { NET_AX25,             "ax25",         trans_net_ax25_table },
         { NET_BRIDGE,           "bridge",       trans_net_bridge_table },