---

yaml
---
r: 40433
b: refs/heads/master
c: 346f5c7
h: refs/heads/master
i:
  40431: d400ce8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67
+refs/heads/master: 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0

trunk/arch/m68k/kernel/vmlinux-std.lds

@@ -54,7 +54,13 @@ SECTIONS
   __setup_end = .;
   __initcall_start = .;
   .initcall.init : {
-	INITCALLS
+	*(.initcall1.init)
+	*(.initcall2.init)
+	*(.initcall3.init)
+	*(.initcall4.init)
+	*(.initcall5.init)
+	*(.initcall6.init)
+	*(.initcall7.init)
   }
   __initcall_end = .;
   __con_initcall_start = .;

trunk/arch/m68k/kernel/vmlinux-sun3.lds

@@ -48,7 +48,13 @@ __init_begin = .;
 	__setup_end = .;
 	__initcall_start = .;
 	.initcall.init : {
-		INITCALLS
+		*(.initcall1.init)
+		*(.initcall2.init)
+		*(.initcall3.init)
+		*(.initcall4.init)
+		*(.initcall5.init)
+		*(.initcall6.init)
+		*(.initcall7.init)
 	}
 	__initcall_end = .;
 	__con_initcall_start = .;

trunk/drivers/ieee1394/ohci1394.c

@@ -3552,12 +3552,21 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 {
 	int err;
 
+	printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
+	       OHCI1394_DRIVER_NAME);
+
 	err = pci_save_state(pdev);
-	if (err)
-		goto out;
+	if (err) {
+		printk(KERN_ERR "%s: pci_save_state failed with %d\n",
+		       OHCI1394_DRIVER_NAME, err);
+		return err;
+	}
 	err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+#ifdef OHCI1394_DEBUG
 	if (err)
-		goto out;
+		printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n",
+		       OHCI1394_DRIVER_NAME, err);
+#endif /* OHCI1394_DEBUG */
 
 /* PowerMac suspend code comes last */
 #ifdef CONFIG_PPC_PMAC
@@ -3570,8 +3579,8 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 			pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
 	}
 #endif /* CONFIG_PPC_PMAC */
-out:
-	return err;
+
+	return 0;
 }
 #endif /* CONFIG_PM */
 

trunk/kernel/taskstats.c

@@ -77,8 +77,7 @@ static int prepare_reply(struct genl_info *info, u8 cmd, struct sk_buff **skbp,
 	/*
 	 * If new attributes are added, please revisit this allocation
 	 */
-	size = nlmsg_total_size(genlmsg_total_size(size));
-	skb = nlmsg_new(size, GFP_KERNEL);
+	skb = nlmsg_new(genlmsg_total_size(size), GFP_KERNEL);
 	if (!skb)
 		return -ENOMEM;
 
@@ -412,7 +411,7 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
 	return send_reply(rep_skb, info->snd_pid);
 
 nla_put_failure:
-	rc = genlmsg_cancel(rep_skb, reply);
+	return genlmsg_cancel(rep_skb, reply);
 err:
 	nlmsg_free(rep_skb);
 	return rc;
@@ -508,6 +507,7 @@ void taskstats_exit_send(struct task_struct *tsk, struct taskstats *tidstats,
 
 nla_put_failure:
 	genlmsg_cancel(rep_skb, reply);
+	goto ret;
 err_skb:
 	nlmsg_free(rep_skb);
 ret: