---

yaml --- r: 188847 b: refs/heads/master c: 5b89d2f h: refs/heads/master i: 188845: b84d0b5 188843: f7eb19c 188839: 77e3a5f 188831: 2bdfc9f v: v3
git-mirror · Mar 22, 2010 · 309ba31 · 309ba31
1 parent 8e5fae6
commit 309ba31
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3824d21eb653fe7017476724257ccaa8bf3d9e1
+refs/heads/master: 5b89d2f9ace1970324facc68ca9b8fae19ce8096
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd.c b/trunk/arch/x86/kernel/cpu/perf_event_amd.c
@@ -348,12 +348,10 @@ static void amd_pmu_cpu_offline(int cpu)
 
 	raw_spin_lock(&amd_nb_lock);
 
-	if (cpuhw->amd_nb) {
-		if (--cpuhw->amd_nb->refcnt == 0)
-			kfree(cpuhw->amd_nb);
+	if (--cpuhw->amd_nb->refcnt == 0)
+		kfree(cpuhw->amd_nb);
 
-		cpuhw->amd_nb = NULL;
-	}
+	cpuhw->amd_nb = NULL;
 
 	raw_spin_unlock(&amd_nb_lock);
 }

diff --git a/trunk/drivers/edac/edac_mce_amd.c b/trunk/drivers/edac/edac_mce_amd.c
@@ -316,7 +316,12 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
 		if (regs->nbsh & K8_NBSH_ERR_CPU_VAL)
 			pr_cont(", core: %u\n", (u8)(regs->nbsh & 0xf));
 	} else {
-		pr_cont(", core: %d\n", fls((regs->nbsh & 0xf) - 1));
+		u8 assoc_cpus = regs->nbsh & 0xf;
+
+		if (assoc_cpus > 0)
+			pr_cont(", core: %d", fls(assoc_cpus) - 1);
+
+		pr_cont("\n");
 	}
 
 	pr_emerg("%s.\n", EXT_ERR_MSG(xec));

diff --git a/trunk/fs/afs/security.c b/trunk/fs/afs/security.c
@@ -189,9 +189,8 @@ void afs_cache_permit(struct afs_vnode *vnode, struct key *key, long acl_order)
 	if (!permits)
 		goto out_unlock;
 
-	if (xpermits)
-		memcpy(permits->permits, xpermits->permits,
-			count * sizeof(struct afs_permit));
+	memcpy(permits->permits, xpermits->permits,
+	       count * sizeof(struct afs_permit));
 
 	_debug("key %x access %x",
 	       key_serial(key), vnode->status.caller_access);

diff --git a/trunk/ipc/syscall.c b/trunk/ipc/syscall.c
@@ -13,7 +13,7 @@
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
 
-SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
+SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, int, second,
 		unsigned long, third, void __user *, ptr, long, fifth)
 {
 	int version, ret;

diff --git a/trunk/net/rxrpc/ar-accept.c b/trunk/net/rxrpc/ar-accept.c
@@ -88,11 +88,6 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local,
 
 	/* get a notification message to send to the server app */
 	notification = alloc_skb(0, GFP_NOFS);
-	if (!notification) {
-		_debug("no memory");
-		ret = -ENOMEM;
-		goto error_nofree;
-	}
 	rxrpc_new_skb(notification);
 	notification->mark = RXRPC_SKB_MARK_NEW_CALL;
 
@@ -194,7 +189,6 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local,
 	ret = -ECONNREFUSED;
 error:
 	rxrpc_free_skb(notification);
-error_nofree:
 	_leave(" = %d", ret);
 	return ret;
 }