From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 7 Dec 2009 17:36:35 +0000 (+0100)
Subject: Merge branch 'for-next' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d014d043869cdc591f3a33243d3481fa4479c2d0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c
---

d014d043869cdc591f3a33243d3481fa4479c2d0
diff --cc arch/x86/kernel/amd_iommu.c
index 32fb09102a13,42ac5e000995..1c0fb4d4ad55
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@@ -2486,11 -2393,10 +2486,11 @@@ static struct iommu_ops amd_iommu_ops 
  
  int __init amd_iommu_init_passthrough(void)
  {
 +	struct amd_iommu *iommu;
  	struct pci_dev *dev = NULL;
 -	u16 devid, devid2;
 +	u16 devid;
  
- 	/* allocate passthroug domain */
+ 	/* allocate passthrough domain */
  	pt_domain = protection_domain_alloc();
  	if (!pt_domain)
  		return -ENOMEM;
diff --cc drivers/isdn/i4l/isdn_ppp.c
index 642d5aaf53ce,0f4ea7d16a15..45df6675e8ed
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@@ -1657,24 -1659,33 +1657,24 @@@ static void isdn_ppp_mp_receive(isdn_ne
  					 * packets */
  	newfrag = skb;
  
 -	/* Insert new fragment into the proper sequence slot.  */
 -	skb_queue_walk(&mp->frags, frag) {
 -		if (MP_SEQ(frag) == newseq) {
 -			isdn_ppp_mp_free_skb(mp, newfrag);
 -			newfrag = NULL;
 -			break;
 -		}
 -		if (MP_LT(newseq, MP_SEQ(frag))) {
 -			__skb_queue_before(&mp->frags, frag, newfrag);
 -			newfrag = NULL;
 -			break;
 -		}
 -	}
 -	if (newfrag)
 -		__skb_queue_tail(&mp->frags, newfrag);
 +  	/* if this new fragment is before the first one, then enqueue it now. */
 +  	if ((frag = mp->frags) == NULL || MP_LT(newseq, MP_SEQ(frag))) {
 +		newfrag->next = frag;
 +    		mp->frags = frag = newfrag;
 +    		newfrag = NULL;
 +  	}
  
 -	frag = skb_peek(&mp->frags);
 -	start = ((MP_FLAGS(frag) & MP_BEGIN_FRAG) &&
 -		 (MP_SEQ(frag) == mp->seq)) ? frag : NULL;
 -	if (!start)
 -		goto check_overflow;
 +  	start = MP_FLAGS(frag) & MP_BEGIN_FRAG &&
 +				MP_SEQ(frag) == mp->seq ? frag : NULL;
  
 -	/* main fragment traversing loop
 +	/* 
 +	 * main fragment traversing loop
  	 *
  	 * try to accomplish several tasks:
 +	 * - insert new fragment into the proper sequence slot (once that's done
 +	 *   newfrag will be set to NULL)
  	 * - reassemble any complete fragment sequence (non-null 'start'
- 	 *   indicates there is a continguous sequence present)
+ 	 *   indicates there is a contiguous sequence present)
  	 * - discard any incomplete sequences that are below minseq -- due
  	 *   to the fact that sender always increment sequence number, if there
  	 *   is an incomplete sequence below minseq, no new fragments would
diff --cc samples/Kconfig
index e4be84ac3d38,04be681a3ded..8924f72f0629
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@@ -40,11 -38,4 +38,10 @@@ config SAMPLE_KRETPROBE
  	default m
  	depends on SAMPLE_KPROBES && KRETPROBES
  
 +config SAMPLE_HW_BREAKPOINT
 +	tristate "Build kernel hardware breakpoint examples -- loadable module only"
 +	depends on HAVE_HW_BREAKPOINT && m
 +	help
 +	  This builds kernel hardware breakpoint example modules.
 +
  endif # SAMPLES
-