Commit a2df00fd authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'smp/hotplug' into x86/apic 

Pick up core changes on which the APIC IPI cleanups and shorthand support
series depends on.
parents 747d5a1b b9fa6442

arch/parisc/include/asm/kprobes.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ struct kprobe_ctlblk { 


int __kprobes parisc_kprobe_break_handler(struct pt_regs *regs);

int __kprobes parisc_kprobe_ss_handler(struct pt_regs *regs);

static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)

{

	return 0;

}



#endif /* CONFIG_KPROBES */

#endif /* _PARISC_KPROBES_H */

arch/parisc/kernel/pacache.S

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ENTRY_CFI(flush_tlb_all_local) 


	/* Flush Instruction Tlb */



	LDREG		ITLB_SID_BASE(%r1), %r20

88:	LDREG		ITLB_SID_BASE(%r1), %r20

	LDREG		ITLB_SID_STRIDE(%r1), %r21

	LDREG		ITLB_SID_COUNT(%r1), %r22

	LDREG		ITLB_OFF_BASE(%r1), %arg0
@@ -103,6 +103,7 @@ fitonemiddle: /* Loop if LOOP = 1 */ 
	add		%r21, %r20, %r20		/* increment space */



fitdone:

	ALTERNATIVE(88b, fitdone, ALT_COND_NO_SPLIT_TLB, INSN_NOP)



	/* Flush Data Tlb */

drivers/connector/connector.c

+1 −5
Original line number Diff line number Diff line
@@ -248,16 +248,12 @@ static int __maybe_unused cn_proc_show(struct seq_file *m, void *v) 
	return 0;

}



static struct cn_dev cdev = {

	.input   = cn_rx_skb,

};



static int cn_init(void)

{

	struct cn_dev *dev = &cdev;

	struct netlink_kernel_cfg cfg = {

		.groups	= CN_NETLINK_USERS + 0xf,

		.input	= dev->input,

		.input	= cn_rx_skb,

	};



	dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, &cfg);

drivers/media/v4l2-core/v4l2-subdev.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static inline int check_which(__u32 which) 
static inline int check_pad(struct v4l2_subdev *sd, __u32 pad)

{

#if defined(CONFIG_MEDIA_CONTROLLER)

	if (sd->entity.graph_obj.mdev) {

	if (sd->entity.num_pads) {

		if (pad >= sd->entity.num_pads)

			return -EINVAL;

		return 0;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+3 −0
Original line number Diff line number Diff line
@@ -285,6 +285,9 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata) 
	hw_cons = le16_to_cpu(*txdata->tx_cons_sb);

	sw_cons = txdata->tx_pkt_cons;



	/* Ensure subsequent loads occur after hw_cons */

	smp_rmb();



	while (sw_cons != hw_cons) {

		u16 pkt_cons;