Update Grsec/PaX20110511

 2.2.2-2.6.32.40-201105111839
 2.2.2-2.6.38.6-201105111839

10 files changed, 15551 insertions, 11477 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index c7284cd..f11f999 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,19 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:  1036_linux-2.6.32.37.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.32.37
-
-Patch:  1037_linux-2.6.32.38.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.32.38
-
-Patch:  1038_linux-2.6.32.39.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.32.39
-
-Patch:	4420_grsecurity-2.2.2-2.6.32.39-201104301754.patch
+Patch:	4420_grsecurity-2.2.2-2.6.32.40-201105111839.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.32/1036_linux-2.6.32.37.patch b/2.6.32/1036_linux-2.6.32.37.patch
deleted file mode 100644
index c2d8bf9..0000000
--- a/2.6.32/1036_linux-2.6.32.37.patch
+++ /dev/null
@@ -1,2592 +0,0 @@
-diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
-index fe02e71..5009198 100644
---- a/arch/powerpc/kernel/crash.c
-+++ b/arch/powerpc/kernel/crash.c
-@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
- }
- 
- /* wait for all the CPUs to hit real mode but timeout if they don't come in */
-+#ifdef CONFIG_PPC_STD_MMU_64
- static void crash_kexec_wait_realmode(int cpu)
- {
- 	unsigned int msecs;
-@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
- 	}
- 	mb();
- }
-+#endif
- 
- /*
-  * This function will be called by secondary cpus or by kexec cpu
-@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
- 	crash_kexec_prepare_cpus(crashing_cpu);
- 	cpu_set(crashing_cpu, cpus_in_crash);
- 	crash_kexec_stop_spus();
-+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
- 	crash_kexec_wait_realmode(crashing_cpu);
-+#endif
- 	if (ppc_md.kexec_cpu_down)
- 		ppc_md.kexec_cpu_down(1, 0);
- }
-diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
-index 419e328..fd60f09 100644
---- a/arch/x86/kernel/cpu/mtrr/main.c
-+++ b/arch/x86/kernel/cpu/mtrr/main.c
-@@ -262,14 +262,24 @@ set_mtrr(unsigned int reg, unsigned long base, unsigned long size, mtrr_type typ
- 
- 	/*
- 	 * HACK!
--	 * We use this same function to initialize the mtrrs on boot.
--	 * The state of the boot cpu's mtrrs has been saved, and we want
--	 * to replicate across all the APs.
--	 * If we're doing that @reg is set to something special...
-+	 *
-+	 * We use this same function to initialize the mtrrs during boot,
-+	 * resume, runtime cpu online and on an explicit request to set a
-+	 * specific MTRR.
-+	 *
-+	 * During boot or suspend, the state of the boot cpu's mtrrs has been
-+	 * saved, and we want to replicate that across all the cpus that come
-+	 * online (either at the end of boot or resume or during a runtime cpu
-+	 * online). If we're doing that, @reg is set to something special and on
-+	 * this cpu we still do mtrr_if->set_all(). During boot/resume, this
-+	 * is unnecessary if at this point we are still on the cpu that started
-+	 * the boot/resume sequence. But there is no guarantee that we are still
-+	 * on the same cpu. So we do mtrr_if->set_all() on this cpu aswell to be
-+	 * sure that we are in sync with everyone else.
- 	 */
- 	if (reg != ~0U)
- 		mtrr_if->set(reg, base, size, type);
--	else if (!mtrr_aps_delayed_init)
-+	else
- 		mtrr_if->set_all();
- 
- 	/* Wait for the others */
-diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
-index 0b08160..0b06cd7 100644
---- a/arch/x86/kernel/head64.c
-+++ b/arch/x86/kernel/head64.c
-@@ -76,6 +76,9 @@ void __init x86_64_start_kernel(char * real_mode_data)
- 	/* Make NULL pointers segfault */
- 	zap_identity_mappings();
- 
-+	/* Cleanup the over mapped high alias */
-+	cleanup_highmap();
-+
- 	for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) {
- #ifdef CONFIG_EARLY_PRINTK
- 		set_intr_gate(i, &early_idt_handlers[i]);
-diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
-index f4c538b..1e47679 100644
---- a/arch/x86/kernel/microcode_amd.c
-+++ b/arch/x86/kernel/microcode_amd.c
-@@ -63,7 +63,6 @@ struct microcode_amd {
- 	unsigned int			mpb[0];
- };
- 
--#define UCODE_MAX_SIZE			2048
- #define UCODE_CONTAINER_SECTION_HDR	8
- #define UCODE_CONTAINER_HEADER_SIZE	12
- 
-@@ -109,12 +108,8 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
- 		return 0;
- 	}
- 
--	if (mc_header->processor_rev_id != equiv_cpu_id) {
--		printk(KERN_ERR	"microcode: CPU%d: patch mismatch "
--		       "(processor_rev_id: %x, equiv_cpu_id: %x)\n",
--		       cpu, mc_header->processor_rev_id, equiv_cpu_id);
-+	if (mc_header->processor_rev_id != equiv_cpu_id)
- 		return 0;
--	}
- 
- 	/* ucode might be chipset specific -- currently we don't support this */
- 	if (mc_header->nb_dev_id || mc_header->sb_dev_id) {
-@@ -129,6 +124,37 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
- 	return 1;
- }
- 
-+static unsigned int verify_ucode_size(int cpu, const u8 *buf, unsigned int size)
-+{
-+	struct cpuinfo_x86 *c = &cpu_data(cpu);
-+	unsigned int max_size, actual_size;
-+
-+#define F1XH_MPB_MAX_SIZE 2048
-+#define F14H_MPB_MAX_SIZE 1824
-+#define F15H_MPB_MAX_SIZE 4096
-+
-+	switch (c->x86) {
-+	case 0x14:
-+		max_size = F14H_MPB_MAX_SIZE;
-+		break;
-+	case 0x15:
-+		max_size = F15H_MPB_MAX_SIZE;
-+		break;
-+	default:
-+		max_size = F1XH_MPB_MAX_SIZE;
-+		break;
-+	}
-+
-+	actual_size = buf[4] + (buf[5] << 8);
-+
-+	if (actual_size > size || actual_size > max_size) {
-+		pr_err("section size mismatch\n");
-+		return 0;
-+	}
-+
-+	return actual_size;
-+}
-+
- static int apply_microcode_amd(int cpu)
- {
- 	u32 rev, dummy;
-@@ -168,11 +194,11 @@ static int get_ucode_data(void *to, const u8 *from, size_t n)
- }
- 
- static void *
--get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
-+get_next_ucode(int cpu, const u8 *buf, unsigned int size, unsigned int *mc_size)
- {
--	unsigned int total_size;
-+	unsigned int actual_size = 0;
- 	u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
--	void *mc;
-+	void *mc = NULL;
- 
- 	if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
- 		return NULL;
-@@ -183,26 +209,18 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
- 		return NULL;
- 	}
- 
--	total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));
--
--	printk(KERN_DEBUG "microcode: size %u, total_size %u\n",
--	       size, total_size);
-+	actual_size = verify_ucode_size(cpu, buf, size);
-+	if (!actual_size)
-+		return NULL;
- 
--	if (total_size > size || total_size > UCODE_MAX_SIZE) {
--		printk(KERN_ERR "microcode: error: size mismatch\n");
-+	mc = vmalloc(actual_size);
-+	if (!mc)
- 		return NULL;
--	}
- 
--	mc = vmalloc(UCODE_MAX_SIZE);
--	if (mc) {
--		memset(mc, 0, UCODE_MAX_SIZE);
--		if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR,
--				   total_size)) {
--			vfree(mc);
--			mc = NULL;
--		} else
--			*mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
--	}
-+	memset(mc, 0, actual_size);
-+	get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, actual_size);
-+	*mc_size = actual_size + UCODE_CONTAINER_SECTION_HDR;
-+
- 	return mc;
- }
- 
-@@ -271,7 +289,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
- 		unsigned int uninitialized_var(mc_size);
- 		struct microcode_header_amd *mc_header;
- 
--		mc = get_next_ucode(ucode_ptr, leftover, &mc_size);
-+		mc = get_next_ucode(cpu, ucode_ptr, leftover, &mc_size);
- 		if (!mc)
- 			break;
- 
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 76358ee..5449a26 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -294,9 +294,6 @@ static void __init init_gbpages(void)
- static inline void init_gbpages(void)
- {
- }
--static void __init cleanup_highmap(void)
--{
--}
- #endif
- 
- static void __init reserve_brk(void)
-@@ -924,8 +921,6 @@ void __init setup_arch(char **cmdline_p)
- 
- 	reserve_brk();
- 
--	cleanup_highmap();
--
- 	init_gbpages();
- 
- 	/* max_pfn_mapped is updated here */
-diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 6bce215..73ffd55 100644
---- a/arch/x86/mm/init.c
-+++ b/arch/x86/mm/init.c
-@@ -287,6 +287,25 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
- 	load_cr3(swapper_pg_dir);
- #endif
- 
-+#ifdef CONFIG_X86_64
-+	if (!after_bootmem && !start) {
-+		pud_t *pud;
-+		pmd_t *pmd;
-+
-+		mmu_cr4_features = read_cr4();
-+
-+		/*
-+		 * _brk_end cannot change anymore, but it and _end may be
-+		 * located on different 2M pages. cleanup_highmap(), however,
-+		 * can only consider _end when it runs, so destroy any
-+		 * mappings beyond _brk_end here.
-+		 */
-+		pud = pud_offset(pgd_offset_k(_brk_end), _brk_end);
-+		pmd = pmd_offset(pud, _brk_end - 1);
-+		while (++pmd <= pmd_offset(pud, (unsigned long)_end - 1))
-+			pmd_clear(pmd);
-+	}
-+#endif
- 	__flush_tlb_all();
- 
- 	if (!after_bootmem && e820_table_end > e820_table_start)
-diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index 1584023..7d095ad 100644
---- a/arch/x86/mm/init_64.c
-+++ b/arch/x86/mm/init_64.c
-@@ -49,7 +49,6 @@
- #include <asm/numa.h>
- #include <asm/cacheflush.h>
- #include <asm/init.h>
--#include <asm/setup.h>
- #include <linux/bootmem.h>
- 
- static unsigned long dma_reserve __initdata;
-@@ -258,18 +257,18 @@ void __init init_extra_mapping_uc(unsigned long phys, unsigned long size)
-  * to the compile time generated pmds. This results in invalid pmds up
-  * to the point where we hit the physaddr 0 mapping.
-  *
-- * We limit the mappings to the region from _text to _brk_end.  _brk_end
-- * is rounded up to the 2MB boundary. This catches the invalid pmds as
-+ * We limit the mappings to the region from _text to _end.  _end is
-+ * rounded up to the 2MB boundary. This catches the invalid pmds as
-  * well, as they are located before _text:
-  */
- void __init cleanup_highmap(void)
- {
- 	unsigned long vaddr = __START_KERNEL_map;
--	unsigned long vaddr_end = __START_KERNEL_map + (max_pfn_mapped << PAGE_SHIFT);
--	unsigned long end = roundup((unsigned long)_brk_end, PMD_SIZE) - 1;
-+	unsigned long end = roundup((unsigned long)_end, PMD_SIZE) - 1;
- 	pmd_t *pmd = level2_kernel_pgt;
-+	pmd_t *last_pmd = pmd + PTRS_PER_PMD;
- 
--	for (; vaddr + PMD_SIZE - 1 < vaddr_end; pmd++, vaddr += PMD_SIZE) {
-+	for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
- 		if (pmd_none(*pmd))
- 			continue;
- 		if (vaddr < (unsigned long) _text || vaddr > end)
-diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index a73f102..84c93ff 100644
---- a/drivers/atm/solos-pci.c
-+++ b/drivers/atm/solos-pci.c
-@@ -688,7 +688,7 @@ void solos_bh(unsigned long card_arg)
- 					      size);
- 			}
- 			if (atmdebug) {
--				dev_info(&card->dev->dev, "Received: device %d\n", port);
-+				dev_info(&card->dev->dev, "Received: port %d\n", port);
- 				dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",
- 					 size, le16_to_cpu(header->vpi),
- 					 le16_to_cpu(header->vci));
-@@ -1008,8 +1008,15 @@ static uint32_t fpga_tx(struct solos_card *card)
- 
- 			/* Clean up and free oldskb now it's gone */
- 			if (atmdebug) {
-+				struct pkt_hdr *header = (void *)oldskb->data;
-+				int size = le16_to_cpu(header->size);
-+
-+				skb_pull(oldskb, sizeof(*header));
- 				dev_info(&card->dev->dev, "Transmitted: port %d\n",
- 					 port);
-+				dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",
-+					 size, le16_to_cpu(header->vpi),
-+					 le16_to_cpu(header->vci));
- 				print_buffer(oldskb);
- 			}
- 
-diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
-index 31524cf..5ae1b1c 100644
---- a/drivers/block/cciss.h
-+++ b/drivers/block/cciss.h
-@@ -165,6 +165,7 @@ static void SA5_submit_command( ctlr_info_t *h, CommandList_struct *c)
- 	 printk("Sending %x - down to controller\n", c->busaddr );
- #endif /* CCISS_DEBUG */ 
-          writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
-+	readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
- 	 h->commands_outstanding++;
- 	 if ( h->commands_outstanding > h->max_outstanding)
- 		h->max_outstanding = h->commands_outstanding;
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 0e9c564..c12d0fb 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -62,6 +62,9 @@ static struct usb_device_id btusb_table[] = {
- 	/* Apple iMac11,1 */
- 	{ USB_DEVICE(0x05ac, 0x8215) },
- 
-+	/* Apple MacBookPro8,2 */
-+	{ USB_DEVICE(0x05ac, 0x821a) },
-+
- 	/* AVM BlueFRITZ! USB v2.0 */
- 	{ USB_DEVICE(0x057c, 0x3800) },
- 
-diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
-index 8548ae7..edd7b7f 100644
---- a/drivers/char/tpm/tpm.c
-+++ b/drivers/char/tpm/tpm.c
-@@ -969,7 +969,7 @@ int tpm_open(struct inode *inode, struct file *file)
- 		return -EBUSY;
- 	}
- 
--	chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
-+	chip->data_buffer = kzalloc(TPM_BUFSIZE, GFP_KERNEL);
- 	if (chip->data_buffer == NULL) {
- 		clear_bit(0, &chip->is_open);
- 		put_device(chip->dev);
-diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
-index 6134810..78e3e85 100644
---- a/drivers/mfd/ab3100-core.c
-+++ b/drivers/mfd/ab3100-core.c
-@@ -591,7 +591,7 @@ static void ab3100_setup_debugfs(struct ab3100 *ab3100)
- 	ab3100_get_priv.ab3100 = ab3100;
- 	ab3100_get_priv.mode = false;
- 	ab3100_get_reg_file = debugfs_create_file("get_reg",
--				S_IWUGO, ab3100_dir, &ab3100_get_priv,
-+				S_IWUSR, ab3100_dir, &ab3100_get_priv,
- 				&ab3100_get_set_reg_fops);
- 	if (!ab3100_get_reg_file) {
- 		err = -ENOMEM;
-@@ -601,7 +601,7 @@ static void ab3100_setup_debugfs(struct ab3100 *ab3100)
- 	ab3100_set_priv.ab3100 = ab3100;
- 	ab3100_set_priv.mode = true;
- 	ab3100_set_reg_file = debugfs_create_file("set_reg",
--				S_IWUGO, ab3100_dir, &ab3100_set_priv,
-+				S_IWUSR, ab3100_dir, &ab3100_set_priv,
- 				&ab3100_get_set_reg_fops);
- 	if (!ab3100_set_reg_file) {
- 		err = -ENOMEM;
-diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c
-index ba46941..3f9a0ab 100644
---- a/drivers/misc/ep93xx_pwm.c
-+++ b/drivers/misc/ep93xx_pwm.c
-@@ -248,11 +248,11 @@ static ssize_t ep93xx_pwm_set_invert(struct device *dev,
- 
- static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL);
- static DEVICE_ATTR(max_freq, S_IRUGO, ep93xx_pwm_get_max_freq, NULL);
--static DEVICE_ATTR(freq, S_IWUGO | S_IRUGO,
-+static DEVICE_ATTR(freq, S_IWUSR | S_IRUGO,
- 		   ep93xx_pwm_get_freq, ep93xx_pwm_set_freq);
--static DEVICE_ATTR(duty_percent, S_IWUGO | S_IRUGO,
-+static DEVICE_ATTR(duty_percent, S_IWUSR | S_IRUGO,
- 		   ep93xx_pwm_get_duty_percent, ep93xx_pwm_set_duty_percent);
--static DEVICE_ATTR(invert, S_IWUGO | S_IRUGO,
-+static DEVICE_ATTR(invert, S_IWUSR | S_IRUGO,
- 		   ep93xx_pwm_get_invert, ep93xx_pwm_set_invert);
- 
- static struct attribute *ep93xx_pwm_attrs[] = {
-diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
-index f362451..b8dc2d1 100644
---- a/drivers/net/myri10ge/myri10ge.c
-+++ b/drivers/net/myri10ge/myri10ge.c
-@@ -3640,6 +3640,7 @@ static void myri10ge_free_slices(struct myri10ge_priv *mgp)
- 			dma_free_coherent(&pdev->dev, bytes,
- 					  ss->fw_stats, ss->fw_stats_bus);
- 			ss->fw_stats = NULL;
-+			netif_napi_del(&ss->napi);
- 		}
- 	}
- 	kfree(mgp->ss);
-diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
-index 0c349ce..54e716a 100644
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1918,6 +1918,8 @@ static int ath9k_start(struct ieee80211_hw *hw)
- 	DPRINTF(sc, ATH_DBG_CONFIG, "Starting driver with "
- 		"initial channel: %d MHz\n", curchan->center_freq);
- 
-+	ath9k_ps_wakeup(sc);
-+
- 	mutex_lock(&sc->mutex);
- 
- 	if (ath9k_wiphy_started(sc)) {
-@@ -2025,6 +2027,8 @@ static int ath9k_start(struct ieee80211_hw *hw)
- mutex_unlock:
- 	mutex_unlock(&sc->mutex);
- 
-+	ath9k_ps_restore(sc);
-+
- 	return r;
- }
- 
-diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
-index 571d475..8bf4bbd 100644
---- a/drivers/net/wireless/b43/dma.c
-+++ b/drivers/net/wireless/b43/dma.c
-@@ -1521,7 +1521,7 @@ static void dma_rx(struct b43_dmaring *ring, int *slot)
- 		dmaaddr = meta->dmaaddr;
- 		goto drop_recycle_buffer;
- 	}
--	if (unlikely(len > ring->rx_buffersize)) {
-+	if (unlikely(len + ring->frameoffset > ring->rx_buffersize)) {
- 		/* The data did not fit into one descriptor buffer
- 		 * and is split over multiple buffers.
- 		 * This should never happen, as we try to allocate buffers
-diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
-index f0b0838..ceee7a3 100644
---- a/drivers/net/wireless/b43/dma.h
-+++ b/drivers/net/wireless/b43/dma.h
-@@ -163,7 +163,7 @@ struct b43_dmadesc_generic {
- /* DMA engine tuning knobs */
- #define B43_TXRING_SLOTS		256
- #define B43_RXRING_SLOTS		64
--#define B43_DMA0_RX_BUFFERSIZE		IEEE80211_MAX_FRAME_LEN
-+#define B43_DMA0_RX_BUFFERSIZE		(B43_DMA0_RX_FRAMEOFFSET + IEEE80211_MAX_FRAME_LEN)
- 
- 
- struct sk_buff;
-diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
-index 0a2bf5c..54c3a9d 100644
---- a/drivers/net/wireless/p54/p54usb.c
-+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -54,6 +54,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
- 	{USB_DEVICE(0x0846, 0x4210)},	/* Netgear WG121 the second ? */
- 	{USB_DEVICE(0x0846, 0x4220)},	/* Netgear WG111 */
- 	{USB_DEVICE(0x09aa, 0x1000)},	/* Spinnaker Proto board */
-+	{USB_DEVICE(0x0bf8, 0x1007)},	/* Fujitsu E-5400 USB */
- 	{USB_DEVICE(0x0cde, 0x0006)},	/* Medion 40900, Roper Europe */
- 	{USB_DEVICE(0x0db0, 0x6826)},	/* MSI UB54G (MS-6826) */
- 	{USB_DEVICE(0x107b, 0x55f2)},	/* Gateway WGU-210 (Gemtek) */
-@@ -66,6 +67,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
- 	{USB_DEVICE(0x1915, 0x2235)},	/* Linksys WUSB54G Portable OEM */
- 	{USB_DEVICE(0x2001, 0x3701)},	/* DLink DWL-G120 Spinnaker */
- 	{USB_DEVICE(0x2001, 0x3703)},	/* DLink DWL-G122 */
-+	{USB_DEVICE(0x2001, 0x3762)},	/* Conceptronic C54U */
- 	{USB_DEVICE(0x5041, 0x2234)},	/* Linksys WUSB54G */
- 	{USB_DEVICE(0x5041, 0x2235)},	/* Linksys WUSB54G Portable */
- 
-diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
-index 0b6b773..21c2181 100644
---- a/drivers/rtc/rtc-ds1511.c
-+++ b/drivers/rtc/rtc-ds1511.c
-@@ -480,7 +480,7 @@ ds1511_nvram_write(struct kobject *kobj, struct bin_attribute *bin_attr,
- static struct bin_attribute ds1511_nvram_attr = {
- 	.attr = {
- 		.name = "nvram",
--		.mode = S_IRUGO | S_IWUGO,
-+		.mode = S_IRUGO | S_IWUSR,
- 	},
- 	.size = DS1511_RAM_MAX,
- 	.read = ds1511_nvram_read,
-diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
-index 3c8a024..3b082dd 100644
---- a/drivers/scsi/ses.c
-+++ b/drivers/scsi/ses.c
-@@ -389,9 +389,9 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
- 		len = (desc_ptr[2] << 8) + desc_ptr[3];
- 		/* skip past overall descriptor */
- 		desc_ptr += len + 4;
--		if (ses_dev->page10)
--			addl_desc_ptr = ses_dev->page10 + 8;
- 	}
-+	if (ses_dev->page10)
-+		addl_desc_ptr = ses_dev->page10 + 8;
- 	type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
- 	components = 0;
- 	for (i = 0; i < types; i++, type_ptr += 4) {
-diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
-index 746370e..366dc95 100644
---- a/drivers/staging/hv/Channel.c
-+++ b/drivers/staging/hv/Channel.c
-@@ -75,14 +75,14 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
- 
- 	if (Channel->OfferMsg.MonitorAllocated) {
- 		/* Each u32 represents 32 channels */
--		set_bit(Channel->OfferMsg.ChildRelId & 31,
-+		sync_set_bit(Channel->OfferMsg.ChildRelId & 31,
- 			(unsigned long *) gVmbusConnection.SendInterruptPage +
- 			(Channel->OfferMsg.ChildRelId >> 5));
- 
- 		monitorPage = gVmbusConnection.MonitorPages;
- 		monitorPage++; /* Get the child to parent monitor page */
- 
--		set_bit(Channel->MonitorBit,
-+		sync_set_bit(Channel->MonitorBit,
- 			(unsigned long *)&monitorPage->TriggerGroup
- 					[Channel->MonitorGroup].Pending);
- 
-@@ -102,7 +102,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
- 
- 	if (Channel->OfferMsg.MonitorAllocated) {
- 		/* Each u32 represents 32 channels */
--		clear_bit(Channel->OfferMsg.ChildRelId & 31,
-+		sync_clear_bit(Channel->OfferMsg.ChildRelId & 31,
- 			  (unsigned long *)gVmbusConnection.SendInterruptPage +
- 			  (Channel->OfferMsg.ChildRelId >> 5));
- 
-@@ -110,7 +110,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
- 			(struct hv_monitor_page *)gVmbusConnection.MonitorPages;
- 		monitorPage++; /* Get the child to parent monitor page */
- 
--		clear_bit(Channel->MonitorBit,
-+		sync_clear_bit(Channel->MonitorBit,
- 			  (unsigned long *)&monitorPage->TriggerGroup
- 					[Channel->MonitorGroup].Pending);
- 	}
-diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c
-index 43c2e68..c8d073a 100644
---- a/drivers/staging/hv/Connection.c
-+++ b/drivers/staging/hv/Connection.c
-@@ -284,7 +284,9 @@ void VmbusOnEvents(void)
- 		for (dword = 0; dword < maxdword; dword++) {
- 			if (recvInterruptPage[dword]) {
- 				for (bit = 0; bit < 32; bit++) {
--					if (test_and_clear_bit(bit, (unsigned long *)&recvInterruptPage[dword])) {
-+					if (sync_test_and_clear_bit(bit,
-+						(unsigned long *)
-+						&recvInterruptPage[dword])) {
- 						relid = (dword << 5) + bit;
- 						DPRINT_DBG(VMBUS, "event detected for relid - %d", relid);
- 
-@@ -329,7 +331,7 @@ int VmbusSetEvent(u32 childRelId)
- 	DPRINT_ENTER(VMBUS);
- 
- 	/* Each u32 represents 32 channels */
--	set_bit(childRelId & 31,
-+	sync_set_bit(childRelId & 31,
- 		(unsigned long *)gVmbusConnection.SendInterruptPage +
- 		(childRelId >> 5));
- 
-diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
-index 35a023e..2a4ba03 100644
---- a/drivers/staging/hv/Vmbus.c
-+++ b/drivers/staging/hv/Vmbus.c
-@@ -254,7 +254,7 @@ static int VmbusOnISR(struct hv_driver *drv)
- 	event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
- 
- 	/* Since we are a child, we only need to check bit 0 */
--	if (test_and_clear_bit(0, (unsigned long *) &event->Flags32[0])) {
-+	if (sync_test_and_clear_bit(0, (unsigned long *) &event->Flags32[0])) {
- 		DPRINT_DBG(VMBUS, "received event %d", event->Flags32[0]);
- 		ret |= 0x2;
- 	}
-diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
-index 05ad2c9..5a37cce 100644
---- a/drivers/staging/hv/VmbusPrivate.h
-+++ b/drivers/staging/hv/VmbusPrivate.h
-@@ -32,6 +32,7 @@
- #include "ChannelInterface.h"
- #include "RingBuffer.h"
- #include <linux/list.h>
-+#include <asm/sync_bitops.h>
- 
- 
- /*
-diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
-index a5101e3..44d8d6f 100644
---- a/drivers/staging/hv/netvsc_drv.c
-+++ b/drivers/staging/hv/netvsc_drv.c
-@@ -44,6 +44,7 @@ struct net_device_context {
- 	/* point back to our device context */
- 	struct device_context *device_ctx;
- 	struct net_device_stats stats;
-+	struct work_struct work;
- };
- 
- struct netvsc_driver_context {
-@@ -284,6 +285,7 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
- {
- 	struct device_context *device_ctx = to_device_context(device_obj);
- 	struct net_device *net = dev_get_drvdata(&device_ctx->device);
-+	struct net_device_context *ndev_ctx;
- 
- 	DPRINT_ENTER(NETVSC_DRV);
- 
-@@ -297,6 +299,8 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
- 		netif_carrier_on(net);
- 		netif_wake_queue(net);
- 		netif_notify_peers(net);
-+		ndev_ctx = netdev_priv(net);
-+		schedule_work(&ndev_ctx->work);
- 	} else {
- 		netif_carrier_off(net);
- 		netif_stop_queue(net);
-@@ -398,6 +402,25 @@ static const struct net_device_ops device_ops = {
- 	.ndo_set_mac_address =		eth_mac_addr,
- };
- 
-+/*
-+ * Send GARP packet to network peers after migrations.
-+ * After Quick Migration, the network is not immediately operational in the
-+ * current context when receiving RNDIS_STATUS_MEDIA_CONNECT event. So, add
-+ * another netif_notify_peers() into a scheduled work, otherwise GARP packet
-+ * will not be sent after quick migration, and cause network disconnection.
-+ */
-+static void netvsc_send_garp(struct work_struct *w)
-+{
-+	struct net_device_context *ndev_ctx;
-+	struct net_device *net;
-+
-+	msleep(20);
-+	ndev_ctx = container_of(w, struct net_device_context, work);
-+	net = dev_get_drvdata(&ndev_ctx->device_ctx->device);
-+	netif_notify_peers(net);
-+}
-+
-+
- static int netvsc_probe(struct device *device)
- {
- 	struct driver_context *driver_ctx =
-@@ -428,6 +451,7 @@ static int netvsc_probe(struct device *device)
- 	net_device_ctx = netdev_priv(net);
- 	net_device_ctx->device_ctx = device_ctx;
- 	dev_set_drvdata(device, net);
-+	INIT_WORK(&net_device_ctx->work, netvsc_send_garp);
- 
- 	/* Notify the netvsc driver of the new device */
- 	ret = net_drv_obj->Base.OnDeviceAdd(device_obj, &device_info);
-diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c
-index 815fb7c..a9cdc4c 100644
---- a/drivers/staging/usbip/stub_rx.c
-+++ b/drivers/staging/usbip/stub_rx.c
-@@ -168,33 +168,23 @@ static int tweak_set_configuration_cmd(struct urb *urb)
- 
- static int tweak_reset_device_cmd(struct urb *urb)
- {
--	struct usb_ctrlrequest *req;
--	__u16 value;
--	__u16 index;
--	int ret;
--
--	req = (struct usb_ctrlrequest *) urb->setup_packet;
--	value = le16_to_cpu(req->wValue);
--	index = le16_to_cpu(req->wIndex);
--
--	usbip_uinfo("reset_device (port %d) to %s\n", index,
--						dev_name(&urb->dev->dev));
-+	struct stub_priv *priv = (struct stub_priv *) urb->context;
-+	struct stub_device *sdev = priv->sdev;
- 
--	/* all interfaces should be owned by usbip driver, so just reset it.  */
--	ret = usb_lock_device_for_reset(urb->dev, NULL);
--	if (ret < 0) {
--		dev_err(&urb->dev->dev, "lock for reset\n");
--		return ret;
--	}
--
--	/* try to reset the device */
--	ret = usb_reset_device(urb->dev);
--	if (ret < 0)
--		dev_err(&urb->dev->dev, "device reset\n");
-+	usbip_uinfo("reset_device %s\n", dev_name(&urb->dev->dev));
- 
--	usb_unlock_device(urb->dev);
--
--	return ret;
-+	/*
-+	 * usb_lock_device_for_reset caused a deadlock: it causes the driver
-+	 * to unbind. In the shutdown the rx thread is signalled to shut down
-+	 * but this thread is pending in the usb_lock_device_for_reset.
-+	 *
-+	 * Instead queue the reset.
-+	 *
-+	 * Unfortunatly an existing usbip connection will be dropped due to
-+	 * driver unbinding.
-+	 */
-+	usb_queue_reset_device(sdev->interface);
-+	return 0;
- }
- 
- /*
-diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c
-index e2ab4f3..523d7ff 100644
---- a/drivers/staging/usbip/stub_tx.c
-+++ b/drivers/staging/usbip/stub_tx.c
-@@ -167,7 +167,6 @@ static int stub_send_ret_submit(struct stub_device *sdev)
- 	struct stub_priv *priv, *tmp;
- 
- 	struct msghdr msg;
--	struct kvec iov[3];
- 	size_t txsize;
- 
- 	size_t total_size = 0;
-@@ -177,28 +176,73 @@ static int stub_send_ret_submit(struct stub_device *sdev)
- 		struct urb *urb = priv->urb;
- 		struct usbip_header pdu_header;
- 		void *iso_buffer = NULL;
-+		struct kvec *iov = NULL;
-+		int iovnum = 0;
- 
- 		txsize = 0;
- 		memset(&pdu_header, 0, sizeof(pdu_header));
- 		memset(&msg, 0, sizeof(msg));
--		memset(&iov, 0, sizeof(iov));
- 
--		usbip_dbg_stub_tx("setup txdata urb %p\n", urb);
-+		if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
-+			iovnum = 2 + urb->number_of_packets;
-+		else
-+			iovnum = 2;
-+
-+		iov = kzalloc(iovnum * sizeof(struct kvec), GFP_KERNEL);
- 
-+		if (!iov) {
-+			usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_MALLOC);
-+			return -1;
-+		}
-+
-+		iovnum = 0;
- 
- 		/* 1. setup usbip_header */
- 		setup_ret_submit_pdu(&pdu_header, urb);
-+		usbip_dbg_stub_tx("setup txdata seqnum: %d urb: %p\n",
-+						pdu_header.base.seqnum, urb);
-+		/*usbip_dump_header(pdu_header);*/
- 		usbip_header_correct_endian(&pdu_header, 1);
- 
--		iov[0].iov_base = &pdu_header;
--		iov[0].iov_len  = sizeof(pdu_header);
-+		iov[iovnum].iov_base = &pdu_header;
-+		iov[iovnum].iov_len  = sizeof(pdu_header);
-+		iovnum++;
- 		txsize += sizeof(pdu_header);
- 
- 		/* 2. setup transfer buffer */
--		if (usb_pipein(urb->pipe) && urb->actual_length > 0) {
--			iov[1].iov_base = urb->transfer_buffer;
--			iov[1].iov_len  = urb->actual_length;
-+		if (usb_pipein(urb->pipe) &&
-+				usb_pipetype(urb->pipe) != PIPE_ISOCHRONOUS &&
-+					urb->actual_length > 0) {
-+			iov[iovnum].iov_base = urb->transfer_buffer;
-+			iov[iovnum].iov_len  = urb->actual_length;
-+			iovnum++;
- 			txsize += urb->actual_length;
-+		} else if (usb_pipein(urb->pipe) &&
-+				usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+			/*
-+			 * For isochronous packets: actual length is the sum of
-+			 * the actual length of the individual, packets, but as
-+			 * the packet offsets are not changed there will be
-+			 * padding between the packets. To optimally use the
-+			 * bandwidth the padding is not transmitted.
-+			 */
-+
-+			int i;
-+			for (i = 0; i < urb->number_of_packets; i++) {
-+				iov[iovnum].iov_base = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
-+				iov[iovnum].iov_len = urb->iso_frame_desc[i].actual_length;
-+				iovnum++;
-+				txsize += urb->iso_frame_desc[i].actual_length;
-+			}
-+
-+			if (txsize != sizeof(pdu_header) + urb->actual_length) {
-+				dev_err(&sdev->interface->dev,
-+					"actual length of urb (%d) does not match iso packet sizes (%d)\n",
-+					urb->actual_length, txsize-sizeof(pdu_header));
-+				kfree(iov);
-+				usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP);
-+			   return -1;
-+			}
- 		}
- 
- 		/* 3. setup iso_packet_descriptor */
-@@ -209,32 +253,34 @@ static int stub_send_ret_submit(struct stub_device *sdev)
- 			if (!iso_buffer) {
- 				usbip_event_add(&sdev->ud,
- 						SDEV_EVENT_ERROR_MALLOC);
-+				kfree(iov);
- 				return -1;
- 			}
- 
--			iov[2].iov_base = iso_buffer;
--			iov[2].iov_len  = len;
-+			iov[iovnum].iov_base = iso_buffer;
-+			iov[iovnum].iov_len  = len;
- 			txsize += len;
-+			iovnum++;
- 		}
- 
--		ret = kernel_sendmsg(sdev->ud.tcp_socket, &msg, iov,
--				     3, txsize);
-+		ret = kernel_sendmsg(sdev->ud.tcp_socket, &msg,
-+						iov,  iovnum, txsize);
- 		if (ret != txsize) {
- 			dev_err(&sdev->interface->dev,
- 				"sendmsg failed!, retval %d for %zd\n",
- 				ret, txsize);
-+			kfree(iov);
- 			kfree(iso_buffer);
- 			usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP);
- 			return -1;
- 		}
- 
-+		kfree(iov);
- 		kfree(iso_buffer);
--		usbip_dbg_stub_tx("send txdata\n");
- 
- 		total_size += txsize;
- 	}
- 
--
- 	spin_lock_irqsave(&sdev->priv_lock, flags);
- 
- 	list_for_each_entry_safe(priv, tmp, &sdev->priv_free, list) {
-diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
-index ddb6f5f..719e0c1 100644
---- a/drivers/staging/usbip/usbip_common.c
-+++ b/drivers/staging/usbip/usbip_common.c
-@@ -361,10 +361,11 @@ void usbip_dump_header(struct usbip_header *pdu)
- 		usbip_udbg("CMD_UNLINK: seq %u\n", pdu->u.cmd_unlink.seqnum);
- 		break;
- 	case USBIP_RET_SUBMIT:
--		usbip_udbg("RET_SUBMIT: st %d al %u sf %d ec %d\n",
-+		usbip_udbg("RET_SUBMIT: st %d al %u sf %d #p %d ec %d\n",
- 				pdu->u.ret_submit.status,
- 				pdu->u.ret_submit.actual_length,
- 				pdu->u.ret_submit.start_frame,
-+				pdu->u.ret_submit.number_of_packets,
- 				pdu->u.ret_submit.error_count);
- 	case USBIP_RET_UNLINK:
- 		usbip_udbg("RET_UNLINK: status %d\n", pdu->u.ret_unlink.status);
-@@ -686,6 +687,7 @@ static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb,
- 		rpdu->status		= urb->status;
- 		rpdu->actual_length	= urb->actual_length;
- 		rpdu->start_frame	= urb->start_frame;
-+		rpdu->number_of_packets = urb->number_of_packets;
- 		rpdu->error_count	= urb->error_count;
- 	} else {
- 		/* vhci_rx.c */
-@@ -693,6 +695,7 @@ static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb,
- 		urb->status		= rpdu->status;
- 		urb->actual_length	= rpdu->actual_length;
- 		urb->start_frame	= rpdu->start_frame;
-+		urb->number_of_packets = rpdu->number_of_packets;
- 		urb->error_count	= rpdu->error_count;
- 	}
- }
-@@ -761,11 +764,13 @@ static void correct_endian_ret_submit(struct usbip_header_ret_submit *pdu,
- 		cpu_to_be32s(&pdu->status);
- 		cpu_to_be32s(&pdu->actual_length);
- 		cpu_to_be32s(&pdu->start_frame);
-+		cpu_to_be32s(&pdu->number_of_packets);
- 		cpu_to_be32s(&pdu->error_count);
- 	} else {
- 		be32_to_cpus(&pdu->status);
- 		be32_to_cpus(&pdu->actual_length);
- 		be32_to_cpus(&pdu->start_frame);
-+		cpu_to_be32s(&pdu->number_of_packets);
- 		be32_to_cpus(&pdu->error_count);
- 	}
- }
-@@ -891,6 +896,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
- 	int size = np * sizeof(*iso);
- 	int i;
- 	int ret;
-+	int total_length = 0;
- 
- 	if (!usb_pipeisoc(urb->pipe))
- 		return 0;
-@@ -920,19 +926,75 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
- 		return -EPIPE;
- 	}
- 
-+
- 	for (i = 0; i < np; i++) {
- 		iso = buff + (i * sizeof(*iso));
- 
- 		usbip_iso_pakcet_correct_endian(iso, 0);
- 		usbip_pack_iso(iso, &urb->iso_frame_desc[i], 0);
-+		total_length += urb->iso_frame_desc[i].actual_length;
- 	}
- 
- 	kfree(buff);
- 
-+	if (total_length != urb->actual_length) {
-+		dev_err(&urb->dev->dev,
-+		  "total length of iso packets (%d) not equal to actual length of buffer (%d)\n",
-+		  total_length, urb->actual_length);
-+
-+		if (ud->side == USBIP_STUB)
-+			usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);
-+		else
-+			usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
-+
-+		return -EPIPE;
-+	}
-+
- 	return ret;
- }
- EXPORT_SYMBOL_GPL(usbip_recv_iso);
- 
-+/*
-+ * This functions restores the padding which was removed for optimizing
-+ * the bandwidth during transfer over tcp/ip
-+ *
-+ * buffer and iso packets need to be stored and be in propeper endian in urb
-+ * before calling this function
-+ */
-+int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
-+{
-+	int np = urb->number_of_packets;
-+	int i;
-+	int ret;
-+	int actualoffset = urb->actual_length;
-+
-+	if (!usb_pipeisoc(urb->pipe))
-+		return 0;
-+
-+	/* if no packets or length of data is 0, then nothing to unpack */
-+	if (np == 0 || urb->actual_length == 0)
-+		return 0;
-+
-+	/*
-+	 * if actual_length is transfer_buffer_length then no padding is
-+	 * present.
-+	*/
-+	if (urb->actual_length == urb->transfer_buffer_length)
-+		return 0;
-+
-+	/*
-+	 * loop over all packets from last to first (to prevent overwritting
-+	 * memory when padding) and move them into the proper place
-+	 */
-+	for (i = np-1; i > 0; i--) {
-+		actualoffset -= urb->iso_frame_desc[i].actual_length;
-+		memmove(urb->transfer_buffer + urb->iso_frame_desc[i].offset,
-+				  urb->transfer_buffer + actualoffset,
-+				  urb->iso_frame_desc[i].actual_length);
-+	}
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(usbip_pad_iso);
- 
- /* some members of urb must be substituted before. */
- int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)
-diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
-index 1ca3eab..5e16bc3 100644
---- a/drivers/staging/usbip/usbip_common.h
-+++ b/drivers/staging/usbip/usbip_common.h
-@@ -393,6 +393,8 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send);
- int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb);
- /* some members of urb must be substituted before. */
- int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);
-+/* some members of urb must be substituted before. */
-+int usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
- void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
- 
- 
-diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
-index 2d989c4..8ed5206 100644
---- a/drivers/staging/usbip/vhci_rx.c
-+++ b/drivers/staging/usbip/vhci_rx.c
-@@ -97,6 +97,9 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
- 	if (usbip_recv_iso(ud, urb) < 0)
- 		return;
- 
-+	/* restore the padding in iso packets */
-+	if (usbip_pad_iso(ud, urb) < 0)
-+		return;
- 
- 	if (usbip_dbg_flag_vhci_rx)
- 		usbip_dump_urb(urb);
-diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
-index 9f806dd..bb3c0f2 100644
---- a/fs/btrfs/ctree.h
-+++ b/fs/btrfs/ctree.h
-@@ -1182,6 +1182,8 @@ struct btrfs_root {
- #define BTRFS_INODE_DIRSYNC		(1 << 10)
- 
- 
-+#define BTRFS_INODE_ROOT_ITEM_INIT	(1 << 31)
-+
- /* some macros to generate set/get funcs for the struct fields.  This
-  * assumes there is a lefoo_to_cpu for every type, so lets make a simple
-  * one for u8:
-@@ -2183,6 +2185,8 @@ int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid);
- int btrfs_find_orphan_roots(struct btrfs_root *tree_root);
- int btrfs_set_root_node(struct btrfs_root_item *item,
- 			struct extent_buffer *node);
-+void btrfs_check_and_init_root_item(struct btrfs_root_item *item);
-+
- /* dir-item.c */
- int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,
- 			  struct btrfs_root *root, const char *name,
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index 2b59201..f447188 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -1145,8 +1145,10 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root,
- 	root->commit_root = btrfs_root_node(root);
- 	BUG_ON(!root->node);
- out:
--	if (location->objectid != BTRFS_TREE_LOG_OBJECTID)
-+	if (location->objectid != BTRFS_TREE_LOG_OBJECTID) {
- 		root->ref_cows = 1;
-+		btrfs_check_and_init_root_item(&root->root_item);
-+	}
- 
- 	return root;
- }
-diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 0bc5776..3359aff 100644
---- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -285,6 +285,10 @@ static noinline int create_subvol(struct btrfs_root *root,
- 	inode_item->nbytes = cpu_to_le64(root->leafsize);
- 	inode_item->mode = cpu_to_le32(S_IFDIR | 0755);
- 
-+	root_item.flags = 0;
-+	root_item.byte_limit = 0;
-+	inode_item->flags = cpu_to_le64(BTRFS_INODE_ROOT_ITEM_INIT);
-+
- 	btrfs_set_root_bytenr(&root_item, leaf->start);
- 	btrfs_set_root_generation(&root_item, trans->transid);
- 	btrfs_set_root_level(&root_item, 0);
-diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
-index 67fa2d2..3174255 100644
---- a/fs/btrfs/root-tree.c
-+++ b/fs/btrfs/root-tree.c
-@@ -459,3 +459,21 @@ again:
- 	btrfs_free_path(path);
- 	return 0;
- }
-+
-+/*
-+ * Old btrfs forgets to init root_item->flags and root_item->byte_limit
-+ * for subvolumes. To work around this problem, we steal a bit from
-+ * root_item->inode_item->flags, and use it to indicate if those fields
-+ * have been properly initialized.
-+ */
-+void btrfs_check_and_init_root_item(struct btrfs_root_item *root_item)
-+{
-+	u64 inode_flags = le64_to_cpu(root_item->inode.flags);
-+
-+	if (!(inode_flags & BTRFS_INODE_ROOT_ITEM_INIT)) {
-+		inode_flags |= BTRFS_INODE_ROOT_ITEM_INIT;
-+		root_item->inode.flags = cpu_to_le64(inode_flags);
-+		root_item->flags = 0;
-+		root_item->byte_limit = 0;
-+	}
-+}
-diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
-index b2acc79..b640fba 100644
---- a/fs/btrfs/transaction.c
-+++ b/fs/btrfs/transaction.c
-@@ -777,6 +777,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
- 	record_root_in_trans(trans, root);
- 	btrfs_set_root_last_snapshot(&root->root_item, trans->transid);
- 	memcpy(new_root_item, &root->root_item, sizeof(*new_root_item));
-+	btrfs_check_and_init_root_item(new_root_item);
- 
- 	key.objectid = objectid;
- 	/* record when the snapshot was created in key.offset */
-diff --git a/fs/compat.c b/fs/compat.c
-index d576b55..d1e2411 100644
---- a/fs/compat.c
-+++ b/fs/compat.c
-@@ -1353,6 +1353,10 @@ static int compat_count(compat_uptr_t __user *argv, int max)
- 			argv++;
- 			if (i++ >= max)
- 				return -E2BIG;
-+
-+			if (fatal_signal_pending(current))
-+				return -ERESTARTNOHAND;
-+			cond_resched();
- 		}
- 	}
- 	return i;
-@@ -1394,6 +1398,12 @@ static int compat_copy_strings(int argc, compat_uptr_t __user *argv,
- 		while (len > 0) {
- 			int offset, bytes_to_copy;
- 
-+			if (fatal_signal_pending(current)) {
-+				ret = -ERESTARTNOHAND;
-+				goto out;
-+			}
-+			cond_resched();
-+
- 			offset = pos % PAGE_SIZE;
- 			if (offset == 0)
- 				offset = PAGE_SIZE;
-@@ -1410,18 +1420,8 @@ static int compat_copy_strings(int argc, compat_uptr_t __user *argv,
- 			if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
- 				struct page *page;
- 
--#ifdef CONFIG_STACK_GROWSUP
--				ret = expand_stack_downwards(bprm->vma, pos);
--				if (ret < 0) {
--					/* We've exceed the stack rlimit. */
--					ret = -E2BIG;
--					goto out;
--				}
--#endif
--				ret = get_user_pages(current, bprm->mm, pos,
--						     1, 1, 1, &page, NULL);
--				if (ret <= 0) {
--					/* We've exceed the stack rlimit. */
-+				page = get_arg_page(bprm, pos, 1);
-+				if (!page) {
- 					ret = -E2BIG;
- 					goto out;
- 				}
-@@ -1542,8 +1542,10 @@ int compat_do_execve(char * filename,
- 	return retval;
- 
- out:
--	if (bprm->mm)
-+	if (bprm->mm) {
-+		acct_arg_size(bprm, 0);
- 		mmput(bprm->mm);
-+	}
- 
- out_file:
- 	if (bprm->file) {
-diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
-index a0a7847..aa2480a 100644
---- a/fs/ecryptfs/keystore.c
-+++ b/fs/ecryptfs/keystore.c
-@@ -1542,6 +1542,7 @@ int ecryptfs_keyring_auth_tok_for_sig(struct key **auth_tok_key,
- 		printk(KERN_ERR "Could not find key with description: [%s]\n",
- 		       sig);
- 		rc = process_request_key_err(PTR_ERR(*auth_tok_key));
-+		(*auth_tok_key) = NULL;
- 		goto out;
- 	}
- 	(*auth_tok) = ecryptfs_get_key_payload_data(*auth_tok_key);
-diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
-index df4ce99..8721a89 100644
---- a/fs/ecryptfs/mmap.c
-+++ b/fs/ecryptfs/mmap.c
-@@ -372,6 +372,11 @@ static int ecryptfs_write_begin(struct file *file,
- 	    && (pos != 0))
- 		zero_user(page, 0, PAGE_CACHE_SIZE);
- out:
-+	if (unlikely(rc)) {
-+		unlock_page(page);
-+		page_cache_release(page);
-+		*pagep = NULL;
-+	}
- 	return rc;
- }
- 
-diff --git a/fs/exec.c b/fs/exec.c
-index 68083fa..0cf881d 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -159,7 +159,22 @@ out:
- 
- #ifdef CONFIG_MMU
- 
--static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
-+void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
-+{
-+	struct mm_struct *mm = current->mm;
-+	long diff = (long)(pages - bprm->vma_pages);
-+
-+	if (!mm || !diff)
-+		return;
-+
-+	bprm->vma_pages = pages;
-+
-+	down_write(&mm->mmap_sem);
-+	mm->total_vm += diff;
-+	up_write(&mm->mmap_sem);
-+}
-+
-+struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
- 		int write)
- {
- 	struct page *page;
-@@ -181,6 +196,8 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
- 		unsigned long size = bprm->vma->vm_end - bprm->vma->vm_start;
- 		struct rlimit *rlim;
- 
-+		acct_arg_size(bprm, size / PAGE_SIZE);
-+
- 		/*
- 		 * We've historically supported up to 32 pages (ARG_MAX)
- 		 * of argument strings even with small stacks
-@@ -274,7 +291,11 @@ static bool valid_arg_len(struct linux_binprm *bprm, long len)
- 
- #else
- 
--static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
-+void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
-+{
-+}
-+
-+struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
- 		int write)
- {
- 	struct page *page;
-@@ -981,6 +1002,7 @@ int flush_old_exec(struct linux_binprm * bprm)
- 	/*
- 	 * Release all of the old mmap stuff
- 	 */
-+	acct_arg_size(bprm, 0);
- 	retval = exec_mmap(bprm->mm);
- 	if (retval)
- 		goto out;
-@@ -1408,8 +1430,10 @@ int do_execve(char * filename,
- 	return retval;
- 
- out:
--	if (bprm->mm)
--		mmput (bprm->mm);
-+	if (bprm->mm) {
-+		acct_arg_size(bprm, 0);
-+		mmput(bprm->mm);
-+	}
- 
- out_file:
- 	if (bprm->file) {
-diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
-index 1b23f9d..8572c79 100644
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -5458,13 +5458,12 @@ static int ext4_indirect_trans_blocks(struct inode *inode, int nrblocks,
- 	/* if nrblocks are contiguous */
- 	if (chunk) {
- 		/*
--		 * With N contiguous data blocks, it need at most
--		 * N/EXT4_ADDR_PER_BLOCK(inode->i_sb) indirect blocks
--		 * 2 dindirect blocks
--		 * 1 tindirect block
-+		 * With N contiguous data blocks, we need at most
-+		 * N/EXT4_ADDR_PER_BLOCK(inode->i_sb) + 1 indirect blocks,
-+		 * 2 dindirect blocks, and 1 tindirect block
- 		 */
--		indirects = nrblocks / EXT4_ADDR_PER_BLOCK(inode->i_sb);
--		return indirects + 3;
-+		return DIV_ROUND_UP(nrblocks,
-+				    EXT4_ADDR_PER_BLOCK(inode->i_sb)) + 4;
- 	}
- 	/*
- 	 * if nrblocks are not contiguous, worse case, each block touch
-diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
-index b2786a5..cc2f505 100644
---- a/fs/nfsd/lockd.c
-+++ b/fs/nfsd/lockd.c
-@@ -44,7 +44,6 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)
- 	exp_readlock();
- 	nfserr = nfsd_open(rqstp, &fh, S_IFREG, NFSD_MAY_LOCK, filp);
- 	fh_put(&fh);
--	rqstp->rq_client = NULL;
- 	exp_readunlock();
-  	/* We return nlm error codes as nlm doesn't know
- 	 * about nfsd, but nfsd does know about nlm..
-diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
-index 30292df..9ad0035 100644
---- a/fs/nilfs2/file.c
-+++ b/fs/nilfs2/file.c
-@@ -72,10 +72,9 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
- 	/*
- 	 * check to see if the page is mapped already (no holes)
- 	 */
--	if (PageMappedToDisk(page)) {
--		unlock_page(page);
-+	if (PageMappedToDisk(page))
- 		goto mapped;
--	}
-+
- 	if (page_has_buffers(page)) {
- 		struct buffer_head *bh, *head;
- 		int fully_mapped = 1;
-@@ -90,7 +89,6 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
- 
- 		if (fully_mapped) {
- 			SetPageMappedToDisk(page);
--			unlock_page(page);
- 			goto mapped;
- 		}
- 	}
-@@ -105,16 +103,18 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
- 		return VM_FAULT_SIGBUS;
- 
- 	ret = block_page_mkwrite(vma, vmf, nilfs_get_block);
--	if (unlikely(ret)) {
-+	if (ret != VM_FAULT_LOCKED) {
- 		nilfs_transaction_abort(inode->i_sb);
- 		return ret;
- 	}
-+	nilfs_set_file_dirty(NILFS_SB(inode->i_sb), inode,
-+			     1 << (PAGE_SHIFT - inode->i_blkbits));
- 	nilfs_transaction_commit(inode->i_sb);
- 
-  mapped:
- 	SetPageChecked(page);
- 	wait_on_page_writeback(page);
--	return 0;
-+	return VM_FAULT_LOCKED;
- }
- 
- static const struct vm_operations_struct nilfs_file_vm_ops = {
-diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
-index 5fc918c..35d256b 100644
---- a/fs/ocfs2/aops.c
-+++ b/fs/ocfs2/aops.c
-@@ -1091,6 +1091,12 @@ static int ocfs2_prepare_page_for_write(struct inode *inode, u64 *p_blkno,
- 	ocfs2_figure_cluster_boundaries(OCFS2_SB(inode->i_sb), cpos,
- 					&cluster_start, &cluster_end);
- 
-+	/* treat the write as new if the a hole/lseek spanned across
-+	 * the page boundary.
-+	 */
-+	new = new | ((i_size_read(inode) <= page_offset(page)) &&
-+			(page_offset(page) <= user_pos));
-+
- 	if (page == wc->w_target_page) {
- 		map_from = user_pos & (PAGE_CACHE_SIZE - 1);
- 		map_to = map_from + user_len;
-diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
-index 4fdb0eb..ce9a4f2 100644
---- a/fs/quota/dquot.c
-+++ b/fs/quota/dquot.c
-@@ -388,7 +388,7 @@ EXPORT_SYMBOL(dquot_acquire);
-  */
- int dquot_commit(struct dquot *dquot)
- {
--	int ret = 0, ret2 = 0;
-+	int ret = 0;
- 	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);
- 
- 	mutex_lock(&dqopt->dqio_mutex);
-@@ -400,15 +400,10 @@ int dquot_commit(struct dquot *dquot)
- 	spin_unlock(&dq_list_lock);
- 	/* Inactive dquot can be only if there was error during read/init
- 	 * => we have better not writing it */
--	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
-+	if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
- 		ret = dqopt->ops[dquot->dq_type]->commit_dqblk(dquot);
--		if (info_dirty(&dqopt->info[dquot->dq_type])) {
--			ret2 = dqopt->ops[dquot->dq_type]->write_file_info(
--						dquot->dq_sb, dquot->dq_type);
--		}
--		if (ret >= 0)
--			ret = ret2;
--	}
-+	else
-+		ret = -EIO;
- out_sem:
- 	mutex_unlock(&dqopt->dqio_mutex);
- 	return ret;
-diff --git a/fs/squashfs/dir.c b/fs/squashfs/dir.c
-index 566b0ea..16c1b4a 100644
---- a/fs/squashfs/dir.c
-+++ b/fs/squashfs/dir.c
-@@ -173,6 +173,11 @@ static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
- 		length += sizeof(dirh);
- 
- 		dir_count = le32_to_cpu(dirh.count) + 1;
-+
-+		/* dir_count should never be larger than 256 */
-+		if (dir_count > 256)
-+			goto failed_read;
-+
- 		while (dir_count--) {
- 			/*
- 			 * Read directory entry.
-@@ -184,6 +189,10 @@ static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
- 
- 			size = le16_to_cpu(dire->size) + 1;
- 
-+			/* size should never be larger than SQUASHFS_NAME_LEN */
-+			if (size > SQUASHFS_NAME_LEN)
-+				goto failed_read;
-+
- 			err = squashfs_read_metadata(inode->i_sb, dire->name,
- 					&block, &offset, size);
- 			if (err < 0)
-diff --git a/fs/squashfs/namei.c b/fs/squashfs/namei.c
-index 9e39865..ac52751 100644
---- a/fs/squashfs/namei.c
-+++ b/fs/squashfs/namei.c
-@@ -175,6 +175,11 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
- 		length += sizeof(dirh);
- 
- 		dir_count = le32_to_cpu(dirh.count) + 1;
-+
-+		/* dir_count should never be larger than 256 */
-+		if (dir_count > 256)
-+			goto data_error;
-+
- 		while (dir_count--) {
- 			/*
- 			 * Read directory entry.
-@@ -186,6 +191,10 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
- 
- 			size = le16_to_cpu(dire->size) + 1;
- 
-+			/* size should never be larger than SQUASHFS_NAME_LEN */
-+			if (size > SQUASHFS_NAME_LEN)
-+				goto data_error;
-+
- 			err = squashfs_read_metadata(dir->i_sb, dire->name,
- 					&block, &offset, size);
- 			if (err < 0)
-@@ -227,6 +236,9 @@ exit_lookup:
- 	d_add(dentry, inode);
- 	return ERR_PTR(0);
- 
-+data_error:
-+	err = -EIO;
-+
- read_failure:
- 	ERROR("Unable to read directory block [%llx:%x]\n",
- 		squashfs_i(dir)->start + msblk->directory_table,
-diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
-index 4775af4..0d948f1 100644
---- a/fs/ubifs/commit.c
-+++ b/fs/ubifs/commit.c
-@@ -518,7 +518,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot)
- 	size_t sz;
- 
- 	if (!(ubifs_chk_flags & UBIFS_CHK_OLD_IDX))
--		goto out;
-+		return 0;
- 
- 	INIT_LIST_HEAD(&list);
- 
-diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
-index dbc093a..ace4d8d 100644
---- a/fs/ubifs/debug.c
-+++ b/fs/ubifs/debug.c
-@@ -965,11 +965,39 @@ void dbg_dump_index(struct ubifs_info *c)
- void dbg_save_space_info(struct ubifs_info *c)
- {
- 	struct ubifs_debug_info *d = c->dbg;
--
--	ubifs_get_lp_stats(c, &d->saved_lst);
-+	int freeable_cnt;
- 
- 	spin_lock(&c->space_lock);
-+	memcpy(&d->saved_lst, &c->lst, sizeof(struct ubifs_lp_stats));
-+
-+	/*
-+	 * We use a dirty hack here and zero out @c->freeable_cnt, because it
-+	 * affects the free space calculations, and UBIFS might not know about
-+	 * all freeable eraseblocks. Indeed, we know about freeable eraseblocks
-+	 * only when we read their lprops, and we do this only lazily, upon the
-+	 * need. So at any given point of time @c->freeable_cnt might be not
-+	 * exactly accurate.
-+	 *
-+	 * Just one example about the issue we hit when we did not zero
-+	 * @c->freeable_cnt.
-+	 * 1. The file-system is mounted R/O, c->freeable_cnt is %0. We save the
-+	 *    amount of free space in @d->saved_free
-+	 * 2. We re-mount R/W, which makes UBIFS to read the "lsave"
-+	 *    information from flash, where we cache LEBs from various
-+	 *    categories ('ubifs_remount_fs()' -> 'ubifs_lpt_init()'
-+	 *    -> 'lpt_init_wr()' -> 'read_lsave()' -> 'ubifs_lpt_lookup()'
-+	 *    -> 'ubifs_get_pnode()' -> 'update_cats()'
-+	 *    -> 'ubifs_add_to_cat()').
-+	 * 3. Lsave contains a freeable eraseblock, and @c->freeable_cnt
-+	 *    becomes %1.
-+	 * 4. We calculate the amount of free space when the re-mount is
-+	 *    finished in 'dbg_check_space_info()' and it does not match
-+	 *    @d->saved_free.
-+	 */
-+	freeable_cnt = c->freeable_cnt;
-+	c->freeable_cnt = 0;
- 	d->saved_free = ubifs_get_free_space_nolock(c);
-+	c->freeable_cnt = freeable_cnt;
- 	spin_unlock(&c->space_lock);
- }
- 
-@@ -986,12 +1014,15 @@ int dbg_check_space_info(struct ubifs_info *c)
- {
- 	struct ubifs_debug_info *d = c->dbg;
- 	struct ubifs_lp_stats lst;
--	long long avail, free;
-+	long long free;
-+	int freeable_cnt;
- 
- 	spin_lock(&c->space_lock);
--	avail = ubifs_calc_available(c, c->min_idx_lebs);
-+	freeable_cnt = c->freeable_cnt;
-+	c->freeable_cnt = 0;
-+	free = ubifs_get_free_space_nolock(c);
-+	c->freeable_cnt = freeable_cnt;
- 	spin_unlock(&c->space_lock);
--	free = ubifs_get_free_space(c);
- 
- 	if (free != d->saved_free) {
- 		ubifs_err("free space changed from %lld to %lld",
-diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
-index b2792e8..d0dfe7a 100644
---- a/fs/ubifs/lpt.c
-+++ b/fs/ubifs/lpt.c
-@@ -1269,10 +1269,9 @@ static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
- 	lnum = branch->lnum;
- 	offs = branch->offs;
- 	pnode = kzalloc(sizeof(struct ubifs_pnode), GFP_NOFS);
--	if (!pnode) {
--		err = -ENOMEM;
--		goto out;
--	}
-+	if (!pnode)
-+		return -ENOMEM;
-+
- 	if (lnum == 0) {
- 		/*
- 		 * This pnode was not written which just means that the LEB
-diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
-index 61496c6..942362f 100644
---- a/fs/xfs/linux-2.6/xfs_ioctl.c
-+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
-@@ -697,14 +697,19 @@ xfs_ioc_fsgeometry_v1(
- 	xfs_mount_t		*mp,
- 	void			__user *arg)
- {
--	xfs_fsop_geom_v1_t	fsgeo;
-+	xfs_fsop_geom_t         fsgeo;
- 	int			error;
- 
--	error = xfs_fs_geometry(mp, (xfs_fsop_geom_t *)&fsgeo, 3);
-+	error = xfs_fs_geometry(mp, &fsgeo, 3);
- 	if (error)
- 		return -error;
- 
--	if (copy_to_user(arg, &fsgeo, sizeof(fsgeo)))
-+	/*
-+	 * Caller should have passed an argument of type
-+	 * xfs_fsop_geom_v1_t.  This is a proper subset of the
-+	 * xfs_fsop_geom_t that xfs_fs_geometry() fills in.
-+	 */
-+	if (copy_to_user(arg, &fsgeo, sizeof(xfs_fsop_geom_v1_t)))
- 		return -XFS_ERROR(EFAULT);
- 	return 0;
- }
-diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
-index 6f83f58..785b2a2 100644
---- a/fs/xfs/xfs_fsops.c
-+++ b/fs/xfs/xfs_fsops.c
-@@ -56,6 +56,9 @@ xfs_fs_geometry(
- 	xfs_fsop_geom_t		*geo,
- 	int			new_version)
- {
-+
-+	memset(geo, 0, sizeof(*geo));
-+
- 	geo->blocksize = mp->m_sb.sb_blocksize;
- 	geo->rtextsize = mp->m_sb.sb_rextsize;
- 	geo->agblocks = mp->m_sb.sb_agblocks;
-diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index 340f441..a3d802e 100644
---- a/include/linux/binfmts.h
-+++ b/include/linux/binfmts.h
-@@ -29,6 +29,7 @@ struct linux_binprm{
- 	char buf[BINPRM_BUF_SIZE];
- #ifdef CONFIG_MMU
- 	struct vm_area_struct *vma;
-+	unsigned long vma_pages;
- #else
- # define MAX_ARG_PAGES	32
- 	struct page *page[MAX_ARG_PAGES];
-@@ -59,6 +60,10 @@ struct linux_binprm{
- 	unsigned long loader, exec;
- };
- 
-+extern void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
-+extern struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
-+					int write);
-+
- #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
- #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
- 
-diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index f097ae3..de8e180 100644
---- a/include/scsi/scsi_device.h
-+++ b/include/scsi/scsi_device.h
-@@ -446,7 +446,7 @@ static inline int scsi_device_qas(struct scsi_device *sdev)
- }
- static inline int scsi_device_enclosure(struct scsi_device *sdev)
- {
--	return sdev->inquiry[6] & (1<<6);
-+	return sdev->inquiry ? (sdev->inquiry[6] & (1<<6)) : 1;
- }
- 
- static inline int scsi_device_protection(struct scsi_device *sdev)
-diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
-index c1410e3..511b623 100644
---- a/include/sound/soc-dapm.h
-+++ b/include/sound/soc-dapm.h
-@@ -46,25 +46,25 @@
- /* platform domain */
- #define SND_SOC_DAPM_INPUT(wname) \
- {	.id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0}
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM }
- #define SND_SOC_DAPM_OUTPUT(wname) \
- {	.id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0}
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM }
- #define SND_SOC_DAPM_MIC(wname, wevent) \
- {	.id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0, .event = wevent, \
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
- 	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
- #define SND_SOC_DAPM_HP(wname, wevent) \
- {	.id = snd_soc_dapm_hp, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0, .event = wevent, \
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
- 	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
- #define SND_SOC_DAPM_SPK(wname, wevent) \
- {	.id = snd_soc_dapm_spk, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0, .event = wevent, \
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
- 	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
- #define SND_SOC_DAPM_LINE(wname, wevent) \
- {	.id = snd_soc_dapm_line, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0, .event = wevent, \
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
- 	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
- 
- /* path domain */
-@@ -129,11 +129,11 @@
- /* events that are pre and post DAPM */
- #define SND_SOC_DAPM_PRE(wname, wevent) \
- {	.id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0, .event = wevent, \
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
- 	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}
- #define SND_SOC_DAPM_POST(wname, wevent) \
- {	.id = snd_soc_dapm_post, .name = wname, .kcontrols = NULL, \
--	.num_kcontrols = 0, .event = wevent, \
-+	.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
- 	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}
- 
- /* stream domain */
-diff --git a/kernel/kgdb.c b/kernel/kgdb.c
-index 9147a31..53dae4b 100644
---- a/kernel/kgdb.c
-+++ b/kernel/kgdb.c
-@@ -1001,10 +1001,8 @@ static void gdb_cmd_query(struct kgdb_state *ks)
- 	switch (remcom_in_buffer[1]) {
- 	case 's':
- 	case 'f':
--		if (memcmp(remcom_in_buffer + 2, "ThreadInfo", 10)) {
--			error_packet(remcom_out_buffer, -EINVAL);
-+		if (memcmp(remcom_in_buffer + 2, "ThreadInfo", 10))
- 			break;
--		}
- 
- 		i = 0;
- 		remcom_out_buffer[0] = 'm';
-@@ -1045,10 +1043,9 @@ static void gdb_cmd_query(struct kgdb_state *ks)
- 		pack_threadid(remcom_out_buffer + 2, thref);
- 		break;
- 	case 'T':
--		if (memcmp(remcom_in_buffer + 1, "ThreadExtraInfo,", 16)) {
--			error_packet(remcom_out_buffer, -EINVAL);
-+		if (memcmp(remcom_in_buffer + 1, "ThreadExtraInfo,", 16))
- 			break;
--		}
-+
- 		ks->threadid = 0;
- 		ptr = remcom_in_buffer + 17;
- 		kgdb_hex2long(&ptr, &ks->threadid);
-diff --git a/kernel/perf_event.c b/kernel/perf_event.c
-index 183d437..fc5ab8e 100644
---- a/kernel/perf_event.c
-+++ b/kernel/perf_event.c
-@@ -69,7 +69,8 @@ static inline bool perf_paranoid_kernel(void)
- 	return sysctl_perf_event_paranoid > 1;
- }
- 
--int sysctl_perf_event_mlock __read_mostly = 512; /* 'free' kb per user */
-+/* Minimum for 128 pages + 1 for the user control page */
-+int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */
- 
- /*
-  * max perf event sample rate
-diff --git a/kernel/signal.c b/kernel/signal.c
-index e26d423..2494827 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -2353,7 +2353,7 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, pid, int, sig,
- 	/* Not even root can pretend to send signals from the kernel.
- 	 * Nor can they impersonate a kill()/tgkill(), which adds source info.
- 	 */
--	if (info.si_code != SI_QUEUE) {
-+	if (info.si_code >= 0 || info.si_code == SI_TKILL) {
- 		/* We used to allow any < 0 si_code */
- 		WARN_ON_ONCE(info.si_code < 0);
- 		return -EPERM;
-@@ -2373,7 +2373,7 @@ long do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
- 	/* Not even root can pretend to send signals from the kernel.
- 	 * Nor can they impersonate a kill()/tgkill(), which adds source info.
- 	 */
--	if (info->si_code != SI_QUEUE) {
-+	if (info->si_code >= 0 || info->si_code == SI_TKILL) {
- 		/* We used to allow any < 0 si_code */
- 		WARN_ON_ONCE(info->si_code < 0);
- 		return -EPERM;
-diff --git a/mm/mremap.c b/mm/mremap.c
-index 166b824..3e98d79 100644
---- a/mm/mremap.c
-+++ b/mm/mremap.c
-@@ -275,9 +275,16 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
- 	if (old_len > vma->vm_end - addr)
- 		goto Efault;
- 
--	if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) {
--		if (new_len > old_len)
-+	/* Need to be careful about a growing mapping */
-+	if (new_len > old_len) {
-+		unsigned long pgoff;
-+
-+		if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
- 			goto Efault;
-+		pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
-+		pgoff += vma->vm_pgoff;
-+		if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
-+			goto Einval;
- 	}
- 
- 	if (vma->vm_flags & VM_LOCKED) {
-diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
-index f454607..608a97b 100644
---- a/net/ax25/af_ax25.c
-+++ b/net/ax25/af_ax25.c
-@@ -1391,6 +1391,7 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
- 	ax25_cb *ax25;
- 	int err = 0;
- 
-+	memset(fsa, 0, sizeof(fsa));
- 	lock_sock(sk);
- 	ax25 = ax25_sk(sk);
- 
-@@ -1402,7 +1403,6 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
- 
- 		fsa->fsa_ax25.sax25_family = AF_AX25;
- 		fsa->fsa_ax25.sax25_call   = ax25->dest_addr;
--		fsa->fsa_ax25.sax25_ndigis = 0;
- 
- 		if (ax25->digipeat != NULL) {
- 			ndigi = ax25->digipeat->ndigi;
-diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
-index e857628..efc85dc 100644
---- a/net/bluetooth/bnep/sock.c
-+++ b/net/bluetooth/bnep/sock.c
-@@ -88,6 +88,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
- 			sockfd_put(nsock);
- 			return -EBADFD;
- 		}
-+		ca.device[sizeof(ca.device)-1] = 0;
- 
- 		err = bnep_add_connection(&ca, nsock);
- 		if (!err) {
-diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
-index 5c0685e..e52443c 100644
---- a/net/bluetooth/sco.c
-+++ b/net/bluetooth/sco.c
-@@ -700,6 +700,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user
- 			break;
- 		}
- 
-+		memset(&cinfo, 0, sizeof(cinfo));
- 		cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
- 		memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);
- 
-diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index 0b7f262..d73d47f 100644
---- a/net/bridge/netfilter/ebtables.c
-+++ b/net/bridge/netfilter/ebtables.c
-@@ -979,6 +979,8 @@ static int do_replace(struct net *net, void __user *user, unsigned int len)
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
- 		return -ENOMEM;
- 
-+	tmp.name[sizeof(tmp.name) - 1] = 0;
-+
- 	countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
- 	newinfo = vmalloc(sizeof(*newinfo) + countersize);
- 	if (!newinfo)
-diff --git a/net/can/bcm.c b/net/can/bcm.c
-index 4a192f7..029dcc2 100644
---- a/net/can/bcm.c
-+++ b/net/can/bcm.c
-@@ -124,7 +124,7 @@ struct bcm_sock {
- 	struct list_head tx_ops;
- 	unsigned long dropped_usr_msgs;
- 	struct proc_dir_entry *bcm_proc_read;
--	char procname [20]; /* pointer printed in ASCII with \0 */
-+	char procname [32]; /* inode number in decimal with \0 */
- };
- 
- static inline struct bcm_sock *bcm_sk(const struct sock *sk)
-@@ -1519,7 +1519,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
- 
- 	if (proc_dir) {
- 		/* unique socket address as filename */
--		sprintf(bo->procname, "%p", sock);
-+		sprintf(bo->procname, "%lu", sock_i_ino(sk));
- 		bo->bcm_proc_read = proc_create_data(bo->procname, 0644,
- 						     proc_dir,
- 						     &bcm_proc_fops, sk);
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 49e3782..64eb849 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2614,6 +2614,8 @@ void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
- {
- 	__skb_pull(skb, skb_headlen(skb));
- 	skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
-+	skb->dev = napi->dev;
-+	skb->iif = 0;
- 
- 	napi->skb = skb;
- }
-diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
-index 85672e7..2a3b4e7 100644
---- a/net/econet/af_econet.c
-+++ b/net/econet/af_econet.c
-@@ -428,10 +428,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
- 		udpdest.sin_addr.s_addr = htonl(network | addr.station);
- 	}
- 
-+	memset(&ah, 0, sizeof(ah));
- 	ah.port = port;
- 	ah.cb = cb & 0x7f;
- 	ah.code = 2;		/* magic */
--	ah.pad = 0;
- 
- 	/* tack our header on the front of the iovec */
- 	size = sizeof(struct aunhdr);
-@@ -843,9 +843,13 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len)
- {
- 	struct iphdr *ip = ip_hdr(skb);
- 	unsigned char stn = ntohl(ip->saddr) & 0xff;
-+	struct dst_entry *dst = skb_dst(skb);
-+	struct ec_device *edev = NULL;
- 	struct sock *sk;
- 	struct sk_buff *newskb;
--	struct ec_device *edev = skb->dev->ec_ptr;
-+
-+	if (dst)
-+		edev = dst->dev->ec_ptr;
- 
- 	if (! edev)
- 		goto bad;
-diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
-index a706a47..6fe360f 100644
---- a/net/ipv4/inet_diag.c
-+++ b/net/ipv4/inet_diag.c
-@@ -489,9 +489,11 @@ static int inet_csk_diag_dump(struct sock *sk,
- {
- 	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
- 
--	if (cb->nlh->nlmsg_len > 4 + NLMSG_SPACE(sizeof(*r))) {
-+	if (nlmsg_attrlen(cb->nlh, sizeof(*r))) {
- 		struct inet_diag_entry entry;
--		struct rtattr *bc = (struct rtattr *)(r + 1);
-+		const struct nlattr *bc = nlmsg_find_attr(cb->nlh,
-+							  sizeof(*r),
-+							  INET_DIAG_REQ_BYTECODE);
- 		struct inet_sock *inet = inet_sk(sk);
- 
- 		entry.family = sk->sk_family;
-@@ -511,7 +513,7 @@ static int inet_csk_diag_dump(struct sock *sk,
- 		entry.dport = ntohs(inet->dport);
- 		entry.userlocks = sk->sk_userlocks;
- 
--		if (!inet_diag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), &entry))
-+		if (!inet_diag_bc_run(nla_data(bc), nla_len(bc), &entry))
- 			return 0;
- 	}
- 
-@@ -526,9 +528,11 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
- {
- 	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
- 
--	if (cb->nlh->nlmsg_len > 4 + NLMSG_SPACE(sizeof(*r))) {
-+	if (nlmsg_attrlen(cb->nlh, sizeof(*r))) {
- 		struct inet_diag_entry entry;
--		struct rtattr *bc = (struct rtattr *)(r + 1);
-+		const struct nlattr *bc = nlmsg_find_attr(cb->nlh,
-+							  sizeof(*r),
-+							  INET_DIAG_REQ_BYTECODE);
- 
- 		entry.family = tw->tw_family;
- #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-@@ -547,7 +551,7 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
- 		entry.dport = ntohs(tw->tw_dport);
- 		entry.userlocks = 0;
- 
--		if (!inet_diag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), &entry))
-+		if (!inet_diag_bc_run(nla_data(bc), nla_len(bc), &entry))
- 			return 0;
- 	}
- 
-@@ -617,7 +621,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
- 	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
- 	struct inet_connection_sock *icsk = inet_csk(sk);
- 	struct listen_sock *lopt;
--	struct rtattr *bc = NULL;
-+	const struct nlattr *bc = NULL;
- 	struct inet_sock *inet = inet_sk(sk);
- 	int j, s_j;
- 	int reqnum, s_reqnum;
-@@ -637,8 +641,9 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
- 	if (!lopt || !lopt->qlen)
- 		goto out;
- 
--	if (cb->nlh->nlmsg_len > 4 + NLMSG_SPACE(sizeof(*r))) {
--		bc = (struct rtattr *)(r + 1);
-+	if (nlmsg_attrlen(cb->nlh, sizeof(*r))) {
-+		bc = nlmsg_find_attr(cb->nlh, sizeof(*r),
-+				     INET_DIAG_REQ_BYTECODE);
- 		entry.sport = inet->num;
- 		entry.userlocks = sk->sk_userlocks;
- 	}
-@@ -671,8 +676,8 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
- 					&ireq->rmt_addr;
- 				entry.dport = ntohs(ireq->rmt_port);
- 
--				if (!inet_diag_bc_run(RTA_DATA(bc),
--						    RTA_PAYLOAD(bc), &entry))
-+				if (!inet_diag_bc_run(nla_data(bc),
-+						      nla_len(bc), &entry))
- 					continue;
- 			}
- 
-diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
-index 98442f3..c8b0cc3 100644
---- a/net/ipv4/netfilter/arp_tables.c
-+++ b/net/ipv4/netfilter/arp_tables.c
-@@ -1086,6 +1086,7 @@ static int do_replace(struct net *net, void __user *user, unsigned int len)
- 	/* overflow check */
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
- 		return -ENOMEM;
-+	tmp.name[sizeof(tmp.name)-1] = 0;
- 
- 	newinfo = xt_alloc_table_info(tmp.size);
- 	if (!newinfo)
-@@ -1508,6 +1509,7 @@ static int compat_do_replace(struct net *net, void __user *user,
- 		return -ENOMEM;
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
- 		return -ENOMEM;
-+	tmp.name[sizeof(tmp.name)-1] = 0;
- 
- 	newinfo = xt_alloc_table_info(tmp.size);
- 	if (!newinfo)
-@@ -1763,6 +1765,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
- 			ret = -EFAULT;
- 			break;
- 		}
-+		rev.name[sizeof(rev.name)-1] = 0;
- 
- 		try_then_request_module(xt_find_revision(NFPROTO_ARP, rev.name,
- 							 rev.revision, 1, &ret),
-diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
-index 62aff31..0606db1 100644
---- a/net/ipv4/netfilter/ip_tables.c
-+++ b/net/ipv4/netfilter/ip_tables.c
-@@ -1290,6 +1290,7 @@ do_replace(struct net *net, void __user *user, unsigned int len)
- 	/* overflow check */
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
- 		return -ENOMEM;
-+	tmp.name[sizeof(tmp.name)-1] = 0;
- 
- 	newinfo = xt_alloc_table_info(tmp.size);
- 	if (!newinfo)
-@@ -1820,6 +1821,7 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)
- 		return -ENOMEM;
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
- 		return -ENOMEM;
-+	tmp.name[sizeof(tmp.name)-1] = 0;
- 
- 	newinfo = xt_alloc_table_info(tmp.size);
- 	if (!newinfo)
-@@ -2044,6 +2046,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
- 			ret = -EFAULT;
- 			break;
- 		}
-+		rev.name[sizeof(rev.name)-1] = 0;
- 
- 		if (cmd == IPT_SO_GET_REVISION_TARGET)
- 			target = 1;
-diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
-index 2e4f98b..edd8205 100644
---- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
-+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
-@@ -666,8 +666,11 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input,
- 	struct clusterip_config *c = pde->data;
- 	unsigned long nodenum;
- 
--	if (copy_from_user(buffer, input, PROC_WRITELEN))
-+	if (size > PROC_WRITELEN)
-+		return -EIO;
-+	if (copy_from_user(buffer, input, size))
- 		return -EFAULT;
-+	buffer[size] = 0;
- 
- 	if (*buffer == '+') {
- 		nodenum = simple_strtoul(buffer+1, NULL, 10);
-diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
-index 1de56fdf..78b5a36 100644
---- a/net/ipv6/netfilter/ip6_tables.c
-+++ b/net/ipv6/netfilter/ip6_tables.c
-@@ -1323,6 +1323,7 @@ do_replace(struct net *net, void __user *user, unsigned int len)
- 	/* overflow check */
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
- 		return -ENOMEM;
-+	tmp.name[sizeof(tmp.name)-1] = 0;
- 
- 	newinfo = xt_alloc_table_info(tmp.size);
- 	if (!newinfo)
-@@ -1855,6 +1856,7 @@ compat_do_replace(struct net *net, void __user *user, unsigned int len)
- 		return -ENOMEM;
- 	if (tmp.num_counters >= INT_MAX / sizeof(struct xt_counters))
- 		return -ENOMEM;
-+	tmp.name[sizeof(tmp.name)-1] = 0;
- 
- 	newinfo = xt_alloc_table_info(tmp.size);
- 	if (!newinfo)
-@@ -2079,6 +2081,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
- 			ret = -EFAULT;
- 			break;
- 		}
-+		rev.name[sizeof(rev.name)-1] = 0;
- 
- 		if (cmd == IP6T_SO_GET_REVISION_TARGET)
- 			target = 1;
-diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
-index b6cef980..476b24e 100644
---- a/net/irda/af_irda.c
-+++ b/net/irda/af_irda.c
-@@ -2164,6 +2164,14 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
- 
- 	switch (optname) {
- 	case IRLMP_ENUMDEVICES:
-+
-+		/* Offset to first device entry */
-+		offset = sizeof(struct irda_device_list) -
-+			sizeof(struct irda_device_info);
-+
-+		if (len < offset)
-+			return -EINVAL;
-+
- 		/* Ask lmp for the current discovery log */
- 		discoveries = irlmp_get_discoveries(&list.len, self->mask.word,
- 						    self->nslots);
-@@ -2173,15 +2181,9 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
- 		err = 0;
- 
- 		/* Write total list length back to client */
--		if (copy_to_user(optval, &list,
--				 sizeof(struct irda_device_list) -
--				 sizeof(struct irda_device_info)))
-+		if (copy_to_user(optval, &list, offset))
- 			err = -EFAULT;
- 
--		/* Offset to first device entry */
--		offset = sizeof(struct irda_device_list) -
--			sizeof(struct irda_device_info);
--
- 		/* Copy the list itself - watch for overflow */
- 		if(list.len > 2048)
- 		{
-diff --git a/net/irda/iriap.c b/net/irda/iriap.c
-index f7d6150..35a338b 100644
---- a/net/irda/iriap.c
-+++ b/net/irda/iriap.c
-@@ -655,10 +655,16 @@ static void iriap_getvaluebyclass_indication(struct iriap_cb *self,
- 	n = 1;
- 
- 	name_len = fp[n++];
-+
-+	IRDA_ASSERT(name_len < IAS_MAX_CLASSNAME + 1, return;);
-+
- 	memcpy(name, fp+n, name_len); n+=name_len;
- 	name[name_len] = '\0';
- 
- 	attr_len = fp[n++];
-+
-+	IRDA_ASSERT(attr_len < IAS_MAX_ATTRIBNAME + 1, return;);
-+
- 	memcpy(attr, fp+n, attr_len); n+=attr_len;
- 	attr[attr_len] = '\0';
- 
-diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
-index 7dea882..38997cd 100644
---- a/net/irda/irnet/irnet_ppp.c
-+++ b/net/irda/irnet/irnet_ppp.c
-@@ -106,6 +106,9 @@ irnet_ctrl_write(irnet_socket *	ap,
- 	      while(isspace(start[length - 1]))
- 		length--;
- 
-+	      DABORT(length < 5 || length > NICKNAME_MAX_LEN + 5,
-+		     -EINVAL, CTRL_ERROR, "Invalid nickname.\n");
-+
- 	      /* Copy the name for later reuse */
- 	      memcpy(ap->rname, start + 5, length - 5);
- 	      ap->rname[length - 5] = '\0';
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index 594f231..7de0c24 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -276,6 +276,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
- 	memcpy(sta->sta.addr, addr, ETH_ALEN);
- 	sta->local = local;
- 	sta->sdata = sdata;
-+	sta->last_rx = jiffies;
- 
- 	sta->rate_ctrl = rate_control_get(local->rate_ctrl);
- 	sta->rate_ctrl_priv = rate_control_alloc_sta(sta->rate_ctrl,
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 41866eb..9d9b78e 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -1526,7 +1526,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr,
- 	uaddr->sa_family = AF_PACKET;
- 	dev = dev_get_by_index(sock_net(sk), pkt_sk(sk)->ifindex);
- 	if (dev) {
--		strlcpy(uaddr->sa_data, dev->name, 15);
-+		strncpy(uaddr->sa_data, dev->name, 14);
- 		dev_put(dev);
- 	} else
- 		memset(uaddr->sa_data, 0, 14);
-@@ -1549,6 +1549,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
- 	sll->sll_family = AF_PACKET;
- 	sll->sll_ifindex = po->ifindex;
- 	sll->sll_protocol = po->num;
-+	sll->sll_pkttype = 0;
- 	dev = dev_get_by_index(sock_net(sk), po->ifindex);
- 	if (dev) {
- 		sll->sll_hatype = dev->type;
-diff --git a/net/rds/rdma.c b/net/rds/rdma.c
-index 6b09b94..f7d8c08 100644
---- a/net/rds/rdma.c
-+++ b/net/rds/rdma.c
-@@ -473,6 +473,14 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs,
- 
- 		max_pages = max(nr, max_pages);
- 		nr_pages += nr;
-+
-+		/*
-+		 * nr_pages for one entry is limited to (UINT_MAX>>PAGE_SHIFT)+1,
-+		 * so tot_pages cannot overflow without first going negative.
-+		 */
-+		if ((int)nr_pages < 0)
-+			ret = -EINVAL;
-+			goto out;
- 	}
- 
- 	pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL);
-diff --git a/net/rose/rose_subr.c b/net/rose/rose_subr.c
-index b05108f..07bca7d 100644
---- a/net/rose/rose_subr.c
-+++ b/net/rose/rose_subr.c
-@@ -289,10 +289,15 @@ static int rose_parse_national(unsigned char *p, struct rose_facilities_struct *
- 				facilities->source_ndigis = 0;
- 				facilities->dest_ndigis   = 0;
- 				for (pt = p + 2, lg = 0 ; lg < l ; pt += AX25_ADDR_LEN, lg += AX25_ADDR_LEN) {
--					if (pt[6] & AX25_HBIT)
-+					if (pt[6] & AX25_HBIT) {
-+						if (facilities->dest_ndigis >= ROSE_MAX_DIGIS)
-+							return -1;
- 						memcpy(&facilities->dest_digis[facilities->dest_ndigis++], pt, AX25_ADDR_LEN);
--					else
-+					} else {
-+						if (facilities->source_ndigis >= ROSE_MAX_DIGIS)
-+							return -1;
- 						memcpy(&facilities->source_digis[facilities->source_ndigis++], pt, AX25_ADDR_LEN);
-+					}
- 				}
- 			}
- 			p   += l + 2;
-@@ -332,6 +337,11 @@ static int rose_parse_ccitt(unsigned char *p, struct rose_facilities_struct *fac
- 
- 		case 0xC0:
- 			l = p[1];
-+
-+			/* Prevent overflows*/
-+			if (l < 10 || l > 20)
-+				return -1;
-+
- 			if (*p == FAC_CCITT_DEST_NSAP) {
- 				memcpy(&facilities->source_addr, p + 7, ROSE_ADDR_LEN);
- 				memcpy(callsign, p + 12,   l - 10);
-@@ -372,12 +382,16 @@ int rose_parse_facilities(unsigned char *p,
- 			switch (*p) {
- 			case FAC_NATIONAL:		/* National */
- 				len = rose_parse_national(p + 1, facilities, facilities_len - 1);
-+				if (len < 0)
-+					return 0;
- 				facilities_len -= len + 1;
- 				p += len + 1;
- 				break;
- 
- 			case FAC_CCITT:		/* CCITT */
- 				len = rose_parse_ccitt(p + 1, facilities, facilities_len - 1);
-+				if (len < 0)
-+					return 0;
- 				facilities_len -= len + 1;
- 				p += len + 1;
- 				break;
-diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
-index c4cf362..feedee7 100644
---- a/net/sctp/sm_make_chunk.c
-+++ b/net/sctp/sm_make_chunk.c
-@@ -230,7 +230,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
- 	sp = sctp_sk(asoc->base.sk);
- 	num_types = sp->pf->supported_addrs(sp, types);
- 
--	chunksize = sizeof(init) + addrs_len + SCTP_SAT_LEN(num_types);
-+	chunksize = sizeof(init) + addrs_len;
-+	chunksize += WORD_ROUND(SCTP_SAT_LEN(num_types));
- 	chunksize += sizeof(ecap_param);
- 
- 	if (sctp_prsctp_enable)
-@@ -260,14 +261,14 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
- 		/* Add HMACS parameter length if any were defined */
- 		auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs;
- 		if (auth_hmacs->length)
--			chunksize += ntohs(auth_hmacs->length);
-+			chunksize += WORD_ROUND(ntohs(auth_hmacs->length));
- 		else
- 			auth_hmacs = NULL;
- 
- 		/* Add CHUNKS parameter length */
- 		auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks;
- 		if (auth_chunks->length)
--			chunksize += ntohs(auth_chunks->length);
-+			chunksize += WORD_ROUND(ntohs(auth_chunks->length));
- 		else
- 			auth_chunks = NULL;
- 
-@@ -277,7 +278,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
- 
- 	/* If we have any extensions to report, account for that */
- 	if (num_ext)
--		chunksize += sizeof(sctp_supported_ext_param_t) + num_ext;
-+		chunksize += WORD_ROUND(sizeof(sctp_supported_ext_param_t) +
-+					num_ext);
- 
- 	/* RFC 2960 3.3.2 Initiation (INIT) (1)
- 	 *
-@@ -419,13 +421,13 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
- 
- 		auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs;
- 		if (auth_hmacs->length)
--			chunksize += ntohs(auth_hmacs->length);
-+			chunksize += WORD_ROUND(ntohs(auth_hmacs->length));
- 		else
- 			auth_hmacs = NULL;
- 
- 		auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks;
- 		if (auth_chunks->length)
--			chunksize += ntohs(auth_chunks->length);
-+			chunksize += WORD_ROUND(ntohs(auth_chunks->length));
- 		else
- 			auth_chunks = NULL;
- 
-@@ -434,7 +436,8 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
- 	}
- 
- 	if (num_ext)
--		chunksize += sizeof(sctp_supported_ext_param_t) + num_ext;
-+		chunksize += WORD_ROUND(sizeof(sctp_supported_ext_param_t) +
-+					num_ext);
- 
- 	/* Now allocate and fill out the chunk.  */
- 	retval = sctp_make_chunk(asoc, SCTP_CID_INIT_ACK, 0, chunksize);
-diff --git a/net/tipc/socket.c b/net/tipc/socket.c
-index e6d9abf..8ebf4975 100644
---- a/net/tipc/socket.c
-+++ b/net/tipc/socket.c
-@@ -393,6 +393,7 @@ static int get_name(struct socket *sock, struct sockaddr *uaddr,
- 	struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
- 	struct tipc_sock *tsock = tipc_sk(sock->sk);
- 
-+	memset(addr, 0, sizeof(*addr));
- 	if (peer) {
- 		if ((sock->state != SS_CONNECTED) &&
- 			((peer != 2) || (sock->state != SS_DISCONNECTING)))
-diff --git a/sound/core/init.c b/sound/core/init.c
-index ec4a50c..82f350e 100644
---- a/sound/core/init.c
-+++ b/sound/core/init.c
-@@ -848,6 +848,7 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
- 		return -ENOMEM;
- 	mfile->file = file;
- 	mfile->disconnected_f_op = NULL;
-+	INIT_LIST_HEAD(&mfile->shutdown_list);
- 	spin_lock(&card->files_lock);
- 	if (card->shutdown) {
- 		spin_unlock(&card->files_lock);
-@@ -883,6 +884,9 @@ int snd_card_file_remove(struct snd_card *card, struct file *file)
- 	list_for_each_entry(mfile, &card->files_list, list) {
- 		if (mfile->file == file) {
- 			list_del(&mfile->list);
-+			spin_lock(&shutdown_lock);
-+			list_del(&mfile->shutdown_list);
-+			spin_unlock(&shutdown_lock);
- 			if (mfile->disconnected_f_op)
- 				fops_put(mfile->disconnected_f_op);
- 			found = mfile;
-diff --git a/sound/oss/dev_table.h b/sound/oss/dev_table.h
-index b7617be..0199a31 100644
---- a/sound/oss/dev_table.h
-+++ b/sound/oss/dev_table.h
-@@ -271,7 +271,7 @@ struct synth_operations
- 	void (*reset) (int dev);
- 	void (*hw_control) (int dev, unsigned char *event);
- 	int (*load_patch) (int dev, int format, const char __user *addr,
--	     int offs, int count, int pmgr_flag);
-+	     int count, int pmgr_flag);
- 	void (*aftertouch) (int dev, int voice, int pressure);
- 	void (*controller) (int dev, int voice, int ctrl_num, int value);
- 	void (*panning) (int dev, int voice, int value);
-diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
-index 9e45098..978423e 100644
---- a/sound/oss/midi_synth.c
-+++ b/sound/oss/midi_synth.c
-@@ -476,7 +476,7 @@ EXPORT_SYMBOL(midi_synth_hw_control);
- 
- int
- midi_synth_load_patch(int dev, int format, const char __user *addr,
--		      int offs, int count, int pmgr_flag)
-+		      int count, int pmgr_flag)
- {
- 	int             orig_dev = synth_devs[dev]->midi_dev;
- 
-@@ -491,39 +491,37 @@ midi_synth_load_patch(int dev, int format, const char __user *addr,
- 	if (!prefix_cmd(orig_dev, 0xf0))
- 		return 0;
- 
-+	/* Invalid patch format */
- 	if (format != SYSEX_PATCH)
--	{
--/*		  printk("MIDI Error: Invalid patch format (key) 0x%x\n", format);*/
- 		  return -EINVAL;
--	}
-+
-+	/* Patch header too short */
- 	if (count < hdr_size)
--	{
--/*		printk("MIDI Error: Patch header too short\n");*/
- 		return -EINVAL;
--	}
-+
- 	count -= hdr_size;
- 
- 	/*
--	 * Copy the header from user space but ignore the first bytes which have
--	 * been transferred already.
-+	 * Copy the header from user space
- 	 */
- 
--	if(copy_from_user(&((char *) &sysex)[offs], &(addr)[offs], hdr_size - offs))
-+	if (copy_from_user(&sysex, addr, hdr_size))
- 		return -EFAULT;
-- 
-- 	if (count < sysex.len)
--	{
--/*		printk(KERN_WARNING "MIDI Warning: Sysex record too short (%d<%d)\n", count, (int) sysex.len);*/
-+
-+	/* Sysex record too short */
-+	if ((unsigned)count < (unsigned)sysex.len)
- 		sysex.len = count;
--	}
--  	left = sysex.len;
--  	src_offs = 0;
-+
-+	left = sysex.len;
-+	src_offs = 0;
- 
- 	for (i = 0; i < left && !signal_pending(current); i++)
- 	{
- 		unsigned char   data;
- 
--		get_user(*(unsigned char *) &data, (unsigned char __user *) &((addr)[hdr_size + i]));
-+		if (get_user(data,
-+		    (unsigned char __user *)(addr + hdr_size + i)))
-+			return -EFAULT;
- 
- 		eox_seen = (i > 0 && data & 0x80);	/* End of sysex */
- 
-diff --git a/sound/oss/midi_synth.h b/sound/oss/midi_synth.h
-index 6bc9d00..b64ddd6 100644
---- a/sound/oss/midi_synth.h
-+++ b/sound/oss/midi_synth.h
-@@ -8,7 +8,7 @@ int midi_synth_open (int dev, int mode);
- void midi_synth_close (int dev);
- void midi_synth_hw_control (int dev, unsigned char *event);
- int midi_synth_load_patch (int dev, int format, const char __user * addr,
--		 int offs, int count, int pmgr_flag);
-+		 int count, int pmgr_flag);
- void midi_synth_panning (int dev, int channel, int pressure);
- void midi_synth_aftertouch (int dev, int channel, int pressure);
- void midi_synth_controller (int dev, int channel, int ctrl_num, int value);
-diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
-index 7781c13..4e912dd 100644
---- a/sound/oss/opl3.c
-+++ b/sound/oss/opl3.c
-@@ -819,7 +819,7 @@ static void opl3_hw_control(int dev, unsigned char *event)
- }
- 
- static int opl3_load_patch(int dev, int format, const char __user *addr,
--		int offs, int count, int pmgr_flag)
-+		int count, int pmgr_flag)
- {
- 	struct sbi_instrument ins;
- 
-@@ -829,11 +829,7 @@ static int opl3_load_patch(int dev, int format, const char __user *addr,
- 		return -EINVAL;
- 	}
- 
--	/*
--	 * What the fuck is going on here?  We leave junk in the beginning
--	 * of ins and then check the field pretty close to that beginning?
--	 */
--	if(copy_from_user(&((char *) &ins)[offs], addr + offs, sizeof(ins) - offs))
-+	if (copy_from_user(&ins, addr, sizeof(ins)))
- 		return -EFAULT;
- 
- 	if (ins.channel < 0 || ins.channel >= SBFM_MAXINSTR)
-@@ -848,6 +844,10 @@ static int opl3_load_patch(int dev, int format, const char __user *addr,
- 
- static void opl3_panning(int dev, int voice, int value)
- {
-+
-+	if (voice < 0 || voice >= devc->nr_voice)
-+		return;
-+
- 	devc->voc[voice].panning = value;
- }
- 
-@@ -1065,8 +1065,15 @@ static int opl3_alloc_voice(int dev, int chn, int note, struct voice_alloc_info
- 
- static void opl3_setup_voice(int dev, int voice, int chn)
- {
--	struct channel_info *info =
--	&synth_devs[dev]->chn_info[chn];
-+	struct channel_info *info;
-+
-+	if (voice < 0 || voice >= devc->nr_voice)
-+		return;
-+
-+	if (chn < 0 || chn > 15)
-+		return;
-+
-+	info = &synth_devs[dev]->chn_info[chn];
- 
- 	opl3_set_instr(dev, voice, info->pgm_num);
- 
-diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
-index c798746..5cb171d 100644
---- a/sound/oss/sequencer.c
-+++ b/sound/oss/sequencer.c
-@@ -241,7 +241,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
- 				return -ENXIO;
- 
- 			fmt = (*(short *) &event_rec[0]) & 0xffff;
--			err = synth_devs[dev]->load_patch(dev, fmt, buf, p + 4, c, 0);
-+			err = synth_devs[dev]->load_patch(dev, fmt, buf + p, c, 0);
- 			if (err < 0)
- 				return err;
- 
-diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
-index 2b82c5c..fc948a7 100644
---- a/sound/pci/ens1370.c
-+++ b/sound/pci/ens1370.c
-@@ -229,6 +229,7 @@ MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");
- #define ES_REG_1371_CODEC 0x14	/* W/R: Codec Read/Write register address */
- #define   ES_1371_CODEC_RDY	   (1<<31)	/* codec ready */
- #define   ES_1371_CODEC_WIP	   (1<<30)	/* codec register access in progress */
-+#define   EV_1938_CODEC_MAGIC	   (1<<26)
- #define   ES_1371_CODEC_PIRD	   (1<<23)	/* codec read/write select register */
- #define   ES_1371_CODEC_WRITE(a,d) ((((a)&0x7f)<<16)|(((d)&0xffff)<<0))
- #define   ES_1371_CODEC_READS(a)   ((((a)&0x7f)<<16)|ES_1371_CODEC_PIRD)
-@@ -603,12 +604,18 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,
- 
- #ifdef CHIP1371
- 
-+static inline bool is_ev1938(struct ensoniq *ensoniq)
-+{
-+	return ensoniq->pci->device == 0x8938;
-+}
-+
- static void snd_es1371_codec_write(struct snd_ac97 *ac97,
- 				   unsigned short reg, unsigned short val)
- {
- 	struct ensoniq *ensoniq = ac97->private_data;
--	unsigned int t, x;
-+	unsigned int t, x, flag;
- 
-+	flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
- 	mutex_lock(&ensoniq->src_mutex);
- 	for (t = 0; t < POLL_COUNT; t++) {
- 		if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) {
-@@ -630,7 +637,8 @@ static void snd_es1371_codec_write(struct snd_ac97 *ac97,
- 				    0x00010000)
- 					break;
- 			}
--			outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));
-+			outl(ES_1371_CODEC_WRITE(reg, val) | flag,
-+			     ES_REG(ensoniq, 1371_CODEC));
- 			/* restore SRC reg */
- 			snd_es1371_wait_src_ready(ensoniq);
- 			outl(x, ES_REG(ensoniq, 1371_SMPRATE));
-@@ -647,8 +655,9 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
- 					    unsigned short reg)
- {
- 	struct ensoniq *ensoniq = ac97->private_data;
--	unsigned int t, x, fail = 0;
-+	unsigned int t, x, flag, fail = 0;
- 
-+	flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
-       __again:
- 	mutex_lock(&ensoniq->src_mutex);
- 	for (t = 0; t < POLL_COUNT; t++) {
-@@ -671,7 +680,8 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
- 				    0x00010000)
- 					break;
- 			}
--			outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));
-+			outl(ES_1371_CODEC_READS(reg) | flag,
-+			     ES_REG(ensoniq, 1371_CODEC));
- 			/* restore SRC reg */
- 			snd_es1371_wait_src_ready(ensoniq);
- 			outl(x, ES_REG(ensoniq, 1371_SMPRATE));
-@@ -683,6 +693,11 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
- 			/* now wait for the stinkin' data (RDY) */
- 			for (t = 0; t < POLL_COUNT; t++) {
- 				if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {
-+					if (is_ev1938(ensoniq)) {
-+						for (t = 0; t < 100; t++)
-+							inl(ES_REG(ensoniq, CONTROL));
-+						x = inl(ES_REG(ensoniq, 1371_CODEC));
-+					}
- 					mutex_unlock(&ensoniq->src_mutex);
- 					return ES_1371_CODEC_READ(x);
- 				}
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 34e7ec9..ed550e4 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -1153,7 +1153,7 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
- 		case 0x10ec0883:
- 		case 0x10ec0885:
- 		case 0x10ec0887:
--		case 0x10ec0889:
-+		/*case 0x10ec0889:*/ /* this causes an SPDIF problem */
- 			alc889_coef_init(codec);
- 			break;
- 		case 0x10ec0888:
diff --git a/2.6.32/1037_linux-2.6.32.38.patch b/2.6.32/1037_linux-2.6.32.38.patch
deleted file mode 100644
index 8dcf5ca..0000000
--- a/2.6.32/1037_linux-2.6.32.38.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/net/rds/rdma.c b/net/rds/rdma.c
-index f7d8c08..6b09b94 100644
---- a/net/rds/rdma.c
-+++ b/net/rds/rdma.c
-@@ -473,14 +473,6 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs,
- 
- 		max_pages = max(nr, max_pages);
- 		nr_pages += nr;
--
--		/*
--		 * nr_pages for one entry is limited to (UINT_MAX>>PAGE_SHIFT)+1,
--		 * so tot_pages cannot overflow without first going negative.
--		 */
--		if ((int)nr_pages < 0)
--			ret = -EINVAL;
--			goto out;
- 	}
- 
- 	pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL);
diff --git a/2.6.32/1038_linux-2.6.32.39.patch b/2.6.32/1038_linux-2.6.32.39.patch
deleted file mode 100644
index ef1f643..0000000
--- a/2.6.32/1038_linux-2.6.32.39.patch
+++ /dev/null
@@ -1,792 +0,0 @@
-diff --git a/MAINTAINERS b/MAINTAINERS
-index b23a092..ea3302f 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -5010,7 +5010,6 @@ F:	arch/alpha/kernel/srm_env.c
- 
- STABLE BRANCH
- M:	Greg Kroah-Hartman <greg@kroah.com>
--M:	Chris Wright <chrisw@sous-sol.org>
- L:	stable@kernel.org
- S:	Maintained
- 
-diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
-index 496ac7a..7bfb274 100644
---- a/arch/ia64/kernel/mca.c
-+++ b/arch/ia64/kernel/mca.c
-@@ -1850,7 +1850,8 @@ ia64_mca_cpu_init(void *cpu_data)
- 			data = mca_bootmem();
- 			first_time = 0;
- 		} else
--			data = __get_free_pages(GFP_KERNEL, get_order(sz));
-+			data = (void *)__get_free_pages(GFP_KERNEL,
-+							get_order(sz));
- 		if (!data)
- 			panic("Could not allocate MCA memory for cpu %d\n",
- 					cpu);
-diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
-index 35b2a27..3b7ba70 100644
---- a/arch/ia64/sn/pci/tioca_provider.c
-+++ b/arch/ia64/sn/pci/tioca_provider.c
-@@ -517,7 +517,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
-  * use the GART mapped mode.
-  */
- static u64
--tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)
-+tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags)
- {
- 	u64 mapaddr;
- 
-diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
-index a7e502f..883037b 100644
---- a/arch/x86/include/asm/msr-index.h
-+++ b/arch/x86/include/asm/msr-index.h
-@@ -81,11 +81,15 @@
- #define MSR_IA32_MC0_ADDR		0x00000402
- #define MSR_IA32_MC0_MISC		0x00000403
- 
-+#define MSR_AMD64_MC0_MASK		0xc0010044
-+
- #define MSR_IA32_MCx_CTL(x)		(MSR_IA32_MC0_CTL + 4*(x))
- #define MSR_IA32_MCx_STATUS(x)		(MSR_IA32_MC0_STATUS + 4*(x))
- #define MSR_IA32_MCx_ADDR(x)		(MSR_IA32_MC0_ADDR + 4*(x))
- #define MSR_IA32_MCx_MISC(x)		(MSR_IA32_MC0_MISC + 4*(x))
- 
-+#define MSR_AMD64_MCx_MASK(x)		(MSR_AMD64_MC0_MASK + (x))
-+
- /* These are consecutive and not in the normal 4er MCE bank block */
- #define MSR_IA32_MC0_CTL2		0x00000280
- #define MSR_IA32_MCx_CTL2(x)		(MSR_IA32_MC0_CTL2 + (x))
-diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 78bb4d7..da35a70 100644
---- a/arch/x86/include/asm/processor.h
-+++ b/arch/x86/include/asm/processor.h
-@@ -1029,4 +1029,23 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,
- 	return ratio;
- }
- 
-+/*
-+ * AMD errata checking
-+ */
-+#ifdef CONFIG_CPU_SUP_AMD
-+extern const int amd_erratum_400[];
-+extern bool cpu_has_amd_erratum(const int *);
-+
-+#define AMD_LEGACY_ERRATUM(...)		{ -1, __VA_ARGS__, 0 }
-+#define AMD_OSVW_ERRATUM(osvw_id, ...)	{ osvw_id, __VA_ARGS__, 0 }
-+#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \
-+	((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end))
-+#define AMD_MODEL_RANGE_FAMILY(range)	(((range) >> 24) & 0xff)
-+#define AMD_MODEL_RANGE_START(range)	(((range) >> 12) & 0xfff)
-+#define AMD_MODEL_RANGE_END(range)	((range) & 0xfff)
-+
-+#else
-+#define cpu_has_amd_erratum(x)	(false)
-+#endif /* CONFIG_CPU_SUP_AMD */
-+
- #endif /* _ASM_X86_PROCESSOR_H */
-diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 4d707d3..f893f73 100644
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -566,6 +566,29 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
- 		}
- 	}
- #endif
-+
-+	/* As a rule processors have APIC timer running in deep C states */
-+	if (c->x86 >= 0xf && !cpu_has_amd_erratum(amd_erratum_400))
-+		set_cpu_cap(c, X86_FEATURE_ARAT);
-+
-+	/*
-+	 * Disable GART TLB Walk Errors on Fam10h. We do this here
-+	 * because this is always needed when GART is enabled, even in a
-+	 * kernel which has no MCE support built in.
-+	 */
-+	if (c->x86 == 0x10) {
-+		/*
-+		 * BIOS should disable GartTlbWlk Errors themself. If
-+		 * it doesn't do it here as suggested by the BKDG.
-+		 *
-+		 * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012
-+		 */
-+		u64 mask;
-+
-+		rdmsrl(MSR_AMD64_MCx_MASK(4), mask);
-+		mask |= (1 << 10);
-+		wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
-+	}
- }
- 
- #ifdef CONFIG_X86_32
-@@ -610,3 +633,68 @@ static const struct cpu_dev __cpuinitconst amd_cpu_dev = {
- };
- 
- cpu_dev_register(amd_cpu_dev);
-+
-+/*
-+ * AMD errata checking
-+ *
-+ * Errata are defined as arrays of ints using the AMD_LEGACY_ERRATUM() or
-+ * AMD_OSVW_ERRATUM() macros. The latter is intended for newer errata that
-+ * have an OSVW id assigned, which it takes as first argument. Both take a
-+ * variable number of family-specific model-stepping ranges created by
-+ * AMD_MODEL_RANGE(). Each erratum also has to be declared as extern const
-+ * int[] in arch/x86/include/asm/processor.h.
-+ *
-+ * Example:
-+ *
-+ * const int amd_erratum_319[] =
-+ *	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0x4, 0x2),
-+ *			   AMD_MODEL_RANGE(0x10, 0x8, 0x0, 0x8, 0x0),
-+ *			   AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0));
-+ */
-+
-+const int amd_erratum_400[] =
-+	AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf),
-+			    AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));
-+
-+
-+bool cpu_has_amd_erratum(const int *erratum)
-+{
-+	struct cpuinfo_x86 *cpu = &current_cpu_data;
-+	int osvw_id = *erratum++;
-+	u32 range;
-+	u32 ms;
-+
-+	/*
-+	 * If called early enough that current_cpu_data hasn't been initialized
-+	 * yet, fall back to boot_cpu_data.
-+	 */
-+	if (cpu->x86 == 0)
-+		cpu = &boot_cpu_data;
-+
-+	if (cpu->x86_vendor != X86_VENDOR_AMD)
-+		return false;
-+
-+	if (osvw_id >= 0 && osvw_id < 65536 &&
-+	    cpu_has(cpu, X86_FEATURE_OSVW)) {
-+		u64 osvw_len;
-+
-+		rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, osvw_len);
-+		if (osvw_id < osvw_len) {
-+			u64 osvw_bits;
-+
-+			rdmsrl(MSR_AMD64_OSVW_STATUS + (osvw_id >> 6),
-+			    osvw_bits);
-+			return osvw_bits & (1ULL << (osvw_id & 0x3f));
-+		}
-+	}
-+
-+	/* OSVW unavailable or ID unknown, match family-model-stepping range */
-+	ms = (cpu->x86_model << 4) | cpu->x86_mask;
-+	while ((range = *erratum++))
-+		if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) &&
-+		    (ms >= AMD_MODEL_RANGE_START(range)) &&
-+		    (ms <= AMD_MODEL_RANGE_END(range)))
-+			return true;
-+
-+	return false;
-+}
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 5fd5b07..fc6c84d 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -438,42 +438,6 @@ static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
- 	return (edx & MWAIT_EDX_C1);
- }
- 
--/*
-- * Check for AMD CPUs, where APIC timer interrupt does not wake up CPU from C1e.
-- * For more information see
-- * - Erratum #400 for NPT family 0xf and family 0x10 CPUs
-- * - Erratum #365 for family 0x11 (not affected because C1e not in use)
-- */
--static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
--{
--	u64 val;
--	if (c->x86_vendor != X86_VENDOR_AMD)
--		goto no_c1e_idle;
--
--	/* Family 0x0f models < rev F do not have C1E */
--	if (c->x86 == 0x0F && c->x86_model >= 0x40)
--		return 1;
--
--	if (c->x86 == 0x10) {
--		/*
--		 * check OSVW bit for CPUs that are not affected
--		 * by erratum #400
--		 */
--		if (cpu_has(c, X86_FEATURE_OSVW)) {
--			rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, val);
--			if (val >= 2) {
--				rdmsrl(MSR_AMD64_OSVW_STATUS, val);
--				if (!(val & BIT(1)))
--					goto no_c1e_idle;
--			}
--		}
--		return 1;
--	}
--
--no_c1e_idle:
--	return 0;
--}
--
- static cpumask_var_t c1e_mask;
- static int c1e_detected;
- 
-@@ -551,7 +515,8 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
- 		 */
- 		printk(KERN_INFO "using mwait in idle threads.\n");
- 		pm_idle = mwait_idle;
--	} else if (check_c1e_idle(c)) {
-+	} else if (cpu_has_amd_erratum(amd_erratum_400)) {
-+		/* E400: APIC timer interrupt does not wake up CPU from C1e */
- 		printk(KERN_INFO "using C1E aware idle routine\n");
- 		pm_idle = c1e_idle;
- 	} else
-diff --git a/arch/x86/lib/semaphore_32.S b/arch/x86/lib/semaphore_32.S
-index 648fe47..f35eec7 100644
---- a/arch/x86/lib/semaphore_32.S
-+++ b/arch/x86/lib/semaphore_32.S
-@@ -36,7 +36,7 @@
-  */
- #ifdef CONFIG_SMP
- ENTRY(__write_lock_failed)
--	CFI_STARTPROC simple
-+	CFI_STARTPROC
- 	FRAME
- 2: 	LOCK_PREFIX
- 	addl	$ RW_LOCK_BIAS,(%eax)
-diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
-index 4a7711c..5844abf 100644
---- a/drivers/media/video/sn9c102/sn9c102_core.c
-+++ b/drivers/media/video/sn9c102/sn9c102_core.c
-@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
- 		   sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
- static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
- 		   sn9c102_show_i2c_val, sn9c102_store_i2c_val);
--static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green);
--static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue);
--static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red);
-+static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green);
-+static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue);
-+static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red);
- static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
- 
- 
-diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
-index 33d5c57..605caaa 100644
---- a/drivers/net/usb/cdc-phonet.c
-+++ b/drivers/net/usb/cdc-phonet.c
-@@ -325,13 +325,13 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
- {
- 	static const char ifname[] = "usbpn%d";
- 	const struct usb_cdc_union_desc *union_header = NULL;
--	const struct usb_cdc_header_desc *phonet_header = NULL;
- 	const struct usb_host_interface *data_desc;
- 	struct usb_interface *data_intf;
- 	struct usb_device *usbdev = interface_to_usbdev(intf);
- 	struct net_device *dev;
- 	struct usbpn_dev *pnd;
- 	u8 *data;
-+	int phonet = 0;
- 	int len, err;
- 
- 	data = intf->altsetting->extra;
-@@ -352,10 +352,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
- 					(struct usb_cdc_union_desc *)data;
- 				break;
- 			case 0xAB:
--				if (phonet_header || dlen < 5)
--					break;
--				phonet_header =
--					(struct usb_cdc_header_desc *)data;
-+				phonet = 1;
- 				break;
- 			}
- 		}
-@@ -363,7 +360,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
- 		len -= dlen;
- 	}
- 
--	if (!union_header || !phonet_header)
-+	if (!union_header || !phonet)
- 		return -EINVAL;
- 
- 	data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0);
-diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
-index 355dffc..2ce5963 100644
---- a/drivers/usb/core/devices.c
-+++ b/drivers/usb/core/devices.c
-@@ -211,7 +211,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
- 		break;
- 	case USB_ENDPOINT_XFER_INT:
- 		type = "Int.";
--		if (speed == USB_SPEED_HIGH)
-+		if (speed == USB_SPEED_HIGH || speed == USB_SPEED_SUPER)
- 			interval = 1 << (desc->bInterval - 1);
- 		else
- 			interval = desc->bInterval;
-@@ -219,7 +219,8 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
- 	default:	/* "can't happen" */
- 		return start;
- 	}
--	interval *= (speed == USB_SPEED_HIGH) ? 125 : 1000;
-+	interval *= (speed == USB_SPEED_HIGH ||
-+		     speed == USB_SPEED_SUPER) ? 125 : 1000;
- 	if (interval % 1000)
- 		unit = 'u';
- 	else {
-@@ -529,8 +530,9 @@ static ssize_t usb_device_dump(char __user **buffer, size_t *nbytes,
- 	if (level == 0) {
- 		int	max;
- 
--		/* high speed reserves 80%, full/low reserves 90% */
--		if (usbdev->speed == USB_SPEED_HIGH)
-+		/* super/high speed reserves 80%, full/low reserves 90% */
-+		if (usbdev->speed == USB_SPEED_HIGH ||
-+		    usbdev->speed == USB_SPEED_SUPER)
- 			max = 800;
- 		else
- 			max = FRAME_TIME_MAX_USECS_ALLOC;
-diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
-index d4bd6ef..f51345f 100644
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -1224,24 +1224,27 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
- 
- static void scan_async (struct ehci_hcd *ehci)
- {
-+	bool			stopped;
- 	struct ehci_qh		*qh;
- 	enum ehci_timer_action	action = TIMER_IO_WATCHDOG;
- 
- 	ehci->stamp = ehci_readl(ehci, &ehci->regs->frame_index);
- 	timer_action_done (ehci, TIMER_ASYNC_SHRINK);
- rescan:
-+	stopped = !HC_IS_RUNNING(ehci_to_hcd(ehci)->state);
- 	qh = ehci->async->qh_next.qh;
- 	if (likely (qh != NULL)) {
- 		do {
- 			/* clean any finished work for this qh */
--			if (!list_empty (&qh->qtd_list)
--					&& qh->stamp != ehci->stamp) {
-+			if (!list_empty(&qh->qtd_list) && (stopped ||
-+					qh->stamp != ehci->stamp)) {
- 				int temp;
- 
- 				/* unlinks could happen here; completion
- 				 * reporting drops the lock.  rescan using
- 				 * the latest schedule, but don't rescan
--				 * qhs we already finished (no looping).
-+				 * qhs we already finished (no looping)
-+				 * unless the controller is stopped.
- 				 */
- 				qh = qh_get (qh);
- 				qh->stamp = ehci->stamp;
-@@ -1262,9 +1265,9 @@ rescan:
- 			 */
- 			if (list_empty(&qh->qtd_list)
- 					&& qh->qh_state == QH_STATE_LINKED) {
--				if (!ehci->reclaim
--					&& ((ehci->stamp - qh->stamp) & 0x1fff)
--						>= (EHCI_SHRINK_FRAMES * 8))
-+				if (!ehci->reclaim && (stopped ||
-+					((ehci->stamp - qh->stamp) & 0x1fff)
-+						>= EHCI_SHRINK_FRAMES * 8))
- 					start_unlink_async(ehci, qh);
- 				else
- 					action = TIMER_ASYNC_SHRINK;
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index dd71f02..64cb409 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -439,6 +439,47 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud
- 	return 0;
- }
- 
-+/*
-+ * Convert interval expressed as 2^(bInterval - 1) == interval into
-+ * straight exponent value 2^n == interval.
-+ *
-+ */
-+static unsigned int xhci_parse_exponent_interval(struct usb_device *udev,
-+		struct usb_host_endpoint *ep)
-+{
-+	unsigned int interval;
-+
-+	interval = clamp_val(ep->desc.bInterval, 1, 16) - 1;
-+	if (interval != ep->desc.bInterval - 1)
-+		dev_warn(&udev->dev,
-+			 "ep %#x - rounding interval to %d microframes\n",
-+			 ep->desc.bEndpointAddress,
-+			 1 << interval);
-+
-+	return interval;
-+}
-+
-+/*
-+ * Convert bInterval expressed in frames (in 1-255 range) to exponent of
-+ * microframes, rounded down to nearest power of 2.
-+ */
-+static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
-+		struct usb_host_endpoint *ep)
-+{
-+	unsigned int interval;
-+
-+	interval = fls(8 * ep->desc.bInterval) - 1;
-+	interval = clamp_val(interval, 3, 10);
-+	if ((1 << interval) != 8 * ep->desc.bInterval)
-+		dev_warn(&udev->dev,
-+			 "ep %#x - rounding interval to %d microframes, ep desc says %d microframes\n",
-+			 ep->desc.bEndpointAddress,
-+			 1 << interval,
-+			 8 * ep->desc.bInterval);
-+
-+	return interval;
-+}
-+
- /* Return the polling or NAK interval.
-  *
-  * The polling interval is expressed in "microframes".  If xHCI's Interval field
-@@ -456,40 +497,38 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
- 	case USB_SPEED_HIGH:
- 		/* Max NAK rate */
- 		if (usb_endpoint_xfer_control(&ep->desc) ||
--				usb_endpoint_xfer_bulk(&ep->desc))
-+		    usb_endpoint_xfer_bulk(&ep->desc)) {
- 			interval = ep->desc.bInterval;
-+			break;
-+		}
- 		/* Fall through - SS and HS isoc/int have same decoding */
-+
- 	case USB_SPEED_SUPER:
- 		if (usb_endpoint_xfer_int(&ep->desc) ||
--				usb_endpoint_xfer_isoc(&ep->desc)) {
--			if (ep->desc.bInterval == 0)
--				interval = 0;
--			else
--				interval = ep->desc.bInterval - 1;
--			if (interval > 15)
--				interval = 15;
--			if (interval != ep->desc.bInterval + 1)
--				dev_warn(&udev->dev, "ep %#x - rounding interval to %d microframes\n",
--						ep->desc.bEndpointAddress, 1 << interval);
-+		    usb_endpoint_xfer_isoc(&ep->desc)) {
-+			interval = xhci_parse_exponent_interval(udev, ep);
- 		}
- 		break;
--	/* Convert bInterval (in 1-255 frames) to microframes and round down to
--	 * nearest power of 2.
--	 */
-+
- 	case USB_SPEED_FULL:
-+		if (usb_endpoint_xfer_int(&ep->desc)) {
-+			interval = xhci_parse_exponent_interval(udev, ep);
-+			break;
-+		}
-+		/*
-+		 * Fall through for isochronous endpoint interval decoding
-+		 * since it uses the same rules as low speed interrupt
-+		 * endpoints.
-+		 */
-+
- 	case USB_SPEED_LOW:
- 		if (usb_endpoint_xfer_int(&ep->desc) ||
--				usb_endpoint_xfer_isoc(&ep->desc)) {
--			interval = fls(8*ep->desc.bInterval) - 1;
--			if (interval > 10)
--				interval = 10;
--			if (interval < 3)
--				interval = 3;
--			if ((1 << interval) != 8*ep->desc.bInterval)
--				dev_warn(&udev->dev, "ep %#x - rounding interval to %d microframes\n",
--						ep->desc.bEndpointAddress, 1 << interval);
-+		    usb_endpoint_xfer_isoc(&ep->desc)) {
-+
-+			interval = xhci_parse_frame_interval(udev, ep);
- 		}
- 		break;
-+
- 	default:
- 		BUG();
- 	}
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index db821e9..a5dc8086 100644
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -232,7 +232,7 @@ struct xhci_op_regs {
-  * notification type that matches a bit set in this bit field.
-  */
- #define	DEV_NOTE_MASK		(0xffff)
--#define ENABLE_DEV_NOTE(x)	(1 << x)
-+#define ENABLE_DEV_NOTE(x)	(1 << (x))
- /* Most of the device notification types should only be used for debug.
-  * SW does need to pay attention to function wake notifications.
-  */
-@@ -579,11 +579,11 @@ struct xhci_ep_ctx {
- #define EP_STATE_STOPPED	3
- #define EP_STATE_ERROR		4
- /* Mult - Max number of burtst within an interval, in EP companion desc. */
--#define EP_MULT(p)		((p & 0x3) << 8)
-+#define EP_MULT(p)		(((p) & 0x3) << 8)
- /* bits 10:14 are Max Primary Streams */
- /* bit 15 is Linear Stream Array */
- /* Interval - period between requests to an endpoint - 125u increments. */
--#define EP_INTERVAL(p)		((p & 0xff) << 16)
-+#define EP_INTERVAL(p)		(((p) & 0xff) << 16)
- #define EP_INTERVAL_TO_UFRAMES(p)		(1 << (((p) >> 16) & 0xff))
- 
- /* ep_info2 bitmasks */
-diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index e371888..5171f22 100644
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -155,6 +155,8 @@ static struct ftdi_sio_quirk ftdi_stmclite_quirk = {
-  * /sys/bus/usb/ftdi_sio/new_id, then send patch/report!
-  */
- static struct usb_device_id id_table_combined [] = {
-+	{ USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) },
-+	{ USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
-@@ -529,6 +531,7 @@ static struct usb_device_id id_table_combined [] = {
- 	{ USB_DEVICE(SEALEVEL_VID, SEALEVEL_2803_8_PID) },
- 	{ USB_DEVICE(IDTECH_VID, IDTECH_IDT1221U_PID) },
- 	{ USB_DEVICE(OCT_VID, OCT_US101_PID) },
-+	{ USB_DEVICE(OCT_VID, OCT_DK201_PID) },
- 	{ USB_DEVICE(FTDI_VID, FTDI_HE_TIRA1_PID),
- 		.driver_info = (kernel_ulong_t)&ftdi_HE_TIRA1_quirk },
- 	{ USB_DEVICE(FTDI_VID, FTDI_USB_UIRT_PID),
-@@ -790,6 +793,8 @@ static struct usb_device_id id_table_combined [] = {
- 	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
- 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- 	{ USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
-+	{ USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },
-+	{ USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
- 	{ USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
- 	{ USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) },
- 	{ USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) },
-diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
-index c8d0fec..eca754b 100644
---- a/drivers/usb/serial/ftdi_sio_ids.h
-+++ b/drivers/usb/serial/ftdi_sio_ids.h
-@@ -300,6 +300,8 @@
-  * Hameg HO820 and HO870 interface (using VID 0x0403)
-  */
- #define        HAMEG_HO820_PID         0xed74
-+#define HAMEG_HO730_PID			0xed73
-+#define HAMEG_HO720_PID			0xed72
- #define        HAMEG_HO870_PID         0xed71
- 
- /*
-@@ -579,6 +581,7 @@
- /* Note: OCT US101 is also rebadged as Dick Smith Electronics (NZ) XH6381 */
- /* Also rebadged as Dick Smith Electronics (Aus) XH6451 */
- /* Also rebadged as SIIG Inc. model US2308 hardware version 1 */
-+#define OCT_DK201_PID		0x0103	/* OCT DK201 USB docking station */
- #define OCT_US101_PID		0x0421	/* OCT US101 USB to RS-232 */
- 
- /*
-@@ -1147,3 +1150,12 @@
- #define QIHARDWARE_VID			0x20B7
- #define MILKYMISTONE_JTAGSERIAL_PID	0x0713
- 
-+/*
-+ * CTI GmbH RS485 Converter http://www.cti-lean.com/
-+ */
-+/* USB-485-Mini*/
-+#define FTDI_CTI_MINI_PID	0xF608
-+/* USB-Nano-485*/
-+#define FTDI_CTI_NANO_PID	0xF60B
-+
-+
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index cf5ff7d..e605c89 100644
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -388,6 +388,16 @@ static int  option_resume(struct usb_serial *serial);
- #define CELOT_VENDOR_ID				0x211f
- #define CELOT_PRODUCT_CT680M			0x6801
- 
-+/* ONDA Communication vendor id */
-+#define ONDA_VENDOR_ID       0x1ee8
-+
-+/* ONDA MT825UP HSDPA 14.2 modem */
-+#define ONDA_MT825UP         0x000b
-+
-+/* Samsung products */
-+#define SAMSUNG_VENDOR_ID                       0x04e8
-+#define SAMSUNG_PRODUCT_GT_B3730                0x6889
-+
- static struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
- 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
-@@ -917,6 +927,8 @@ static struct usb_device_id option_ids[] = {
- 
- 	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
- 	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
-+	{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
-+	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730/GT-B3710 LTE USB modem.*/
- 	{ } /* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, option_ids);
-diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
-index 3bbcaa7..7df5937 100644
---- a/fs/cifs/connect.c
-+++ b/fs/cifs/connect.c
-@@ -2532,7 +2532,7 @@ try_mount_again:
- 
- remote_path_check:
- 	/* check if a whole path (including prepath) is not remote */
--	if (!rc && cifs_sb->prepathlen && tcon) {
-+	if (!rc && tcon) {
- 		/* build_path_to_root works only when we have a valid tcon */
- 		full_path = cifs_build_path_to_root(cifs_sb);
- 		if (full_path == NULL) {
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index a1bb0f6..3d09a10 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2806,11 +2806,16 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
- /* for the /proc/ directory itself, after non-process stuff has been done */
- int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
- {
--	unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
--	struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
-+	unsigned int nr;
-+	struct task_struct *reaper;
- 	struct tgid_iter iter;
- 	struct pid_namespace *ns;
- 
-+	if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET)
-+		goto out_no_task;
-+	nr = filp->f_pos - FIRST_PROCESS_ENTRY;
-+
-+	reaper = get_proc_task(filp->f_path.dentry->d_inode);
- 	if (!reaper)
- 		goto out_no_task;
- 
-diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
-index 32fae40..3c420b2 100644
---- a/fs/ramfs/file-nommu.c
-+++ b/fs/ramfs/file-nommu.c
-@@ -111,6 +111,7 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
- 		SetPageDirty(page);
- 
- 		unlock_page(page);
-+		put_page(page);
- 	}
- 
- 	return 0;
-diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
-index ace4d8d..ceaa1d3 100644
---- a/fs/ubifs/debug.c
-+++ b/fs/ubifs/debug.c
-@@ -2691,19 +2691,19 @@ int dbg_debugfs_init_fs(struct ubifs_info *c)
- 	}
- 
- 	fname = "dump_lprops";
--	dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops);
-+	dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
- 	if (IS_ERR(dent))
- 		goto out_remove;
- 	d->dfs_dump_lprops = dent;
- 
- 	fname = "dump_budg";
--	dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops);
-+	dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
- 	if (IS_ERR(dent))
- 		goto out_remove;
- 	d->dfs_dump_budg = dent;
- 
- 	fname = "dump_tnc";
--	dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops);
-+	dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
- 	if (IS_ERR(dent))
- 		goto out_remove;
- 	d->dfs_dump_tnc = dent;
-diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
-index 1009adc..e90dd7e 100644
---- a/fs/ubifs/file.c
-+++ b/fs/ubifs/file.c
-@@ -1311,6 +1311,9 @@ int ubifs_fsync(struct file *file, struct dentry *dentry, int datasync)
- 
- 	dbg_gen("syncing inode %lu", inode->i_ino);
- 
-+	if (inode->i_sb->s_flags & MS_RDONLY)
-+		return 0;
-+
- 	/*
- 	 * VFS has already synchronized dirty pages for this inode. Synchronize
- 	 * the inode unless this is a 'datasync()' call.
-diff --git a/include/linux/pid.h b/include/linux/pid.h
-index 49f1c2f..ec9f2df 100644
---- a/include/linux/pid.h
-+++ b/include/linux/pid.h
-@@ -117,7 +117,7 @@ extern struct pid *find_vpid(int nr);
-  */
- extern struct pid *find_get_pid(int nr);
- extern struct pid *find_ge_pid(int nr, struct pid_namespace *);
--int next_pidmap(struct pid_namespace *pid_ns, int last);
-+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last);
- 
- extern struct pid *alloc_pid(struct pid_namespace *ns);
- extern void free_pid(struct pid *pid);
-diff --git a/kernel/pid.c b/kernel/pid.c
-index d3f722d..fce7198 100644
---- a/kernel/pid.c
-+++ b/kernel/pid.c
-@@ -182,11 +182,14 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
- 	return -1;
- }
- 
--int next_pidmap(struct pid_namespace *pid_ns, int last)
-+int next_pidmap(struct pid_namespace *pid_ns, unsigned int last)
- {
- 	int offset;
- 	struct pidmap *map, *end;
- 
-+	if (last >= PID_MAX_LIMIT)
-+		return -1;
-+
- 	offset = (last + 1) & BITS_PER_PAGE_MASK;
- 	map = &pid_ns->pidmap[(last + 1)/BITS_PER_PAGE];
- 	end = &pid_ns->pidmap[PIDMAP_ENTRIES];
-diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
-index 608a97b..1e9f3e42 100644
---- a/net/ax25/af_ax25.c
-+++ b/net/ax25/af_ax25.c
-@@ -1391,7 +1391,7 @@ static int ax25_getname(struct socket *sock, struct sockaddr *uaddr,
- 	ax25_cb *ax25;
- 	int err = 0;
- 
--	memset(fsa, 0, sizeof(fsa));
-+	memset(fsa, 0, sizeof(*fsa));
- 	lock_sock(sk);
- 	ax25 = ax25_sk(sk);
- 
-diff --git a/net/rds/rdma.c b/net/rds/rdma.c
-index 6b09b94..ff5e3c9 100644
---- a/net/rds/rdma.c
-+++ b/net/rds/rdma.c
-@@ -473,6 +473,17 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs,
- 
- 		max_pages = max(nr, max_pages);
- 		nr_pages += nr;
-+
-+		/*
-+		 * nr for one entry in limited to (UINT_MAX>>PAGE_SHIFT)+1
-+		 * so nr_pages cannot overflow without becoming bigger than
-+		 * INT_MAX first. If nr cannot overflow then max_pages should
-+		 * be ok.
-+		 */
-+		if (nr_pages > INT_MAX) {
-+			ret = -EINVAL;
-+			goto out;
-+		}
- 	}
- 
- 	pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL);
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104301754.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.40-201105111839.patch
index ab225e0..21584b3 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.39-201104301754.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.40-201105111839.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32.39/arch/alpha/include/asm/elf.h linux-2.6.32.39/arch/alpha/include/asm/elf.h
---- linux-2.6.32.39/arch/alpha/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/alpha/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/alpha/include/asm/elf.h linux-2.6.32.40/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.40/arch/alpha/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/alpha/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.39/arch/alpha/include/asm/elf.h linux-2.6.32.39/arch/alp
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.32.39/arch/alpha/include/asm/pgtable.h linux-2.6.32.39/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.39/arch/alpha/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/alpha/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/alpha/include/asm/pgtable.h linux-2.6.32.40/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.40/arch/alpha/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/alpha/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.39/arch/alpha/include/asm/pgtable.h linux-2.6.32.39/arch
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.32.39/arch/alpha/kernel/module.c linux-2.6.32.39/arch/alpha/kernel/module.c
---- linux-2.6.32.39/arch/alpha/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/alpha/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/alpha/kernel/module.c linux-2.6.32.40/arch/alpha/kernel/module.c
+--- linux-2.6.32.40/arch/alpha/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/alpha/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.39/arch/alpha/kernel/module.c linux-2.6.32.39/arch/alpha
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.39/arch/alpha/kernel/osf_sys.c linux-2.6.32.39/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.39/arch/alpha/kernel/osf_sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/alpha/kernel/osf_sys.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/alpha/kernel/osf_sys.c linux-2.6.32.40/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.40/arch/alpha/kernel/osf_sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/alpha/kernel/osf_sys.c	2011-04-17 15:56:45.000000000 -0400
 @@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
@@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.39/arch/alpha/kernel/osf_sys.c linux-2.6.32.39/arch/alph
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.32.39/arch/alpha/mm/fault.c linux-2.6.32.39/arch/alpha/mm/fault.c
---- linux-2.6.32.39/arch/alpha/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/alpha/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/alpha/mm/fault.c linux-2.6.32.40/arch/alpha/mm/fault.c
+--- linux-2.6.32.40/arch/alpha/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/alpha/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.39/arch/alpha/mm/fault.c linux-2.6.32.39/arch/alpha/mm/f
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.39/arch/arm/include/asm/elf.h linux-2.6.32.39/arch/arm/include/asm/elf.h
---- linux-2.6.32.39/arch/arm/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/include/asm/elf.h linux-2.6.32.40/arch/arm/include/asm/elf.h
+--- linux-2.6.32.40/arch/arm/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.39/arch/arm/include/asm/elf.h linux-2.6.32.39/arch/arm/i
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.32.39/arch/arm/include/asm/kmap_types.h linux-2.6.32.39/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.39/arch/arm/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/include/asm/kmap_types.h linux-2.6.32.40/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.40/arch/arm/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -19,6 +19,7 @@ enum km_type {
  	KM_SOFTIRQ0,
  	KM_SOFTIRQ1,
@@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.39/arch/arm/include/asm/kmap_types.h linux-2.6.32.39/arc
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.39/arch/arm/include/asm/uaccess.h linux-2.6.32.39/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.39/arch/arm/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/include/asm/uaccess.h linux-2.6.32.40/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.40/arch/arm/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.39/arch/arm/include/asm/uaccess.h linux-2.6.32.39/arch/a
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.32.39/arch/arm/kernel/kgdb.c linux-2.6.32.39/arch/arm/kernel/kgdb.c
---- linux-2.6.32.39/arch/arm/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/kernel/kgdb.c linux-2.6.32.40/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.40/arch/arm/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
@@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.39/arch/arm/kernel/kgdb.c linux-2.6.32.39/arch/arm/kerne
  #ifndef __ARMEB__
  	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.39/arch/arm/mach-at91/pm.c linux-2.6.32.39/arch/arm/mach-at91/pm.c
---- linux-2.6.32.39/arch/arm/mach-at91/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-at91/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-at91/pm.c linux-2.6.32.40/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.40/arch/arm/mach-at91/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-at91/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -348,7 +348,7 @@ static void at91_pm_end(void)
  }
  
@@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-at91/pm.c linux-2.6.32.39/arch/arm/mach
  	.valid	= at91_pm_valid_state,
  	.begin	= at91_pm_begin,
  	.enter	= at91_pm_enter,
-diff -urNp linux-2.6.32.39/arch/arm/mach-omap1/pm.c linux-2.6.32.39/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.39/arch/arm/mach-omap1/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-omap1/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-omap1/pm.c linux-2.6.32.40/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.40/arch/arm/mach-omap1/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-omap1/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 
  
  
@@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-omap1/pm.c linux-2.6.32.39/arch/arm/mac
  	.prepare	= omap_pm_prepare,
  	.enter		= omap_pm_enter,
  	.finish		= omap_pm_finish,
-diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.40/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.40/arch/arm/mach-omap2/pm24xx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-omap2/pm24xx.c	2011-04-17 15:56:45.000000000 -0400
 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
  	enable_hlt();
  }
@@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.39/arch/arm
  	.prepare	= omap2_pm_prepare,
  	.enter		= omap2_pm_enter,
  	.finish		= omap2_pm_finish,
-diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.40/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.40/arch/arm/mach-omap2/pm34xx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-omap2/pm34xx.c	2011-04-17 15:56:45.000000000 -0400
 @@ -401,7 +401,7 @@ static void omap3_pm_end(void)
  	return;
  }
@@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.39/arch/arm
  	.begin		= omap3_pm_begin,
  	.end		= omap3_pm_end,
  	.prepare	= omap3_pm_prepare,
-diff -urNp linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-pnx4008/pm.c linux-2.6.32.40/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.40/arch/arm/mach-pnx4008/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-pnx4008/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
  	       (state == PM_SUSPEND_MEM);
  }
@@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-pnx4008/pm.c linux-2.6.32.39/arch/arm/m
  	.enter = pnx4008_pm_enter,
  	.valid = pnx4008_pm_valid,
  };
-diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/pm.c linux-2.6.32.39/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.39/arch/arm/mach-pxa/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-pxa/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-pxa/pm.c linux-2.6.32.40/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.40/arch/arm/mach-pxa/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-pxa/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -95,7 +95,7 @@ void pxa_pm_finish(void)
  		pxa_cpu_pm_fns->finish();
  }
@@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/pm.c linux-2.6.32.39/arch/arm/mach-
  	.valid		= pxa_pm_valid,
  	.enter		= pxa_pm_enter,
  	.prepare	= pxa_pm_prepare,
-diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.40/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.40/arch/arm/mach-pxa/sharpsl_pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-pxa/sharpsl_pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
  }
  
@@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.39/arch/a
  	.prepare	= pxa_pm_prepare,
  	.finish		= pxa_pm_finish,
  	.enter		= corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.39/arch/arm/mach-sa1100/pm.c linux-2.6.32.39/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.39/arch/arm/mach-sa1100/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mach-sa1100/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mach-sa1100/pm.c linux-2.6.32.40/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.40/arch/arm/mach-sa1100/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mach-sa1100/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
  	return virt_to_phys(sp);
  }
@@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mach-sa1100/pm.c linux-2.6.32.39/arch/arm/ma
  	.enter		= sa11x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.39/arch/arm/mm/fault.c linux-2.6.32.39/arch/arm/mm/fault.c
---- linux-2.6.32.39/arch/arm/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mm/fault.c linux-2.6.32.40/arch/arm/mm/fault.c
+--- linux-2.6.32.40/arch/arm/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mm/fault.c linux-2.6.32.39/arch/arm/mm/fault
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.32.39/arch/arm/mm/mmap.c linux-2.6.32.39/arch/arm/mm/mmap.c
---- linux-2.6.32.39/arch/arm/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/mm/mmap.c linux-2.6.32.40/arch/arm/mm/mmap.c
+--- linux-2.6.32.40/arch/arm/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.39/arch/arm/mm/mmap.c linux-2.6.32.39/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-2.6.32.39/arch/arm/plat-s3c/pm.c linux-2.6.32.39/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.39/arch/arm/plat-s3c/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/arm/plat-s3c/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/arm/plat-s3c/pm.c linux-2.6.32.40/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.40/arch/arm/plat-s3c/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/arm/plat-s3c/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
  	s3c_pm_check_cleanup();
  }
@@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.39/arch/arm/plat-s3c/pm.c linux-2.6.32.39/arch/arm/plat-
  	.enter		= s3c_pm_enter,
  	.prepare	= s3c_pm_prepare,
  	.finish		= s3c_pm_finish,
-diff -urNp linux-2.6.32.39/arch/avr32/include/asm/elf.h linux-2.6.32.39/arch/avr32/include/asm/elf.h
---- linux-2.6.32.39/arch/avr32/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/avr32/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/avr32/include/asm/elf.h linux-2.6.32.40/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.40/arch/avr32/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/avr32/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.39/arch/avr32/include/asm/elf.h linux-2.6.32.39/arch/avr
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/avr32/include/asm/kmap_types.h linux-2.6.32.40/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.40/arch/avr32/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/avr32/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.39/arch/avr32/include/asm/kmap_types.h linux-2.6.32.39/a
  };
  
  #undef D
-diff -urNp linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/avr32/mach-at32ap/pm.c linux-2.6.32.40/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.40/arch/avr32/mach-at32ap/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/avr32/mach-at32ap/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -176,7 +176,7 @@ out:
  	return 0;
  }
@@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.39/arch/avr32/mach-at32ap/pm.c linux-2.6.32.39/arch/avr3
  	.valid	= avr32_pm_valid_state,
  	.enter	= avr32_pm_enter,
  };
-diff -urNp linux-2.6.32.39/arch/avr32/mm/fault.c linux-2.6.32.39/arch/avr32/mm/fault.c
---- linux-2.6.32.39/arch/avr32/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/avr32/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/avr32/mm/fault.c linux-2.6.32.40/arch/avr32/mm/fault.c
+--- linux-2.6.32.40/arch/avr32/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/avr32/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.39/arch/avr32/mm/fault.c linux-2.6.32.39/arch/avr32/mm/f
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.39/arch/blackfin/kernel/kgdb.c linux-2.6.32.39/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.39/arch/blackfin/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/blackfin/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/blackfin/kernel/kgdb.c linux-2.6.32.40/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.32.40/arch/blackfin/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/blackfin/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;		/* this means that we do not want to exit from the handler */
  }
@@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.39/arch/blackfin/kernel/kgdb.c linux-2.6.32.39/arch/blac
  	.gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
  	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.39/arch/blackfin/mach-common/pm.c linux-2.6.32.39/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.39/arch/blackfin/mach-common/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/blackfin/mach-common/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/blackfin/mach-common/pm.c linux-2.6.32.40/arch/blackfin/mach-common/pm.c
+--- linux-2.6.32.40/arch/blackfin/mach-common/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/blackfin/mach-common/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
  	return 0;
  }
@@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.39/arch/blackfin/mach-common/pm.c linux-2.6.32.39/arch/b
  	.enter = bfin_pm_enter,
  	.valid	= bfin_pm_valid,
  };
-diff -urNp linux-2.6.32.39/arch/frv/include/asm/kmap_types.h linux-2.6.32.39/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.39/arch/frv/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/frv/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/frv/include/asm/kmap_types.h linux-2.6.32.40/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.32.40/arch/frv/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/frv/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.39/arch/frv/include/asm/kmap_types.h linux-2.6.32.39/arc
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.39/arch/frv/mm/elf-fdpic.c linux-2.6.32.39/arch/frv/mm/elf-fdpic.c
---- linux-2.6.32.39/arch/frv/mm/elf-fdpic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/frv/mm/elf-fdpic.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/frv/mm/elf-fdpic.c linux-2.6.32.40/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.32.40/arch/frv/mm/elf-fdpic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/frv/mm/elf-fdpic.c	2011-04-17 15:56:45.000000000 -0400
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.39/arch/frv/mm/elf-fdpic.c linux-2.6.32.39/arch/frv/mm/e
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.40/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.32.40/arch/ia64/hp/common/hwsw_iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/hp/common/hwsw_iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.39/arch
  {
  	if (use_swiotlb(dev))
  		return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.40/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.32.40/arch/ia64/hp/common/sba_iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/hp/common/sba_iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
  	},
  };
@@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.39/arch/
  	.alloc_coherent		= sba_alloc_coherent,
  	.free_coherent		= sba_free_coherent,
  	.map_page		= sba_map_page,
-diff -urNp linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.40/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.32.40/arch/ia64/ia32/binfmt_elf32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/ia32/binfmt_elf32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
  
  #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
@@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.39/arch/ia
  /* Ugly but avoids duplication */
  #include "../../../fs/binfmt_elf.c"
  
-diff -urNp linux-2.6.32.39/arch/ia64/ia32/ia32priv.h linux-2.6.32.39/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.39/arch/ia64/ia32/ia32priv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/ia32/ia32priv.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/ia32/ia32priv.h linux-2.6.32.40/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.32.40/arch/ia64/ia32/ia32priv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/ia32/ia32priv.h	2011-04-17 15:56:45.000000000 -0400
 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
  #define ELF_DATA	ELFDATA2LSB
  #define ELF_ARCH	EM_386
@@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/ia32/ia32priv.h linux-2.6.32.39/arch/ia64/i
  #define IA32_GATE_OFFSET	IA32_PAGE_OFFSET
  #define IA32_GATE_END		IA32_PAGE_OFFSET + PAGE_SIZE
  
-diff -urNp linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.40/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.32.40/arch/ia64/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.39/a
  	return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.32.39/arch/ia64/include/asm/elf.h linux-2.6.32.39/arch/ia64/include/asm/elf.h
---- linux-2.6.32.39/arch/ia64/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/include/asm/elf.h linux-2.6.32.40/arch/ia64/include/asm/elf.h
+--- linux-2.6.32.40/arch/ia64/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -43,6 +43,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/include/asm/elf.h linux-2.6.32.39/arch/ia64
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.32.39/arch/ia64/include/asm/machvec.h linux-2.6.32.39/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.39/arch/ia64/include/asm/machvec.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/include/asm/machvec.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/include/asm/machvec.h linux-2.6.32.40/arch/ia64/include/asm/machvec.h
+--- linux-2.6.32.40/arch/ia64/include/asm/machvec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/include/asm/machvec.h	2011-04-17 15:56:45.000000000 -0400
 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
@@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/include/asm/machvec.h linux-2.6.32.39/arch/
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.39/arch/ia64/include/asm/pgtable.h linux-2.6.32.39/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.39/arch/ia64/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/include/asm/pgtable.h linux-2.6.32.40/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.32.40/arch/ia64/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/include/asm/pgtable.h linux-2.6.32.39/arch/
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.32.39/arch/ia64/include/asm/spinlock.h linux-2.6.32.39/arch/ia64/include/asm/spinlock.h
---- linux-2.6.32.39/arch/ia64/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/include/asm/spinlock.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/include/asm/spinlock.h linux-2.6.32.40/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.32.40/arch/ia64/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/include/asm/spinlock.h	2011-04-17 15:56:45.000000000 -0400
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -875,9 +875,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/include/asm/spinlock.h linux-2.6.32.39/arch
  }
  
  static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
-diff -urNp linux-2.6.32.39/arch/ia64/include/asm/uaccess.h linux-2.6.32.39/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.39/arch/ia64/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/include/asm/uaccess.h linux-2.6.32.40/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.32.40/arch/ia64/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -896,9 +896,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/include/asm/uaccess.h linux-2.6.32.39/arch/
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/dma-mapping.c linux-2.6.32.40/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.32.40/arch/ia64/kernel/dma-mapping.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/dma-mapping.c	2011-04-17 15:56:45.000000000 -0400
 @@ -3,7 +3,7 @@
  /* Set this to 1 if there is a HW IOMMU in the system */
  int iommu_detected __read_mostly;
@@ -917,9 +917,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/dma-mapping.c linux-2.6.32.39/arch/i
  {
  	return dma_ops;
  }
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/module.c linux-2.6.32.39/arch/ia64/kernel/module.c
---- linux-2.6.32.39/arch/ia64/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/module.c linux-2.6.32.40/arch/ia64/kernel/module.c
+--- linux-2.6.32.40/arch/ia64/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1008,9 +1008,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/module.c linux-2.6.32.39/arch/ia64/k
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-dma.c linux-2.6.32.39/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.39/arch/ia64/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/pci-dma.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/pci-dma.c linux-2.6.32.40/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.32.40/arch/ia64/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/pci-dma.c	2011-04-17 15:56:45.000000000 -0400
 @@ -43,7 +43,7 @@ struct device fallback_dev = {
  	.dma_mask = &fallback_dev.coherent_dma_mask,
  };
@@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-dma.c linux-2.6.32.39/arch/ia64/
  
  	/*
  	 * The order of these functions is important for
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.40/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.32.40/arch/ia64/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/pci-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
  	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
  }
@@ -1074,9 +1074,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.39/arch/i
  	.alloc_coherent = ia64_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
  	.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/sys_ia64.c linux-2.6.32.40/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.32.40/arch/ia64/kernel/sys_ia64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/sys_ia64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/sys_ia64.c linux-2.6.32.39/arch/ia64
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/topology.c linux-2.6.32.39/arch/ia64/kernel/topology.c
---- linux-2.6.32.39/arch/ia64/kernel/topology.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/topology.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/topology.c linux-2.6.32.40/arch/ia64/kernel/topology.c
+--- linux-2.6.32.40/arch/ia64/kernel/topology.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/topology.c	2011-04-17 15:56:45.000000000 -0400
 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
  	return ret;
  }
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/topology.c linux-2.6.32.39/arch/ia64
  	.show   = cache_show
  };
  
-diff -urNp linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.40/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.32.40/arch/ia64/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/kernel/vmlinux.lds.S	2011-04-17 15:56:45.000000000 -0400
 @@ -190,7 +190,7 @@ SECTIONS
    /* Per-cpu data: */
    . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.39/arch/i
    . = __phys_per_cpu_start + PERCPU_PAGE_SIZE;	/* ensure percpu data fits
    						 * into percpu page size
  						 */
-diff -urNp linux-2.6.32.39/arch/ia64/mm/fault.c linux-2.6.32.39/arch/ia64/mm/fault.c
---- linux-2.6.32.39/arch/ia64/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/mm/fault.c linux-2.6.32.40/arch/ia64/mm/fault.c
+--- linux-2.6.32.40/arch/ia64/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/mm/fault.c linux-2.6.32.39/arch/ia64/mm/fau
    survive:
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/mm/hugetlbpage.c linux-2.6.32.40/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.32.40/arch/ia64/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/mm/hugetlbpage.c	2011-04-17 15:56:45.000000000 -0400
 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
  		/* At this point:  (!vmm || addr < vmm->vm_end). */
  		if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1197,9 +1197,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/mm/hugetlbpage.c linux-2.6.32.39/arch/ia64/
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-2.6.32.39/arch/ia64/mm/init.c linux-2.6.32.39/arch/ia64/mm/init.c
---- linux-2.6.32.39/arch/ia64/mm/init.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/mm/init.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/mm/init.c linux-2.6.32.40/arch/ia64/mm/init.c
+--- linux-2.6.32.40/arch/ia64/mm/init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/mm/init.c	2011-04-17 15:56:45.000000000 -0400
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/mm/init.c linux-2.6.32.39/arch/ia64/mm/init
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.40/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.32.40/arch/ia64/sn/pci/pci_dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/ia64/sn/pci/pci_dma.c	2011-04-17 15:56:45.000000000 -0400
 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
  	return ret;
  }
@@ -1232,9 +1232,9 @@ diff -urNp linux-2.6.32.39/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.39/arch/ia64/
  	.alloc_coherent		= sn_dma_alloc_coherent,
  	.free_coherent		= sn_dma_free_coherent,
  	.map_page		= sn_dma_map_page,
-diff -urNp linux-2.6.32.39/arch/m32r/lib/usercopy.c linux-2.6.32.39/arch/m32r/lib/usercopy.c
---- linux-2.6.32.39/arch/m32r/lib/usercopy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/m32r/lib/usercopy.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/m32r/lib/usercopy.c linux-2.6.32.40/arch/m32r/lib/usercopy.c
+--- linux-2.6.32.40/arch/m32r/lib/usercopy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/m32r/lib/usercopy.c	2011-04-17 15:56:45.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.39/arch/m32r/lib/usercopy.c linux-2.6.32.39/arch/m32r/li
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/alchemy/devboards/pm.c linux-2.6.32.40/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.32.40/arch/mips/alchemy/devboards/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/alchemy/devboards/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -78,7 +78,7 @@ static void db1x_pm_end(void)
  
  }
@@ -1267,9 +1267,9 @@ diff -urNp linux-2.6.32.39/arch/mips/alchemy/devboards/pm.c linux-2.6.32.39/arch
  	.valid		= suspend_valid_only_mem,
  	.begin		= db1x_pm_begin,
  	.enter		= db1x_pm_enter,
-diff -urNp linux-2.6.32.39/arch/mips/include/asm/elf.h linux-2.6.32.39/arch/mips/include/asm/elf.h
---- linux-2.6.32.39/arch/mips/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/include/asm/elf.h linux-2.6.32.40/arch/mips/include/asm/elf.h
+--- linux-2.6.32.40/arch/mips/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.39/arch/mips/include/asm/elf.h linux-2.6.32.39/arch/mips
 +#endif
 +
  #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.39/arch/mips/include/asm/page.h linux-2.6.32.39/arch/mips/include/asm/page.h
---- linux-2.6.32.39/arch/mips/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/include/asm/page.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/include/asm/page.h linux-2.6.32.40/arch/mips/include/asm/page.h
+--- linux-2.6.32.40/arch/mips/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/include/asm/page.h	2011-04-17 15:56:45.000000000 -0400
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1294,9 +1294,9 @@ diff -urNp linux-2.6.32.39/arch/mips/include/asm/page.h linux-2.6.32.39/arch/mip
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-2.6.32.39/arch/mips/include/asm/system.h linux-2.6.32.39/arch/mips/include/asm/system.h
---- linux-2.6.32.39/arch/mips/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/include/asm/system.h linux-2.6.32.40/arch/mips/include/asm/system.h
+--- linux-2.6.32.40/arch/mips/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1305,9 +1305,9 @@ diff -urNp linux-2.6.32.39/arch/mips/include/asm/system.h linux-2.6.32.39/arch/m
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.40/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.32.40/arch/mips/kernel/binfmt_elfn32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/kernel/binfmt_elfn32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1322,9 +1322,9 @@ diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.39/arch
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.40/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.32.40/arch/mips/kernel/binfmt_elfo32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/kernel/binfmt_elfo32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1339,9 +1339,9 @@ diff -urNp linux-2.6.32.39/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.39/arch
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.32.39/arch/mips/kernel/kgdb.c linux-2.6.32.39/arch/mips/kernel/kgdb.c
---- linux-2.6.32.39/arch/mips/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/kernel/kgdb.c linux-2.6.32.40/arch/mips/kernel/kgdb.c
+--- linux-2.6.32.40/arch/mips/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;
  }
@@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.32.39/arch/mips/kernel/kgdb.c linux-2.6.32.39/arch/mips/ker
  struct kgdb_arch arch_kgdb_ops;
  
  /*
-diff -urNp linux-2.6.32.39/arch/mips/kernel/process.c linux-2.6.32.39/arch/mips/kernel/process.c
---- linux-2.6.32.39/arch/mips/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/kernel/process.c linux-2.6.32.40/arch/mips/kernel/process.c
+--- linux-2.6.32.40/arch/mips/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
@@ -1369,9 +1369,9 @@ diff -urNp linux-2.6.32.39/arch/mips/kernel/process.c linux-2.6.32.39/arch/mips/
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-2.6.32.39/arch/mips/kernel/syscall.c linux-2.6.32.39/arch/mips/kernel/syscall.c
---- linux-2.6.32.39/arch/mips/kernel/syscall.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/kernel/syscall.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/kernel/syscall.c linux-2.6.32.40/arch/mips/kernel/syscall.c
+--- linux-2.6.32.40/arch/mips/kernel/syscall.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/kernel/syscall.c	2011-04-17 15:56:45.000000000 -0400
 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
@@ -1406,9 +1406,9 @@ diff -urNp linux-2.6.32.39/arch/mips/kernel/syscall.c linux-2.6.32.39/arch/mips/
  			return addr;
  		addr = vmm->vm_end;
  		if (do_color_align)
-diff -urNp linux-2.6.32.39/arch/mips/mm/fault.c linux-2.6.32.39/arch/mips/mm/fault.c
---- linux-2.6.32.39/arch/mips/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/mips/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/mips/mm/fault.c linux-2.6.32.40/arch/mips/mm/fault.c
+--- linux-2.6.32.40/arch/mips/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/mips/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -26,6 +26,23 @@
  #include <asm/ptrace.h>
  #include <asm/highmem.h>		/* For VMALLOC_END */
@@ -1433,9 +1433,9 @@ diff -urNp linux-2.6.32.39/arch/mips/mm/fault.c linux-2.6.32.39/arch/mips/mm/fau
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.32.39/arch/parisc/include/asm/elf.h linux-2.6.32.39/arch/parisc/include/asm/elf.h
---- linux-2.6.32.39/arch/parisc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/parisc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/parisc/include/asm/elf.h linux-2.6.32.40/arch/parisc/include/asm/elf.h
+--- linux-2.6.32.40/arch/parisc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/parisc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -343,6 +343,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1450,9 +1450,9 @@ diff -urNp linux-2.6.32.39/arch/parisc/include/asm/elf.h linux-2.6.32.39/arch/pa
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-2.6.32.39/arch/parisc/include/asm/pgtable.h linux-2.6.32.39/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.39/arch/parisc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/parisc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/parisc/include/asm/pgtable.h linux-2.6.32.40/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.32.40/arch/parisc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/parisc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -207,6 +207,17 @@
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1471,9 +1471,9 @@ diff -urNp linux-2.6.32.39/arch/parisc/include/asm/pgtable.h linux-2.6.32.39/arc
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
  #define PAGE_KERNEL_UNC	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.32.39/arch/parisc/kernel/module.c linux-2.6.32.39/arch/parisc/kernel/module.c
---- linux-2.6.32.39/arch/parisc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/parisc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/parisc/kernel/module.c linux-2.6.32.40/arch/parisc/kernel/module.c
+--- linux-2.6.32.40/arch/parisc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/parisc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -95,16 +95,38 @@
  
  /* three functions to determine where in the module core
@@ -1574,9 +1574,9 @@ diff -urNp linux-2.6.32.39/arch/parisc/kernel/module.c linux-2.6.32.39/arch/pari
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/parisc/kernel/sys_parisc.c linux-2.6.32.40/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.32.40/arch/parisc/kernel/sys_parisc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/parisc/kernel/sys_parisc.c	2011-04-17 15:56:45.000000000 -0400
 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (TASK_SIZE - len < addr)
@@ -1604,9 +1604,9 @@ diff -urNp linux-2.6.32.39/arch/parisc/kernel/sys_parisc.c linux-2.6.32.39/arch/
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.39/arch/parisc/kernel/traps.c linux-2.6.32.39/arch/parisc/kernel/traps.c
---- linux-2.6.32.39/arch/parisc/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/parisc/kernel/traps.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/parisc/kernel/traps.c linux-2.6.32.40/arch/parisc/kernel/traps.c
+--- linux-2.6.32.40/arch/parisc/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/parisc/kernel/traps.c	2011-04-17 15:56:45.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
@@ -1618,9 +1618,9 @@ diff -urNp linux-2.6.32.39/arch/parisc/kernel/traps.c linux-2.6.32.39/arch/paris
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.32.39/arch/parisc/mm/fault.c linux-2.6.32.39/arch/parisc/mm/fault.c
---- linux-2.6.32.39/arch/parisc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/parisc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/parisc/mm/fault.c linux-2.6.32.40/arch/parisc/mm/fault.c
+--- linux-2.6.32.40/arch/parisc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/parisc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1790,9 +1790,9 @@ diff -urNp linux-2.6.32.39/arch/parisc/mm/fault.c linux-2.6.32.39/arch/parisc/mm
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/device.h linux-2.6.32.39/arch/powerpc/include/asm/device.h
---- linux-2.6.32.39/arch/powerpc/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/device.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/device.h linux-2.6.32.40/arch/powerpc/include/asm/device.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/device.h	2011-04-17 15:56:45.000000000 -0400
 @@ -14,7 +14,7 @@ struct dev_archdata {
  	struct device_node	*of_node;
  
@@ -1802,9 +1802,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/device.h linux-2.6.32.39/arc
  
  	/*
  	 * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.40/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
  #ifdef CONFIG_PPC64
  extern struct dma_map_ops dma_iommu_ops;
@@ -1871,9 +1871,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.3
  
  	if (dma_ops->mapping_error)
  		return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/elf.h linux-2.6.32.39/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.39/arch/powerpc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/elf.h linux-2.6.32.40/arch/powerpc/include/asm/elf.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -1906,9 +1906,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/elf.h linux-2.6.32.39/arch/p
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/iommu.h linux-2.6.32.39/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.39/arch/powerpc/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/iommu.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/iommu.h linux-2.6.32.40/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/iommu.h	2011-04-17 15:56:45.000000000 -0400
 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
  extern void iommu_init_early_dart(void);
  extern void iommu_init_early_pasemi(void);
@@ -1919,9 +1919,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/iommu.h linux-2.6.32.39/arch
  #ifdef CONFIG_PCI
  extern void pci_iommu_init(void);
  extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.40/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -26,6 +26,7 @@ enum km_type {
  	KM_SOFTIRQ1,
  	KM_PPC_SYNC_PAGE,
@@ -1930,9 +1930,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.39
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page_64.h linux-2.6.32.39/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.39/arch/powerpc/include/asm/page_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/page_64.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/page_64.h linux-2.6.32.40/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/page_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/page_64.h	2011-04-17 15:56:45.000000000 -0400
 @@ -180,15 +180,18 @@ do {						\
   * stack by default, so in the absense of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -1954,9 +1954,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page_64.h linux-2.6.32.39/ar
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page.h linux-2.6.32.39/arch/powerpc/include/asm/page.h
---- linux-2.6.32.39/arch/powerpc/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/page.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/page.h linux-2.6.32.40/arch/powerpc/include/asm/page.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/page.h	2011-04-17 15:56:45.000000000 -0400
 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -1979,9 +1979,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/page.h linux-2.6.32.39/arch/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pci.h linux-2.6.32.39/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.39/arch/powerpc/include/asm/pci.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/pci.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/pci.h linux-2.6.32.40/arch/powerpc/include/asm/pci.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/pci.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/pci.h	2011-04-17 15:56:45.000000000 -0400
 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
  }
  
@@ -1993,9 +1993,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pci.h linux-2.6.32.39/arch/p
  #else	/* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/pgtable.h linux-2.6.32.40/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -2004,9 +2004,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pgtable.h linux-2.6.32.39/ar
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.40/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/pte-hash32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/pte-hash32.h	2011-04-17 15:56:45.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -2015,9 +2015,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.39
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/reg.h linux-2.6.32.39/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.39/arch/powerpc/include/asm/reg.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/reg.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/reg.h linux-2.6.32.40/arch/powerpc/include/asm/reg.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/reg.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/reg.h	2011-04-17 15:56:45.000000000 -0400
 @@ -191,6 +191,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
@@ -2026,9 +2026,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/reg.h linux-2.6.32.39/arch/p
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.40/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/swiotlb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/swiotlb.h	2011-04-17 15:56:45.000000000 -0400
 @@ -13,7 +13,7 @@
  
  #include <linux/swiotlb.h>
@@ -2038,9 +2038,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.39/ar
  
  static inline void dma_mark_clean(void *addr, size_t size) {}
  
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/system.h linux-2.6.32.39/arch/powerpc/include/asm/system.h
---- linux-2.6.32.39/arch/powerpc/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/system.h linux-2.6.32.40/arch/powerpc/include/asm/system.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
@@ -2050,9 +2050,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/system.h linux-2.6.32.39/arc
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/include/asm/uaccess.h linux-2.6.32.40/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.32.40/arch/powerpc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -2230,9 +2230,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/include/asm/uaccess.h linux-2.6.32.39/ar
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.40/arch/powerpc/kernel/cacheinfo.c
+--- linux-2.6.32.40/arch/powerpc/kernel/cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/cacheinfo.c	2011-04-17 15:56:45.000000000 -0400
 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
  	&cache_assoc_attr,
  };
@@ -2242,9 +2242,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.39/arch/
  	.show = cache_index_show,
  };
  
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma.c linux-2.6.32.39/arch/powerpc/kernel/dma.c
---- linux-2.6.32.39/arch/powerpc/kernel/dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/dma.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/dma.c linux-2.6.32.40/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.40/arch/powerpc/kernel/dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/dma.c	2011-04-17 15:56:45.000000000 -0400
 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
  }
  #endif
@@ -2254,9 +2254,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma.c linux-2.6.32.39/arch/powerp
  	.alloc_coherent	= dma_direct_alloc_coherent,
  	.free_coherent	= dma_direct_free_coherent,
  	.map_sg		= dma_direct_map_sg,
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.40/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.32.40/arch/powerpc/kernel/dma-iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/dma-iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
  }
  
@@ -2266,9 +2266,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.39/arch/
  {
  	struct iommu_table *tbl = get_iommu_table_base(dev);
  
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.40/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.32.40/arch/powerpc/kernel/dma-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/dma-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
   * map_page, and unmap_page on highmem, use normal dma_ops
   * for everything else.
@@ -2278,9 +2278,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.39/arc
  	.alloc_coherent = dma_direct_alloc_coherent,
  	.free_coherent = dma_direct_free_coherent,
  	.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.40/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.32.40/arch/powerpc/kernel/exceptions-64e.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/exceptions-64e.S	2011-04-17 15:56:45.000000000 -0400
 @@ -455,6 +455,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
@@ -2299,9 +2299,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.39/
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.40/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.32.40/arch/powerpc/kernel/exceptions-64s.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/exceptions-64s.S	2011-04-17 15:56:45.000000000 -0400
 @@ -818,10 +818,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
@@ -2314,9 +2314,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.39/
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/ibmebus.c linux-2.6.32.40/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.32.40/arch/powerpc/kernel/ibmebus.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/ibmebus.c	2011-04-17 15:56:45.000000000 -0400
 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 
  	return 1;
  }
@@ -2326,9 +2326,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/ibmebus.c linux-2.6.32.39/arch/po
  	.alloc_coherent = ibmebus_alloc_coherent,
  	.free_coherent  = ibmebus_free_coherent,
  	.map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/kgdb.c linux-2.6.32.39/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.39/arch/powerpc/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/kgdb.c linux-2.6.32.40/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.32.40/arch/powerpc/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
  	if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
  		return 0;
@@ -2347,9 +2347,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/kgdb.c linux-2.6.32.39/arch/power
  	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module_32.c linux-2.6.32.39/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.39/arch/powerpc/kernel/module_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/module_32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/module_32.c linux-2.6.32.40/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.40/arch/powerpc/kernel/module_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/module_32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
  			me->arch.core_plt_section = i;
  	}
@@ -2379,9 +2379,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module_32.c linux-2.6.32.39/arch/
  
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module.c linux-2.6.32.39/arch/powerpc/kernel/module.c
---- linux-2.6.32.39/arch/powerpc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/module.c linux-2.6.32.40/arch/powerpc/kernel/module.c
+--- linux-2.6.32.40/arch/powerpc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2421,9 +2421,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/module.c linux-2.6.32.39/arch/pow
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/pci-common.c linux-2.6.32.39/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.39/arch/powerpc/kernel/pci-common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/pci-common.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/pci-common.c linux-2.6.32.40/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.32.40/arch/powerpc/kernel/pci-common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/pci-common.c	2011-04-17 15:56:45.000000000 -0400
 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
  unsigned int ppc_pci_flags = 0;
  
@@ -2442,9 +2442,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/pci-common.c linux-2.6.32.39/arch
  {
  	return pci_dma_ops;
  }
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/process.c linux-2.6.32.39/arch/powerpc/kernel/process.c
---- linux-2.6.32.39/arch/powerpc/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/process.c linux-2.6.32.40/arch/powerpc/kernel/process.c
+--- linux-2.6.32.40/arch/powerpc/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
  	 * Lookup NIP late so we have the best change of getting the
  	 * above info out without failing
@@ -2537,9 +2537,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/process.c linux-2.6.32.39/arch/po
 -
 -	return ret;
 -}
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_32.c linux-2.6.32.39/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.39/arch/powerpc/kernel/signal_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/signal_32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/signal_32.c linux-2.6.32.40/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.32.40/arch/powerpc/kernel/signal_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/signal_32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
@@ -2549,9 +2549,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_32.c linux-2.6.32.39/arch/
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_64.c linux-2.6.32.39/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.39/arch/powerpc/kernel/signal_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/signal_64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/signal_64.c linux-2.6.32.40/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.32.40/arch/powerpc/kernel/signal_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/signal_64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/signal_64.c linux-2.6.32.39/arch/
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.40/arch/powerpc/kernel/sys_ppc32.c
+--- linux-2.6.32.40/arch/powerpc/kernel/sys_ppc32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/sys_ppc32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
  	if (oldlenp) {
  		if (!error) {
@@ -2577,9 +2577,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.39/arch/
  	}
  	return error;
  }
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vdso.c linux-2.6.32.39/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.39/arch/powerpc/kernel/vdso.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/vdso.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/vdso.c linux-2.6.32.40/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.40/arch/powerpc/kernel/vdso.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/vdso.c	2011-04-17 15:56:45.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2606,9 +2606,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vdso.c linux-2.6.32.39/arch/power
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vio.c linux-2.6.32.39/arch/powerpc/kernel/vio.c
---- linux-2.6.32.39/arch/powerpc/kernel/vio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/kernel/vio.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/kernel/vio.c linux-2.6.32.40/arch/powerpc/kernel/vio.c
+--- linux-2.6.32.40/arch/powerpc/kernel/vio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/kernel/vio.c	2011-04-17 15:56:45.000000000 -0400
 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
  	vio_cmo_dealloc(viodev, alloc_size);
  }
@@ -2631,9 +2631,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/kernel/vio.c linux-2.6.32.39/arch/powerp
  	viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
  }
  
-diff -urNp linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/lib/usercopy_64.c linux-2.6.32.40/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.32.40/arch/powerpc/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/lib/usercopy_64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2665,9 +2665,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/lib/usercopy_64.c linux-2.6.32.39/arch/p
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.39/arch/powerpc/mm/fault.c linux-2.6.32.39/arch/powerpc/mm/fault.c
---- linux-2.6.32.39/arch/powerpc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/mm/fault.c linux-2.6.32.40/arch/powerpc/mm/fault.c
+--- linux-2.6.32.40/arch/powerpc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -30,6 +30,10 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -2772,9 +2772,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/mm/fault.c linux-2.6.32.39/arch/powerpc/
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-2.6.32.39/arch/powerpc/mm/mmap_64.c linux-2.6.32.39/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.39/arch/powerpc/mm/mmap_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/mm/mmap_64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/mm/mmap_64.c linux-2.6.32.40/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.32.40/arch/powerpc/mm/mmap_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/mm/mmap_64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -2798,9 +2798,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/mm/mmap_64.c linux-2.6.32.39/arch/powerp
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.39/arch/powerpc/mm/slice.c linux-2.6.32.39/arch/powerpc/mm/slice.c
---- linux-2.6.32.39/arch/powerpc/mm/slice.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/mm/slice.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/mm/slice.c linux-2.6.32.40/arch/powerpc/mm/slice.c
+--- linux-2.6.32.40/arch/powerpc/mm/slice.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/mm/slice.c	2011-04-17 15:56:45.000000000 -0400
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
@@ -2867,9 +2867,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/mm/slice.c linux-2.6.32.39/arch/powerpc/
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.40/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.32.40/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
  	lite5200_pm_target_state = PM_SUSPEND_ON;
  }
@@ -2879,9 +2879,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
  	.valid		= lite5200_pm_valid,
  	.begin		= lite5200_pm_begin,
  	.prepare	= lite5200_pm_prepare,
-diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.40/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.32.40/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
  	iounmap(mbar);
  }
@@ -2891,9 +2891,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
  	.valid		= mpc52xx_pm_valid,
  	.prepare	= mpc52xx_pm_prepare,
  	.enter		= mpc52xx_pm_enter,
-diff -urNp linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.40/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.32.40/arch/powerpc/platforms/83xx/suspend.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/platforms/83xx/suspend.c	2011-04-17 15:56:45.000000000 -0400
 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
  	return ret;
  }
@@ -2903,9 +2903,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.39
  	.valid = mpc83xx_suspend_valid,
  	.begin = mpc83xx_suspend_begin,
  	.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.40/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.32.40/arch/powerpc/platforms/cell/iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/platforms/cell/iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
  
  static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2915,9 +2915,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.39/a
  	.alloc_coherent = dma_fixed_alloc_coherent,
  	.free_coherent  = dma_fixed_free_coherent,
  	.map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.40/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.32.40/arch/powerpc/platforms/ps3/system-bus.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/platforms/ps3/system-bus.c	2011-04-17 15:56:45.000000000 -0400
 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
  	return mask >= DMA_BIT_MASK(32);
  }
@@ -2936,9 +2936,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
  	.alloc_coherent = ps3_alloc_coherent,
  	.free_coherent = ps3_free_coherent,
  	.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.40/arch/powerpc/platforms/pseries/Kconfig
+--- linux-2.6.32.40/arch/powerpc/platforms/pseries/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/powerpc/platforms/pseries/Kconfig	2011-04-17 15:56:45.000000000 -0400
 @@ -2,6 +2,8 @@ config PPC_PSERIES
  	depends on PPC64 && PPC_BOOK3S
  	bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2948,9 +2948,9 @@ diff -urNp linux-2.6.32.39/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.3
  	select PPC_I8259
  	select PPC_RTAS
  	select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.39/arch/s390/include/asm/elf.h linux-2.6.32.39/arch/s390/include/asm/elf.h
---- linux-2.6.32.39/arch/s390/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/include/asm/elf.h linux-2.6.32.40/arch/s390/include/asm/elf.h
+--- linux-2.6.32.40/arch/s390/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
     that it will "exec", and that there is sufficient room for the brk.  */
  #define ELF_ET_DYN_BASE		(STACK_TOP / 3 * 2)
@@ -2965,9 +2965,9 @@ diff -urNp linux-2.6.32.39/arch/s390/include/asm/elf.h linux-2.6.32.39/arch/s390
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
  
-diff -urNp linux-2.6.32.39/arch/s390/include/asm/setup.h linux-2.6.32.39/arch/s390/include/asm/setup.h
---- linux-2.6.32.39/arch/s390/include/asm/setup.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/include/asm/setup.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/include/asm/setup.h linux-2.6.32.40/arch/s390/include/asm/setup.h
+--- linux-2.6.32.40/arch/s390/include/asm/setup.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/include/asm/setup.h	2011-04-17 15:56:45.000000000 -0400
 @@ -50,13 +50,13 @@ extern unsigned long memory_end;
  void detect_memory_layout(struct mem_chunk chunk[]);
  
@@ -2984,9 +2984,9 @@ diff -urNp linux-2.6.32.39/arch/s390/include/asm/setup.h linux-2.6.32.39/arch/s3
  #else
  #define s390_noexec	(0)
  #endif
-diff -urNp linux-2.6.32.39/arch/s390/include/asm/uaccess.h linux-2.6.32.39/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.39/arch/s390/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/include/asm/uaccess.h linux-2.6.32.40/arch/s390/include/asm/uaccess.h
+--- linux-2.6.32.40/arch/s390/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -232,6 +232,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -3019,9 +3019,9 @@ diff -urNp linux-2.6.32.39/arch/s390/include/asm/uaccess.h linux-2.6.32.39/arch/
  	if (access_ok(VERIFY_READ, from, n))
  		n = __copy_from_user(to, from, n);
  	else
-diff -urNp linux-2.6.32.39/arch/s390/Kconfig linux-2.6.32.39/arch/s390/Kconfig
---- linux-2.6.32.39/arch/s390/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/Kconfig	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/Kconfig linux-2.6.32.40/arch/s390/Kconfig
+--- linux-2.6.32.40/arch/s390/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/Kconfig	2011-04-17 15:56:45.000000000 -0400
 @@ -194,28 +194,26 @@ config AUDIT_ARCH
  
  config S390_SWITCH_AMODE
@@ -3059,9 +3059,9 @@ diff -urNp linux-2.6.32.39/arch/s390/Kconfig linux-2.6.32.39/arch/s390/Kconfig
  
  comment "Code generation options"
  
-diff -urNp linux-2.6.32.39/arch/s390/kernel/module.c linux-2.6.32.39/arch/s390/kernel/module.c
---- linux-2.6.32.39/arch/s390/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/kernel/module.c linux-2.6.32.40/arch/s390/kernel/module.c
+--- linux-2.6.32.40/arch/s390/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
@@ -3133,9 +3133,9 @@ diff -urNp linux-2.6.32.39/arch/s390/kernel/module.c linux-2.6.32.39/arch/s390/k
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.39/arch/s390/kernel/setup.c linux-2.6.32.39/arch/s390/kernel/setup.c
---- linux-2.6.32.39/arch/s390/kernel/setup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/kernel/setup.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/kernel/setup.c linux-2.6.32.40/arch/s390/kernel/setup.c
+--- linux-2.6.32.40/arch/s390/kernel/setup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/kernel/setup.c	2011-04-17 15:56:45.000000000 -0400
 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
  early_param("mem", early_parse_mem);
  
@@ -3189,9 +3189,9 @@ diff -urNp linux-2.6.32.39/arch/s390/kernel/setup.c linux-2.6.32.39/arch/s390/ke
  static void setup_addressing_mode(void)
  {
  	if (s390_noexec) {
-diff -urNp linux-2.6.32.39/arch/s390/mm/mmap.c linux-2.6.32.39/arch/s390/mm/mmap.c
---- linux-2.6.32.39/arch/s390/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/s390/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/s390/mm/mmap.c linux-2.6.32.40/arch/s390/mm/mmap.c
+--- linux-2.6.32.40/arch/s390/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/s390/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -3238,9 +3238,9 @@ diff -urNp linux-2.6.32.39/arch/s390/mm/mmap.c linux-2.6.32.39/arch/s390/mm/mmap
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.39/arch/score/include/asm/system.h linux-2.6.32.39/arch/score/include/asm/system.h
---- linux-2.6.32.39/arch/score/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/score/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/score/include/asm/system.h linux-2.6.32.40/arch/score/include/asm/system.h
+--- linux-2.6.32.40/arch/score/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/score/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -3250,9 +3250,9 @@ diff -urNp linux-2.6.32.39/arch/score/include/asm/system.h linux-2.6.32.39/arch/
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-2.6.32.39/arch/score/kernel/process.c linux-2.6.32.39/arch/score/kernel/process.c
---- linux-2.6.32.39/arch/score/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/score/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/score/kernel/process.c linux-2.6.32.40/arch/score/kernel/process.c
+--- linux-2.6.32.40/arch/score/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/score/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
@@ -3262,9 +3262,9 @@ diff -urNp linux-2.6.32.39/arch/score/kernel/process.c linux-2.6.32.39/arch/scor
 -{
 -	return sp;
 -}
-diff -urNp linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.40/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.32.40/arch/sh/boards/mach-hp6xx/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sh/boards/mach-hp6xx/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
  	return 0;
  }
@@ -3274,9 +3274,9 @@ diff -urNp linux-2.6.32.39/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.39/arch/s
  	.enter		= hp6x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.40/arch/sh/kernel/cpu/sh4/sq.c
+--- linux-2.6.32.40/arch/sh/kernel/cpu/sh4/sq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sh/kernel/cpu/sh4/sq.c	2011-04-17 15:56:46.000000000 -0400
 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
  	NULL,
  };
@@ -3286,9 +3286,9 @@ diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.39/arch/sh/k
  	.show	= sq_sysfs_show,
  	.store	= sq_sysfs_store,
  };
-diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.40/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.32.40/arch/sh/kernel/cpu/shmobile/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sh/kernel/cpu/shmobile/pm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
  	return 0;
  }
@@ -3298,9 +3298,9 @@ diff -urNp linux-2.6.32.39/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.39/arch
  	.enter          = sh_pm_enter,
  	.valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.39/arch/sh/kernel/kgdb.c linux-2.6.32.39/arch/sh/kernel/kgdb.c
---- linux-2.6.32.39/arch/sh/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sh/kernel/kgdb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sh/kernel/kgdb.c linux-2.6.32.40/arch/sh/kernel/kgdb.c
+--- linux-2.6.32.40/arch/sh/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sh/kernel/kgdb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -3310,9 +3310,9 @@ diff -urNp linux-2.6.32.39/arch/sh/kernel/kgdb.c linux-2.6.32.39/arch/sh/kernel/
  	/* Breakpoint instruction: trapa #0x3c */
  #ifdef CONFIG_CPU_LITTLE_ENDIAN
  	.gdb_bpt_instr		= { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.39/arch/sh/mm/mmap.c linux-2.6.32.39/arch/sh/mm/mmap.c
---- linux-2.6.32.39/arch/sh/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sh/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sh/mm/mmap.c linux-2.6.32.40/arch/sh/mm/mmap.c
+--- linux-2.6.32.40/arch/sh/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sh/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
@@ -3387,9 +3387,9 @@ diff -urNp linux-2.6.32.39/arch/sh/mm/mmap.c linux-2.6.32.39/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/atomic_64.h linux-2.6.32.40/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.32.40/arch/sparc/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/atomic_64.h	2011-05-04 17:56:20.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -3447,7 +3447,15 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.32.39/ar
  
  #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
  #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
-@@ -59,10 +89,26 @@ extern long atomic64_sub_ret(long, atomi
+@@ -50,6 +80,7 @@ extern long atomic64_sub_ret(long, atomi
+  * other cases.
+  */
+ #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
++#define atomic_inc_and_test_unchecked(v) (atomic_inc_return_unchecked(v) == 0)
+ #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
+ 
+ #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
+@@ -59,30 +90,59 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -3474,7 +3482,11 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.32.39/ar
  
  #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
  #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
-@@ -72,17 +118,28 @@ extern long atomic64_sub_ret(long, atomi
+ 
+ #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
++#define atomic_cmpxchg_unchecked(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
+ #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
++#define atomic_xchg_unchecked(v, new) (xchg(&((v)->counter), new))
  
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -3507,7 +3519,7 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.32.39/ar
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -93,17 +150,28 @@ static inline int atomic_add_unless(atom
+@@ -93,17 +153,28 @@ static inline int atomic_add_unless(atom
  
  static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -3540,9 +3552,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/atomic_64.h linux-2.6.32.39/ar
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.40/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.32.40/arch/sparc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
  #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
  #define dma_is_consistent(d, h)	(1)
@@ -3574,9 +3586,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.39/
  
  	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
  	ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_32.h linux-2.6.32.39/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.39/arch/sparc/include/asm/elf_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/elf_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/elf_32.h linux-2.6.32.40/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.32.40/arch/sparc/include/asm/elf_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/elf_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -116,6 +116,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3591,9 +3603,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_32.h linux-2.6.32.39/arch/
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_64.h linux-2.6.32.39/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.39/arch/sparc/include/asm/elf_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/elf_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/elf_64.h linux-2.6.32.40/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.32.40/arch/sparc/include/asm/elf_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/elf_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -163,6 +163,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
@@ -3607,9 +3619,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/elf_64.h linux-2.6.32.39/arch/
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.40/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.32.40/arch/sparc/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3641,9 +3653,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.39/a
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.40/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.32.40/arch/sparc/include/asm/pgtsrmmu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/pgtsrmmu.h	2011-04-17 15:56:46.000000000 -0400
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3658,10 +3670,18 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.39/arc
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h	2011-04-17 15:56:46.000000000 -0400
-@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.40/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.32.40/arch/sparc/include/asm/spinlock_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/spinlock_64.h	2011-05-04 17:56:20.000000000 -0400
+@@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags
+ 
+ /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
+ 
+-static void inline arch_read_lock(raw_rwlock_t *lock)
++static inline void arch_read_lock(raw_rwlock_t *lock)
+ {
+ 	unsigned long tmp1, tmp2;
+ 
  	__asm__ __volatile__ (
  "1:	ldsw		[%2], %0\n"
  "	brlz,pn		%0, 2f\n"
@@ -3698,7 +3718,14 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.39/
  "	cas		[%2], %0, %1\n"
  "	cmp		%0, %1\n"
  "	bne,pn		%%icc, 1b\n"
-@@ -142,7 +152,12 @@ static void inline arch_read_unlock(raw_
+@@ -136,13 +146,18 @@ static int inline arch_read_trylock(raw_
+ 	return tmp1;
+ }
+ 
+-static void inline arch_read_unlock(raw_rwlock_t *lock)
++static inline void arch_read_unlock(raw_rwlock_t *lock)
+ {
+ 	unsigned long tmp1, tmp2;
  
  	__asm__ __volatile__(
  "1:	lduw	[%2], %0\n"
@@ -3712,9 +3739,27 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.39/
  "	cas	[%2], %0, %1\n"
  "	cmp	%0, %1\n"
  "	bne,pn	%%xcc, 1b\n"
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
+@@ -152,7 +167,7 @@ static void inline arch_read_unlock(raw_
+ 	: "memory");
+ }
+ 
+-static void inline arch_write_lock(raw_rwlock_t *lock)
++static inline void arch_write_lock(raw_rwlock_t *lock)
+ {
+ 	unsigned long mask, tmp1, tmp2;
+ 
+@@ -177,7 +192,7 @@ static void inline arch_write_lock(raw_r
+ 	: "memory");
+ }
+ 
+-static void inline arch_write_unlock(raw_rwlock_t *lock)
++static inline void arch_write_unlock(raw_rwlock_t *lock)
+ {
+ 	__asm__ __volatile__(
+ "	stw		%%g0, [%0]"
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.40/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.32.40/arch/sparc/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3766,9 +3811,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.39/a
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.40/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.32.40/arch/sparc/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/uaccess_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3811,9 +3856,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.39/a
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess.h linux-2.6.32.39/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.39/arch/sparc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/include/asm/uaccess.h linux-2.6.32.40/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.32.40/arch/sparc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -3828,9 +3873,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/include/asm/uaccess.h linux-2.6.32.39/arch
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/iommu.c linux-2.6.32.39/arch/sparc/kernel/iommu.c
---- linux-2.6.32.39/arch/sparc/kernel/iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/iommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/iommu.c linux-2.6.32.40/arch/sparc/kernel/iommu.c
+--- linux-2.6.32.40/arch/sparc/kernel/iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/iommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -3849,9 +3894,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/iommu.c linux-2.6.32.39/arch/sparc/
  EXPORT_SYMBOL(dma_ops);
  
  extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/ioport.c linux-2.6.32.39/arch/sparc/kernel/ioport.c
---- linux-2.6.32.39/arch/sparc/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/ioport.c linux-2.6.32.40/arch/sparc/kernel/ioport.c
+--- linux-2.6.32.40/arch/sparc/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
  	BUG();
  }
@@ -3879,9 +3924,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/ioport.c linux-2.6.32.39/arch/sparc
  	.alloc_coherent		= pci32_alloc_coherent,
  	.free_coherent		= pci32_free_coherent,
  	.map_page		= pci32_map_page,
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/kgdb_32.c linux-2.6.32.40/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.32.40/arch/sparc/kernel/kgdb_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/kgdb_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -3891,9 +3936,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_32.c linux-2.6.32.39/arch/spar
  	/* Breakpoint instruction: ta 0x7d */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x7d },
  };
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/kgdb_64.c linux-2.6.32.40/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.32.40/arch/sparc/kernel/kgdb_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/kgdb_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -3903,9 +3948,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/kgdb_64.c linux-2.6.32.39/arch/spar
  	/* Breakpoint instruction: ta 0x72 */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/Makefile linux-2.6.32.39/arch/sparc/kernel/Makefile
---- linux-2.6.32.39/arch/sparc/kernel/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/Makefile linux-2.6.32.40/arch/sparc/kernel/Makefile
+--- linux-2.6.32.40/arch/sparc/kernel/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -3915,9 +3960,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/Makefile linux-2.6.32.39/arch/sparc
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.40/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.32.40/arch/sparc/kernel/pci_sun4v.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/pci_sun4v.c	2011-04-17 15:56:46.000000000 -0400
 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -3927,9 +3972,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.39/arch/sp
  	.alloc_coherent			= dma_4v_alloc_coherent,
  	.free_coherent			= dma_4v_free_coherent,
  	.map_page			= dma_4v_map_page,
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_32.c linux-2.6.32.39/arch/sparc/kernel/process_32.c
---- linux-2.6.32.39/arch/sparc/kernel/process_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/process_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/process_32.c linux-2.6.32.40/arch/sparc/kernel/process_32.c
+--- linux-2.6.32.40/arch/sparc/kernel/process_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/process_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
@@ -3965,9 +4010,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_32.c linux-2.6.32.39/arch/s
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_64.c linux-2.6.32.39/arch/sparc/kernel/process_64.c
---- linux-2.6.32.39/arch/sparc/kernel/process_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/process_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/process_64.c linux-2.6.32.40/arch/sparc/kernel/process_64.c
+--- linux-2.6.32.40/arch/sparc/kernel/process_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/process_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
  	printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
  	       rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -4003,9 +4048,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/process_64.c linux-2.6.32.39/arch/s
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.40/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.32.40/arch/sparc/kernel/sys_sparc_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/sys_sparc_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
@@ -4024,9 +4069,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.39/arch
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.40/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.32.40/arch/sparc/kernel/sys_sparc_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/sys_sparc_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
@@ -4174,9 +4219,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.39/arch
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_32.c linux-2.6.32.39/arch/sparc/kernel/traps_32.c
---- linux-2.6.32.39/arch/sparc/kernel/traps_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/traps_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/traps_32.c linux-2.6.32.40/arch/sparc/kernel/traps_32.c
+--- linux-2.6.32.40/arch/sparc/kernel/traps_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/traps_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
  		      count++ < 30				&&
                        (((unsigned long) rw) >= PAGE_OFFSET)	&&
@@ -4186,9 +4231,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_32.c linux-2.6.32.39/arch/spa
  			       (void *) rw->ins[7]);
  			rw = (struct reg_window32 *)rw->ins[6];
  		}
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_64.c linux-2.6.32.39/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.39/arch/sparc/kernel/traps_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/traps_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/traps_64.c linux-2.6.32.40/arch/sparc/kernel/traps_64.c
+--- linux-2.6.32.40/arch/sparc/kernel/traps_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/traps_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
  		       i + 1,
  		       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4298,9 +4343,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/traps_64.c linux-2.6.32.39/arch/spa
  			       (void *) rw->ins[7]);
  
  			rw = kernel_stack_up(rw);
-diff -urNp linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/kernel/unaligned_64.c linux-2.6.32.40/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.32.40/arch/sparc/kernel/unaligned_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/kernel/unaligned_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
  	if (count < 5) {
  		last_time = jiffies;
@@ -4310,9 +4355,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/kernel/unaligned_64.c linux-2.6.32.39/arch
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-2.6.32.39/arch/sparc/lib/atomic_64.S linux-2.6.32.39/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.39/arch/sparc/lib/atomic_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/lib/atomic_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/lib/atomic_64.S linux-2.6.32.40/arch/sparc/lib/atomic_64.S
+--- linux-2.6.32.40/arch/sparc/lib/atomic_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/lib/atomic_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -4547,9 +4592,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/lib/atomic_64.S linux-2.6.32.39/arch/sparc
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, 2f
-diff -urNp linux-2.6.32.39/arch/sparc/lib/ksyms.c linux-2.6.32.39/arch/sparc/lib/ksyms.c
---- linux-2.6.32.39/arch/sparc/lib/ksyms.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/lib/ksyms.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/lib/ksyms.c linux-2.6.32.40/arch/sparc/lib/ksyms.c
+--- linux-2.6.32.40/arch/sparc/lib/ksyms.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/lib/ksyms.c	2011-04-17 15:56:46.000000000 -0400
 @@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4568,9 +4613,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/lib/ksyms.c linux-2.6.32.39/arch/sparc/lib
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-2.6.32.39/arch/sparc/lib/rwsem_64.S linux-2.6.32.39/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.39/arch/sparc/lib/rwsem_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/lib/rwsem_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/lib/rwsem_64.S linux-2.6.32.40/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.32.40/arch/sparc/lib/rwsem_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/lib/rwsem_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -11,7 +11,12 @@
  	.globl		__down_read
  __down_read:
@@ -4669,9 +4714,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/lib/rwsem_64.S linux-2.6.32.39/arch/sparc/
  	cas		[%o0], %g3, %g7
  	cmp		%g3, %g7
  	bne,pn		%icc, 1b
-diff -urNp linux-2.6.32.39/arch/sparc/Makefile linux-2.6.32.39/arch/sparc/Makefile
---- linux-2.6.32.39/arch/sparc/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/Makefile linux-2.6.32.40/arch/sparc/Makefile
+--- linux-2.6.32.40/arch/sparc/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4681,9 +4726,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/Makefile linux-2.6.32.39/arch/sparc/Makefi
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_32.c linux-2.6.32.39/arch/sparc/mm/fault_32.c
---- linux-2.6.32.39/arch/sparc/mm/fault_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/mm/fault_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/mm/fault_32.c linux-2.6.32.40/arch/sparc/mm/fault_32.c
+--- linux-2.6.32.40/arch/sparc/mm/fault_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/mm/fault_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4987,9 +5032,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_32.c linux-2.6.32.39/arch/sparc/m
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_64.c linux-2.6.32.39/arch/sparc/mm/fault_64.c
---- linux-2.6.32.39/arch/sparc/mm/fault_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/mm/fault_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/mm/fault_64.c linux-2.6.32.40/arch/sparc/mm/fault_64.c
+--- linux-2.6.32.40/arch/sparc/mm/fault_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/mm/fault_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -20,6 +20,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -5496,9 +5541,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/mm/fault_64.c linux-2.6.32.39/arch/sparc/m
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/mm/hugetlbpage.c linux-2.6.32.40/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.32.40/arch/sparc/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
 @@ -69,7 +69,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -5558,9 +5603,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/mm/hugetlbpage.c linux-2.6.32.39/arch/spar
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.32.39/arch/sparc/mm/init_32.c linux-2.6.32.39/arch/sparc/mm/init_32.c
---- linux-2.6.32.39/arch/sparc/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/mm/init_32.c linux-2.6.32.40/arch/sparc/mm/init_32.c
+--- linux-2.6.32.40/arch/sparc/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -317,6 +317,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5595,9 +5640,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/mm/init_32.c linux-2.6.32.39/arch/sparc/mm
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.39/arch/sparc/mm/Makefile linux-2.6.32.39/arch/sparc/mm/Makefile
---- linux-2.6.32.39/arch/sparc/mm/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/mm/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/mm/Makefile linux-2.6.32.40/arch/sparc/mm/Makefile
+--- linux-2.6.32.40/arch/sparc/mm/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/mm/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -5607,9 +5652,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/mm/Makefile linux-2.6.32.39/arch/sparc/mm/
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.32.39/arch/sparc/mm/srmmu.c linux-2.6.32.39/arch/sparc/mm/srmmu.c
---- linux-2.6.32.39/arch/sparc/mm/srmmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/sparc/mm/srmmu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/sparc/mm/srmmu.c linux-2.6.32.40/arch/sparc/mm/srmmu.c
+--- linux-2.6.32.40/arch/sparc/mm/srmmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/sparc/mm/srmmu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5624,9 +5669,9 @@ diff -urNp linux-2.6.32.39/arch/sparc/mm/srmmu.c linux-2.6.32.39/arch/sparc/mm/s
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.32.39/arch/um/include/asm/kmap_types.h linux-2.6.32.39/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.39/arch/um/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/um/include/asm/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/um/include/asm/kmap_types.h linux-2.6.32.40/arch/um/include/asm/kmap_types.h
+--- linux-2.6.32.40/arch/um/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/um/include/asm/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -5635,9 +5680,9 @@ diff -urNp linux-2.6.32.39/arch/um/include/asm/kmap_types.h linux-2.6.32.39/arch
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.39/arch/um/include/asm/page.h linux-2.6.32.39/arch/um/include/asm/page.h
---- linux-2.6.32.39/arch/um/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/um/include/asm/page.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/um/include/asm/page.h linux-2.6.32.40/arch/um/include/asm/page.h
+--- linux-2.6.32.40/arch/um/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/um/include/asm/page.h	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -5648,9 +5693,9 @@ diff -urNp linux-2.6.32.39/arch/um/include/asm/page.h linux-2.6.32.39/arch/um/in
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.32.39/arch/um/kernel/process.c linux-2.6.32.39/arch/um/kernel/process.c
---- linux-2.6.32.39/arch/um/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/um/kernel/process.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/um/kernel/process.c linux-2.6.32.40/arch/um/kernel/process.c
+--- linux-2.6.32.40/arch/um/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/um/kernel/process.c	2011-04-17 15:56:46.000000000 -0400
 @@ -393,22 +393,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -5674,9 +5719,9 @@ diff -urNp linux-2.6.32.39/arch/um/kernel/process.c linux-2.6.32.39/arch/um/kern
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.32.39/arch/um/sys-i386/syscalls.c linux-2.6.32.39/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.39/arch/um/sys-i386/syscalls.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/um/sys-i386/syscalls.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/um/sys-i386/syscalls.c linux-2.6.32.40/arch/um/sys-i386/syscalls.c
+--- linux-2.6.32.40/arch/um/sys-i386/syscalls.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/um/sys-i386/syscalls.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5699,9 +5744,9 @@ diff -urNp linux-2.6.32.39/arch/um/sys-i386/syscalls.c linux-2.6.32.39/arch/um/s
  /*
   * Perform the select(nd, in, out, ex, tv) and mmap() system
   * calls. Linux/i386 didn't use to be able to handle more than
-diff -urNp linux-2.6.32.39/arch/x86/boot/bitops.h linux-2.6.32.39/arch/x86/boot/bitops.h
---- linux-2.6.32.39/arch/x86/boot/bitops.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/bitops.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/bitops.h linux-2.6.32.40/arch/x86/boot/bitops.h
+--- linux-2.6.32.40/arch/x86/boot/bitops.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/bitops.h	2011-04-17 15:56:46.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
@@ -5720,9 +5765,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/bitops.h linux-2.6.32.39/arch/x86/boot/
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.39/arch/x86/boot/boot.h linux-2.6.32.39/arch/x86/boot/boot.h
---- linux-2.6.32.39/arch/x86/boot/boot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/boot.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/boot.h linux-2.6.32.40/arch/x86/boot/boot.h
+--- linux-2.6.32.40/arch/x86/boot/boot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/boot.h	2011-04-17 15:56:46.000000000 -0400
 @@ -82,7 +82,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5741,9 +5786,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/boot.h linux-2.6.32.39/arch/x86/boot/bo
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_32.S linux-2.6.32.39/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.39/arch/x86/boot/compressed/head_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/compressed/head_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/compressed/head_32.S linux-2.6.32.40/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.32.40/arch/x86/boot/compressed/head_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/compressed/head_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -5772,9 +5817,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_32.S linux-2.6.32.39/ar
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_64.S linux-2.6.32.39/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.39/arch/x86/boot/compressed/head_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/compressed/head_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/compressed/head_64.S linux-2.6.32.40/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.32.40/arch/x86/boot/compressed/head_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/compressed/head_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -5793,9 +5838,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/head_64.S linux-2.6.32.39/ar
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/misc.c linux-2.6.32.39/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.39/arch/x86/boot/compressed/misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/compressed/misc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/compressed/misc.c linux-2.6.32.40/arch/x86/boot/compressed/misc.c
+--- linux-2.6.32.40/arch/x86/boot/compressed/misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/compressed/misc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -288,7 +288,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -5814,9 +5859,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/misc.c linux-2.6.32.39/arch/
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.40/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.32.40/arch/x86/boot/compressed/mkpiggy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/compressed/mkpiggy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
  
  	offs = (olen > ilen) ? olen - ilen : 0;
@@ -5826,9 +5871,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.39/ar
  	offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
  
  	printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/relocs.c linux-2.6.32.39/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.39/arch/x86/boot/compressed/relocs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/compressed/relocs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/compressed/relocs.c linux-2.6.32.40/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.32.40/arch/x86/boot/compressed/relocs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/compressed/relocs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -10,8 +10,11 @@
  #define USE_BSD
  #include <endian.h>
@@ -6029,9 +6074,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/compressed/relocs.c linux-2.6.32.39/arc
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-2.6.32.39/arch/x86/boot/cpucheck.c linux-2.6.32.39/arch/x86/boot/cpucheck.c
---- linux-2.6.32.39/arch/x86/boot/cpucheck.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/cpucheck.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/cpucheck.c linux-2.6.32.40/arch/x86/boot/cpucheck.c
+--- linux-2.6.32.40/arch/x86/boot/cpucheck.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/cpucheck.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -6127,9 +6172,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/cpucheck.c linux-2.6.32.39/arch/x86/boo
  
  		err = check_flags();
  	}
-diff -urNp linux-2.6.32.39/arch/x86/boot/header.S linux-2.6.32.39/arch/x86/boot/header.S
---- linux-2.6.32.39/arch/x86/boot/header.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/header.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/header.S linux-2.6.32.40/arch/x86/boot/header.S
+--- linux-2.6.32.40/arch/x86/boot/header.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/header.S	2011-04-17 15:56:46.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
@@ -6139,9 +6184,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/header.S linux-2.6.32.39/arch/x86/boot/
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-2.6.32.39/arch/x86/boot/memory.c linux-2.6.32.39/arch/x86/boot/memory.c
---- linux-2.6.32.39/arch/x86/boot/memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/memory.c linux-2.6.32.40/arch/x86/boot/memory.c
+--- linux-2.6.32.40/arch/x86/boot/memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -6151,9 +6196,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/memory.c linux-2.6.32.39/arch/x86/boot/
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.32.39/arch/x86/boot/video.c linux-2.6.32.39/arch/x86/boot/video.c
---- linux-2.6.32.39/arch/x86/boot/video.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/video.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/video.c linux-2.6.32.40/arch/x86/boot/video.c
+--- linux-2.6.32.40/arch/x86/boot/video.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/video.c	2011-04-17 15:56:46.000000000 -0400
 @@ -90,7 +90,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -6163,9 +6208,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/video.c linux-2.6.32.39/arch/x86/boot/v
  	int key;
  	unsigned int v;
  
-diff -urNp linux-2.6.32.39/arch/x86/boot/video-vesa.c linux-2.6.32.39/arch/x86/boot/video-vesa.c
---- linux-2.6.32.39/arch/x86/boot/video-vesa.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/boot/video-vesa.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/boot/video-vesa.c linux-2.6.32.40/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.40/arch/x86/boot/video-vesa.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/boot/video-vesa.c	2011-04-17 15:56:46.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
  	boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6174,9 +6219,9 @@ diff -urNp linux-2.6.32.39/arch/x86/boot/video-vesa.c linux-2.6.32.39/arch/x86/b
  }
  
  /*
-diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_aout.c linux-2.6.32.39/arch/x86/ia32/ia32_aout.c
---- linux-2.6.32.39/arch/x86/ia32/ia32_aout.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/ia32/ia32_aout.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/ia32/ia32_aout.c linux-2.6.32.40/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.32.40/arch/x86/ia32/ia32_aout.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/ia32/ia32_aout.c	2011-04-17 15:56:46.000000000 -0400
 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
@@ -6199,9 +6244,9 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_aout.c linux-2.6.32.39/arch/x86/ia
  end_coredump:
  	set_fs(fs);
  	return has_dumped;
-diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.39/arch/x86/ia32/ia32entry.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/ia32/ia32entry.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/ia32/ia32entry.S linux-2.6.32.40/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.40/arch/x86/ia32/ia32entry.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/ia32/ia32entry.S	2011-05-11 18:25:12.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -6210,7 +6255,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  #include <linux/linkage.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
-@@ -93,6 +94,23 @@ ENTRY(native_irq_enable_sysexit)
+@@ -93,6 +94,28 @@ ENTRY(native_irq_enable_sysexit)
  ENDPROC(native_irq_enable_sysexit)
  #endif
  
@@ -6229,12 +6274,17 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
 +	call pax_randomize_kstack
 +	pop %rax
 +#endif
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++	push %rax
++	call pax_erase_kstack
++	pop %rax
++#endif
 +	.endm
 +
  /*
   * 32bit SYSENTER instruction entry.
   *
-@@ -119,7 +137,7 @@ ENTRY(ia32_sysenter_target)
+@@ -119,7 +142,7 @@ ENTRY(ia32_sysenter_target)
  	CFI_REGISTER	rsp,rbp
  	SWAPGS_UNSAFE_STACK
  	movq	PER_CPU_VAR(kernel_stack), %rsp
@@ -6243,7 +6293,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs, here we enable it straight after entry:
-@@ -135,7 +153,8 @@ ENTRY(ia32_sysenter_target)
+@@ -135,7 +158,8 @@ ENTRY(ia32_sysenter_target)
  	pushfq
  	CFI_ADJUST_CFA_OFFSET 8
  	/*CFI_REL_OFFSET rflags,0*/
@@ -6253,7 +6303,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  	CFI_REGISTER rip,r10
  	pushq	$__USER32_CS
  	CFI_ADJUST_CFA_OFFSET 8
-@@ -150,6 +169,12 @@ ENTRY(ia32_sysenter_target)
+@@ -150,6 +174,12 @@ ENTRY(ia32_sysenter_target)
  	SAVE_ARGS 0,0,1
   	/* no need to do an access_ok check here because rbp has been
   	   32bit zero extended */ 
@@ -6266,7 +6316,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  1:	movl	(%rbp),%ebp
   	.section __ex_table,"a"
   	.quad 1b,ia32_badarg
-@@ -172,6 +197,7 @@ sysenter_dispatch:
+@@ -172,6 +202,7 @@ sysenter_dispatch:
  	testl	$_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz	sysexit_audit
  sysexit_from_sys_call:
@@ -6274,7 +6324,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  	andl    $~TS_COMPAT,TI_status(%r10)
  	/* clear IF, that popfq doesn't enable interrupts early */
  	andl  $~0x200,EFLAGS-R11(%rsp) 
-@@ -283,19 +309,24 @@ ENDPROC(ia32_sysenter_target)
+@@ -283,19 +314,24 @@ ENDPROC(ia32_sysenter_target)
  ENTRY(ia32_cstar_target)
  	CFI_STARTPROC32	simple
  	CFI_SIGNAL_FRAME
@@ -6301,7 +6351,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  	movl 	%eax,%eax	/* zero extension */
  	movq	%rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq	%rcx,RIP-ARGOFFSET(%rsp)
-@@ -311,6 +342,12 @@ ENTRY(ia32_cstar_target)
+@@ -311,6 +347,12 @@ ENTRY(ia32_cstar_target)
  	/* no need to do an access_ok check here because r8 has been
  	   32bit zero extended */ 
  	/* hardware stack frame is complete now */	
@@ -6314,16 +6364,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  1:	movl	(%r8),%r9d
  	.section __ex_table,"a"
  	.quad 1b,ia32_badarg
-@@ -323,7 +360,7 @@ ENTRY(ia32_cstar_target)
- 	cmpq $IA32_NR_syscalls-1,%rax
- 	ja  ia32_badsys
- cstar_do_call:
--	IA32_ARG_FIXUP 1
-+	IA32_ARG_FIXUP 0
- cstar_dispatch:
- 	call *ia32_sys_call_table(,%rax,8)
- 	movq %rax,RAX-ARGOFFSET(%rsp)
-@@ -333,6 +370,7 @@ cstar_dispatch:
+@@ -333,6 +375,7 @@ cstar_dispatch:
  	testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz sysretl_audit
  sysretl_from_sys_call:
@@ -6331,7 +6372,7 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  	andl $~TS_COMPAT,TI_status(%r10)
  	RESTORE_ARGS 1,-ARG_SKIP,1,1,1
  	movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -415,6 +453,7 @@ ENTRY(ia32_syscall)
+@@ -415,6 +458,7 @@ ENTRY(ia32_syscall)
  	CFI_REL_OFFSET	rip,RIP-RIP
  	PARAVIRT_ADJUST_EXCEPTION_FRAME
  	SWAPGS
@@ -6339,9 +6380,9 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32entry.S linux-2.6.32.39/arch/x86/ia
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_signal.c linux-2.6.32.39/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.39/arch/x86/ia32/ia32_signal.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/ia32/ia32_signal.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/ia32/ia32_signal.c linux-2.6.32.40/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.40/arch/x86/ia32/ia32_signal.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/ia32/ia32_signal.c	2011-04-17 15:56:46.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
  	sp -= frame_size;
  	/* Align the stack pointer according to the i386 ABI,
@@ -6391,9 +6432,9 @@ diff -urNp linux-2.6.32.39/arch/x86/ia32/ia32_signal.c linux-2.6.32.39/arch/x86/
  	} put_user_catch(err);
  
  	if (err)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/alternative.h linux-2.6.32.39/arch/x86/include/asm/alternative.h
---- linux-2.6.32.39/arch/x86/include/asm/alternative.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/alternative.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/alternative.h linux-2.6.32.40/arch/x86/include/asm/alternative.h
+--- linux-2.6.32.40/arch/x86/include/asm/alternative.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/alternative.h	2011-04-17 15:56:46.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
        "	 .byte 662b-661b\n"			/* sourcelen       */	\
        "	 .byte 664f-663f\n"			/* replacementlen  */	\
@@ -6403,9 +6444,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/alternative.h linux-2.6.32.39/ar
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/apm.h linux-2.6.32.39/arch/x86/include/asm/apm.h
---- linux-2.6.32.39/arch/x86/include/asm/apm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/apm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/apm.h linux-2.6.32.40/arch/x86/include/asm/apm.h
+--- linux-2.6.32.40/arch/x86/include/asm/apm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/apm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -6424,9 +6465,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/apm.h linux-2.6.32.39/arch/x86/i
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.39/arch/x86/include/asm/atomic_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/atomic_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/atomic_32.h linux-2.6.32.40/arch/x86/include/asm/atomic_32.h
+--- linux-2.6.32.40/arch/x86/include/asm/atomic_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/atomic_32.h	2011-05-04 17:56:20.000000000 -0400
 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom
  }
  
@@ -6516,7 +6557,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
 +/**
 + * atomic_sub_unchecked - subtract integer from atomic variable
 + * @i: integer value to subtract
-+ * @v: pointer of type atomic_t
++ * @v: pointer of type atomic_unchecked_t
 + *
 + * Atomically subtracts @i from @v.
 + */
@@ -6592,7 +6633,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
 +
 +/**
 + * atomic_dec_unchecked - decrement atomic variable
-+ * @v: pointer of type atomic_t
++ * @v: pointer of type atomic_unchecked_t
 + *
 + * Atomically decrements @v by 1.
 + */
@@ -6620,7 +6661,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
  		     : "+m" (v->counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -137,7 +262,16 @@ static inline int atomic_inc_and_test(at
+@@ -137,7 +262,35 @@ static inline int atomic_inc_and_test(at
  {
  	unsigned char c;
  
@@ -6635,10 +6676,29 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
 +#endif
 +
 +		     "sete %1\n"
++		     : "+m" (v->counter), "=qm" (c)
++		     : : "memory");
++	return c != 0;
++}
++
++/**
++ * atomic_inc_and_test_unchecked - increment and test
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically increments @v by 1
++ * and returns true if the result is zero, or false for all
++ * other cases.
++ */
++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
++{
++	unsigned char c;
++
++	asm volatile(LOCK_PREFIX "incl %0\n"
++		     "sete %1\n"
  		     : "+m" (v->counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -156,7 +290,16 @@ static inline int atomic_add_negative(in
+@@ -156,7 +309,16 @@ static inline int atomic_add_negative(in
  {
  	unsigned char c;
  
@@ -6656,7 +6716,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
  		     : "+m" (v->counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -179,6 +322,46 @@ static inline int atomic_add_return(int 
+@@ -179,6 +341,46 @@ static inline int atomic_add_return(int 
  #endif
  	/* Modern 486+ processor */
  	__i = i;
@@ -6703,7 +6763,29 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
  	asm volatile(LOCK_PREFIX "xaddl %0, %1"
  		     : "+r" (i), "+m" (v->counter)
  		     : : "memory");
-@@ -227,22 +410,39 @@ static inline int atomic_xchg(atomic_t *
+@@ -211,11 +413,21 @@ static inline int atomic_cmpxchg(atomic_
+ 	return cmpxchg(&v->counter, old, new);
+ }
+ 
++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
++{
++	return cmpxchg(&v->counter, old, new);
++}
++
+ static inline int atomic_xchg(atomic_t *v, int new)
+ {
+ 	return xchg(&v->counter, new);
+ }
+ 
++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
++{
++	return xchg(&v->counter, new);
++}
++
+ /**
+  * atomic_add_unless - add unless the number is already a given value
+  * @v: pointer of type atomic_t
+@@ -227,22 +439,39 @@ static inline int atomic_xchg(atomic_t *
   */
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -6747,7 +6829,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
  #define atomic_dec_return(v)  (atomic_sub_return(1, v))
  
  /* These are x86-specific, used by some header files */
-@@ -266,6 +466,14 @@ typedef struct {
+@@ -266,9 +495,18 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
  
@@ -6762,9 +6844,146 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_32.h linux-2.6.32.39/arch
  #define ATOMIC64_INIT(val)	{ (val) }
  
  extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.39/arch/x86/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/atomic_64.h	2011-04-17 15:56:46.000000000 -0400
++extern u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val);
+ 
+ /**
+  * atomic64_xchg - xchg atomic64 variable
+@@ -279,6 +517,7 @@ extern u64 atomic64_cmpxchg(atomic64_t *
+  * the old value.
+  */
+ extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val);
++extern u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
+ 
+ /**
+  * atomic64_set - set atomic64 variable
+@@ -290,6 +529,15 @@ extern u64 atomic64_xchg(atomic64_t *ptr
+ extern void atomic64_set(atomic64_t *ptr, u64 new_val);
+ 
+ /**
++ * atomic64_unchecked_set - set atomic64 variable
++ * @ptr:      pointer to type atomic64_unchecked_t
++ * @new_val:  value to assign
++ *
++ * Atomically sets the value of @ptr to @new_val.
++ */
++extern void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
++
++/**
+  * atomic64_read - read atomic64 variable
+  * @ptr:      pointer to type atomic64_t
+  *
+@@ -317,7 +565,33 @@ static inline u64 atomic64_read(atomic64
+ 	return res;
+ }
+ 
+-extern u64 atomic64_read(atomic64_t *ptr);
++/**
++ * atomic64_read_unchecked - read atomic64 variable
++ * @ptr:      pointer to type atomic64_unchecked_t
++ *
++ * Atomically reads the value of @ptr and returns it.
++ */
++static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *ptr)
++{
++	u64 res;
++
++	/*
++	 * Note, we inline this atomic64_unchecked_t primitive because
++	 * it only clobbers EAX/EDX and leaves the others
++	 * untouched. We also (somewhat subtly) rely on the
++	 * fact that cmpxchg8b returns the current 64-bit value
++	 * of the memory location we are touching:
++	 */
++	asm volatile(
++		"mov %%ebx, %%eax\n\t"
++		"mov %%ecx, %%edx\n\t"
++		LOCK_PREFIX "cmpxchg8b %1\n"
++			: "=&A" (res)
++			: "m" (*ptr)
++		);
++
++	return res;
++}
+ 
+ /**
+  * atomic64_add_return - add and return
+@@ -332,8 +606,11 @@ extern u64 atomic64_add_return(u64 delta
+  * Other variants with different arithmetic operators:
+  */
+ extern u64 atomic64_sub_return(u64 delta, atomic64_t *ptr);
++extern u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr);
+ extern u64 atomic64_inc_return(atomic64_t *ptr);
++extern u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr);
+ extern u64 atomic64_dec_return(atomic64_t *ptr);
++extern u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr);
+ 
+ /**
+  * atomic64_add - add integer to atomic64 variable
+@@ -345,6 +622,15 @@ extern u64 atomic64_dec_return(atomic64_
+ extern void atomic64_add(u64 delta, atomic64_t *ptr);
+ 
+ /**
++ * atomic64_add_unchecked - add integer to atomic64 variable
++ * @delta: integer value to add
++ * @ptr:   pointer to type atomic64_unchecked_t
++ *
++ * Atomically adds @delta to @ptr.
++ */
++extern void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr);
++
++/**
+  * atomic64_sub - subtract the atomic64 variable
+  * @delta: integer value to subtract
+  * @ptr:   pointer to type atomic64_t
+@@ -354,6 +640,15 @@ extern void atomic64_add(u64 delta, atom
+ extern void atomic64_sub(u64 delta, atomic64_t *ptr);
+ 
+ /**
++ * atomic64_sub_unchecked - subtract the atomic64 variable
++ * @delta: integer value to subtract
++ * @ptr:   pointer to type atomic64_unchecked_t
++ *
++ * Atomically subtracts @delta from @ptr.
++ */
++extern void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr);
++
++/**
+  * atomic64_sub_and_test - subtract value from variable and test result
+  * @delta: integer value to subtract
+  * @ptr:   pointer to type atomic64_t
+@@ -373,6 +668,14 @@ extern int atomic64_sub_and_test(u64 del
+ extern void atomic64_inc(atomic64_t *ptr);
+ 
+ /**
++ * atomic64_inc_unchecked - increment atomic64 variable
++ * @ptr: pointer to type atomic64_unchecked_t
++ *
++ * Atomically increments @ptr by 1.
++ */
++extern void atomic64_inc_unchecked(atomic64_unchecked_t *ptr);
++
++/**
+  * atomic64_dec - decrement atomic64 variable
+  * @ptr: pointer to type atomic64_t
+  *
+@@ -381,6 +684,14 @@ extern void atomic64_inc(atomic64_t *ptr
+ extern void atomic64_dec(atomic64_t *ptr);
+ 
+ /**
++ * atomic64_dec_unchecked - decrement atomic64 variable
++ * @ptr: pointer to type atomic64_unchecked_t
++ *
++ * Atomically decrements @ptr by 1.
++ */
++extern void atomic64_dec_unchecked(atomic64_unchecked_t *ptr);
++
++/**
+  * atomic64_dec_and_test - decrement and test
+  * @ptr: pointer to type atomic64_t
+  *
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/atomic_64.h linux-2.6.32.40/arch/x86/include/asm/atomic_64.h
+--- linux-2.6.32.40/arch/x86/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/atomic_64.h	2011-05-04 18:35:31.000000000 -0400
 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom
  }
  
@@ -6932,7 +7151,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
 +
 +/**
 + * atomic_dec_unchecked - decrement atomic variable
-+ * @v: pointer of type atomic_t
++ * @v: pointer of type atomic_unchecked_t
 + *
 + * Atomically decrements @v by 1.
 + */
@@ -6960,7 +7179,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -138,7 +265,16 @@ static inline int atomic_inc_and_test(at
+@@ -138,7 +265,35 @@ static inline int atomic_inc_and_test(at
  {
  	unsigned char c;
  
@@ -6975,10 +7194,29 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
 +#endif
 +
 +		     "sete %1\n"
++		     : "=m" (v->counter), "=qm" (c)
++		     : "m" (v->counter) : "memory");
++	return c != 0;
++}
++
++/**
++ * atomic_inc_and_test_unchecked - increment and test
++ * @v: pointer of type atomic_unchecked_t
++ *
++ * Atomically increments @v by 1
++ * and returns true if the result is zero, or false for all
++ * other cases.
++ */
++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
++{
++	unsigned char c;
++
++	asm volatile(LOCK_PREFIX "incl %0\n"
++		     "sete %1\n"
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -157,7 +293,16 @@ static inline int atomic_add_negative(in
+@@ -157,7 +312,16 @@ static inline int atomic_add_negative(in
  {
  	unsigned char c;
  
@@ -6996,7 +7234,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "ir" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -173,7 +318,31 @@ static inline int atomic_add_negative(in
+@@ -173,7 +337,31 @@ static inline int atomic_add_negative(in
  static inline int atomic_add_return(int i, atomic_t *v)
  {
  	int __i = i;
@@ -7029,7 +7267,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "+r" (i), "+m" (v->counter)
  		     : : "memory");
  	return i + __i;
-@@ -185,6 +354,10 @@ static inline int atomic_sub_return(int 
+@@ -185,6 +373,10 @@ static inline int atomic_sub_return(int 
  }
  
  #define atomic_inc_return(v)  (atomic_add_return(1, v))
@@ -7040,7 +7278,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  #define atomic_dec_return(v)  (atomic_sub_return(1, v))
  
  /* The 64-bit atomic type */
-@@ -204,6 +377,18 @@ static inline long atomic64_read(const a
+@@ -204,6 +396,18 @@ static inline long atomic64_read(const a
  }
  
  /**
@@ -7059,7 +7297,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
   * atomic64_set - set atomic64 variable
   * @v: pointer to type atomic64_t
   * @i: required value
-@@ -216,6 +401,18 @@ static inline void atomic64_set(atomic64
+@@ -216,6 +420,18 @@ static inline void atomic64_set(atomic64
  }
  
  /**
@@ -7078,7 +7316,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
   * atomic64_add - add integer to atomic64 variable
   * @i: integer value to add
   * @v: pointer to type atomic64_t
-@@ -224,6 +421,28 @@ static inline void atomic64_set(atomic64
+@@ -224,6 +440,28 @@ static inline void atomic64_set(atomic64
   */
  static inline void atomic64_add(long i, atomic64_t *v)
  {
@@ -7107,7 +7345,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  	asm volatile(LOCK_PREFIX "addq %1,%0"
  		     : "=m" (v->counter)
  		     : "er" (i), "m" (v->counter));
-@@ -238,7 +457,15 @@ static inline void atomic64_add(long i, 
+@@ -238,7 +476,15 @@ static inline void atomic64_add(long i, 
   */
  static inline void atomic64_sub(long i, atomic64_t *v)
  {
@@ -7124,7 +7362,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter)
  		     : "er" (i), "m" (v->counter));
  }
-@@ -256,7 +483,16 @@ static inline int atomic64_sub_and_test(
+@@ -256,7 +502,16 @@ static inline int atomic64_sub_and_test(
  {
  	unsigned char c;
  
@@ -7142,7 +7380,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "er" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -270,6 +506,27 @@ static inline int atomic64_sub_and_test(
+@@ -270,6 +525,27 @@ static inline int atomic64_sub_and_test(
   */
  static inline void atomic64_inc(atomic64_t *v)
  {
@@ -7170,7 +7408,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  	asm volatile(LOCK_PREFIX "incq %0"
  		     : "=m" (v->counter)
  		     : "m" (v->counter));
-@@ -283,7 +540,28 @@ static inline void atomic64_inc(atomic64
+@@ -283,7 +559,28 @@ static inline void atomic64_inc(atomic64
   */
  static inline void atomic64_dec(atomic64_t *v)
  {
@@ -7200,7 +7438,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter)
  		     : "m" (v->counter));
  }
-@@ -300,7 +578,16 @@ static inline int atomic64_dec_and_test(
+@@ -300,7 +597,16 @@ static inline int atomic64_dec_and_test(
  {
  	unsigned char c;
  
@@ -7218,7 +7456,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -318,7 +605,16 @@ static inline int atomic64_inc_and_test(
+@@ -318,7 +624,16 @@ static inline int atomic64_inc_and_test(
  {
  	unsigned char c;
  
@@ -7236,7 +7474,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -337,7 +633,16 @@ static inline int atomic64_add_negative(
+@@ -337,7 +652,16 @@ static inline int atomic64_add_negative(
  {
  	unsigned char c;
  
@@ -7254,7 +7492,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "=m" (v->counter), "=qm" (c)
  		     : "er" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -353,7 +658,31 @@ static inline int atomic64_add_negative(
+@@ -353,7 +677,31 @@ static inline int atomic64_add_negative(
  static inline long atomic64_add_return(long i, atomic64_t *v)
  {
  	long __i = i;
@@ -7287,7 +7525,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  		     : "+r" (i), "+m" (v->counter)
  		     : : "memory");
  	return i + __i;
-@@ -365,6 +694,10 @@ static inline long atomic64_sub_return(l
+@@ -365,6 +713,10 @@ static inline long atomic64_sub_return(l
  }
  
  #define atomic64_inc_return(v)  (atomic64_add_return(1, (v)))
@@ -7298,7 +7536,49 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  #define atomic64_dec_return(v)  (atomic64_sub_return(1, (v)))
  
  static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
-@@ -398,17 +731,30 @@ static inline long atomic_xchg(atomic_t 
+@@ -372,21 +724,41 @@ static inline long atomic64_cmpxchg(atom
+ 	return cmpxchg(&v->counter, old, new);
+ }
+ 
++static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
++{
++	return cmpxchg(&v->counter, old, new);
++}
++
+ static inline long atomic64_xchg(atomic64_t *v, long new)
+ {
+ 	return xchg(&v->counter, new);
+ }
+ 
++static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
++{
++	return xchg(&v->counter, new);
++}
++
+ static inline long atomic_cmpxchg(atomic_t *v, int old, int new)
+ {
+ 	return cmpxchg(&v->counter, old, new);
+ }
+ 
++static inline long atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
++{
++	return cmpxchg(&v->counter, old, new);
++}
++
+ static inline long atomic_xchg(atomic_t *v, int new)
+ {
+ 	return xchg(&v->counter, new);
+ }
+ 
++static inline long atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
++{
++	return xchg(&v->counter, new);
++}
++
+ /**
+  * atomic_add_unless - add unless the number is a given value
+  * @v: pointer of type atomic_t
+@@ -398,17 +770,30 @@ static inline long atomic_xchg(atomic_t 
   */
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -7333,7 +7613,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -424,17 +770,30 @@ static inline int atomic_add_unless(atom
+@@ -424,17 +809,30 @@ static inline int atomic_add_unless(atom
   */
  static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -7368,9 +7648,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/atomic_64.h linux-2.6.32.39/arch
  }
  
  /**
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/bitops.h linux-2.6.32.39/arch/x86/include/asm/bitops.h
---- linux-2.6.32.39/arch/x86/include/asm/bitops.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/bitops.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/bitops.h linux-2.6.32.40/arch/x86/include/asm/bitops.h
+--- linux-2.6.32.40/arch/x86/include/asm/bitops.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/bitops.h	2011-04-17 15:56:46.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -7380,9 +7660,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/bitops.h linux-2.6.32.39/arch/x8
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/boot.h linux-2.6.32.39/arch/x86/include/asm/boot.h
---- linux-2.6.32.39/arch/x86/include/asm/boot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/boot.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/boot.h linux-2.6.32.40/arch/x86/include/asm/boot.h
+--- linux-2.6.32.40/arch/x86/include/asm/boot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/boot.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -7400,9 +7680,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/boot.h linux-2.6.32.39/arch/x86/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/cacheflush.h linux-2.6.32.39/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.39/arch/x86/include/asm/cacheflush.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/cacheflush.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/cacheflush.h linux-2.6.32.40/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.32.40/arch/x86/include/asm/cacheflush.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/cacheflush.h	2011-04-17 15:56:46.000000000 -0400
 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
  static inline unsigned long get_page_memtype(struct page *pg)
  {
@@ -7421,20 +7701,24 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/cacheflush.h linux-2.6.32.39/arc
  		ClearPageUncached(pg);
  		ClearPageWC(pg);
  		break;
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/cache.h linux-2.6.32.39/arch/x86/include/asm/cache.h
---- linux-2.6.32.39/arch/x86/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/cache.h	2011-04-17 15:56:46.000000000 -0400
-@@ -8,6 +8,7 @@
- #define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/cache.h linux-2.6.32.40/arch/x86/include/asm/cache.h
+--- linux-2.6.32.40/arch/x86/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/cache.h	2011-05-04 17:56:20.000000000 -0400
+@@ -5,9 +5,10 @@
+ 
+ /* L1 cache line size */
+ #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
+-#define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
++#define L1_CACHE_BYTES	(_AC(1,U) << L1_CACHE_SHIFT)
  
  #define __read_mostly __attribute__((__section__(".data.read_mostly")))
 +#define __read_only __attribute__((__section__(".data.read_only")))
  
  #ifdef CONFIG_X86_VSMP
  /* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/checksum_32.h linux-2.6.32.39/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.39/arch/x86/include/asm/checksum_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/checksum_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/checksum_32.h linux-2.6.32.40/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.32.40/arch/x86/include/asm/checksum_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/checksum_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
@@ -7468,9 +7752,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/checksum_32.h linux-2.6.32.39/ar
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc_defs.h linux-2.6.32.39/arch/x86/include/asm/desc_defs.h
---- linux-2.6.32.39/arch/x86/include/asm/desc_defs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/desc_defs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/desc_defs.h linux-2.6.32.40/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.32.40/arch/x86/include/asm/desc_defs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/desc_defs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -31,6 +31,12 @@ struct desc_struct {
  			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
  			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -7484,9 +7768,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc_defs.h linux-2.6.32.39/arch
  	};
  } __attribute__((packed));
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc.h linux-2.6.32.39/arch/x86/include/asm/desc.h
---- linux-2.6.32.39/arch/x86/include/asm/desc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/desc.h	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/desc.h linux-2.6.32.40/arch/x86/include/asm/desc.h
+--- linux-2.6.32.40/arch/x86/include/asm/desc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/desc.h	2011-04-23 12:56:10.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7667,9 +7951,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/desc.h linux-2.6.32.39/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/device.h linux-2.6.32.39/arch/x86/include/asm/device.h
---- linux-2.6.32.39/arch/x86/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/device.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/device.h linux-2.6.32.40/arch/x86/include/asm/device.h
+--- linux-2.6.32.40/arch/x86/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/device.h	2011-04-17 15:56:46.000000000 -0400
 @@ -6,7 +6,7 @@ struct dev_archdata {
  	void	*acpi_handle;
  #endif
@@ -7679,9 +7963,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/device.h linux-2.6.32.39/arch/x8
  #endif
  #ifdef CONFIG_DMAR
  	void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/dma-mapping.h linux-2.6.32.40/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.32.40/arch/x86/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
 @@ -25,9 +25,9 @@ extern int iommu_merge;
  extern struct device x86_dma_fallback_dev;
  extern int panic_on_overflow;
@@ -7721,9 +8005,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/dma-mapping.h linux-2.6.32.39/ar
  
  	WARN_ON(irqs_disabled());       /* for portability */
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/e820.h linux-2.6.32.39/arch/x86/include/asm/e820.h
---- linux-2.6.32.39/arch/x86/include/asm/e820.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/e820.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/e820.h linux-2.6.32.40/arch/x86/include/asm/e820.h
+--- linux-2.6.32.40/arch/x86/include/asm/e820.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/e820.h	2011-04-17 15:56:46.000000000 -0400
 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me
  #define ISA_END_ADDRESS		0x100000
  #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -7733,9 +8017,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/e820.h linux-2.6.32.39/arch/x86/
  #define BIOS_END		0x00100000
  
  #ifdef __KERNEL__
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/elf.h linux-2.6.32.39/arch/x86/include/asm/elf.h
---- linux-2.6.32.39/arch/x86/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/elf.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/elf.h linux-2.6.32.40/arch/x86/include/asm/elf.h
+--- linux-2.6.32.40/arch/x86/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/elf.h	2011-04-17 15:56:46.000000000 -0400
 @@ -257,7 +257,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -7789,9 +8073,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/elf.h linux-2.6.32.39/arch/x86/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/futex.h linux-2.6.32.39/arch/x86/include/asm/futex.h
---- linux-2.6.32.39/arch/x86/include/asm/futex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/futex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/futex.h linux-2.6.32.40/arch/x86/include/asm/futex.h
+--- linux-2.6.32.40/arch/x86/include/asm/futex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/futex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -7867,9 +8151,23 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/futex.h linux-2.6.32.39/arch/x86
  		     : "i" (-EFAULT), "r" (newval), "0" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/i387.h linux-2.6.32.39/arch/x86/include/asm/i387.h
---- linux-2.6.32.39/arch/x86/include/asm/i387.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/i387.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/hw_irq.h linux-2.6.32.40/arch/x86/include/asm/hw_irq.h
+--- linux-2.6.32.40/arch/x86/include/asm/hw_irq.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/hw_irq.h	2011-05-04 17:56:28.000000000 -0400
+@@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void);
+ extern void enable_IO_APIC(void);
+ 
+ /* Statistics */
+-extern atomic_t irq_err_count;
+-extern atomic_t irq_mis_count;
++extern atomic_unchecked_t irq_err_count;
++extern atomic_unchecked_t irq_mis_count;
+ 
+ /* EISA */
+ extern void eisa_set_level_irq(unsigned int irq);
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/i387.h linux-2.6.32.40/arch/x86/include/asm/i387.h
+--- linux-2.6.32.40/arch/x86/include/asm/i387.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/i387.h	2011-04-17 15:56:46.000000000 -0400
 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -7919,9 +8217,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/i387.h linux-2.6.32.39/arch/x86/
  	else
  		clts();
  }
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_32.h linux-2.6.32.39/arch/x86/include/asm/io_32.h
---- linux-2.6.32.39/arch/x86/include/asm/io_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/io_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/io_32.h linux-2.6.32.40/arch/x86/include/asm/io_32.h
+--- linux-2.6.32.40/arch/x86/include/asm/io_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/io_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/string.h>
@@ -7948,9 +8246,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_32.h linux-2.6.32.39/arch/x86
  #include <asm-generic/iomap.h>
  
  #include <linux/vmalloc.h>
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_64.h linux-2.6.32.39/arch/x86/include/asm/io_64.h
---- linux-2.6.32.39/arch/x86/include/asm/io_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/io_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/io_64.h linux-2.6.32.40/arch/x86/include/asm/io_64.h
+--- linux-2.6.32.40/arch/x86/include/asm/io_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/io_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -140,6 +140,17 @@ __OUTS(l)
  
  #include <linux/vmalloc.h>
@@ -7969,9 +8267,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/io_64.h linux-2.6.32.39/arch/x86
  #include <asm-generic/iomap.h>
  
  void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/iommu.h linux-2.6.32.39/arch/x86/include/asm/iommu.h
---- linux-2.6.32.39/arch/x86/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/iommu.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/iommu.h linux-2.6.32.40/arch/x86/include/asm/iommu.h
+--- linux-2.6.32.40/arch/x86/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/iommu.h	2011-04-17 15:56:46.000000000 -0400
 @@ -3,7 +3,7 @@
  
  extern void pci_iommu_shutdown(void);
@@ -7981,9 +8279,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/iommu.h linux-2.6.32.39/arch/x86
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int iommu_pass_through;
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/irqflags.h linux-2.6.32.39/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.39/arch/x86/include/asm/irqflags.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/irqflags.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/irqflags.h linux-2.6.32.40/arch/x86/include/asm/irqflags.h
+--- linux-2.6.32.40/arch/x86/include/asm/irqflags.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/irqflags.h	2011-04-17 15:56:46.000000000 -0400
 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
  	sti;					\
  	sysexit
@@ -7996,9 +8294,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/irqflags.h linux-2.6.32.39/arch/
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/kprobes.h linux-2.6.32.39/arch/x86/include/asm/kprobes.h
---- linux-2.6.32.39/arch/x86/include/asm/kprobes.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/kprobes.h	2011-04-23 12:56:12.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/kprobes.h linux-2.6.32.40/arch/x86/include/asm/kprobes.h
+--- linux-2.6.32.40/arch/x86/include/asm/kprobes.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/kprobes.h	2011-04-23 12:56:12.000000000 -0400
 @@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t;
  #define BREAKPOINT_INSTRUCTION	0xcc
  #define RELATIVEJUMP_INSTRUCTION 0xe9
@@ -8015,10 +8313,10 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/kprobes.h linux-2.6.32.39/arch/x
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/kvm_host.h linux-2.6.32.39/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.39/arch/x86/include/asm/kvm_host.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/kvm_host.h	2011-04-17 15:56:46.000000000 -0400
-@@ -533,7 +533,7 @@ struct kvm_x86_ops {
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/kvm_host.h linux-2.6.32.40/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.32.40/arch/x86/include/asm/kvm_host.h	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/kvm_host.h	2011-05-10 22:12:26.000000000 -0400
+@@ -536,7 +536,7 @@ struct kvm_x86_ops {
  	const struct trace_print_flags *exit_reasons_str;
  };
  
@@ -8027,9 +8325,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/kvm_host.h linux-2.6.32.39/arch/
  
  int kvm_mmu_module_init(void);
  void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/local.h linux-2.6.32.39/arch/x86/include/asm/local.h
---- linux-2.6.32.39/arch/x86/include/asm/local.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/local.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/local.h linux-2.6.32.40/arch/x86/include/asm/local.h
+--- linux-2.6.32.40/arch/x86/include/asm/local.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/local.h	2011-04-17 15:56:46.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -8182,9 +8480,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/local.h linux-2.6.32.39/arch/x86
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/microcode.h linux-2.6.32.39/arch/x86/include/asm/microcode.h
---- linux-2.6.32.39/arch/x86/include/asm/microcode.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/microcode.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/microcode.h linux-2.6.32.40/arch/x86/include/asm/microcode.h
+--- linux-2.6.32.40/arch/x86/include/asm/microcode.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/microcode.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,13 +12,13 @@ struct device;
  enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
  
@@ -8225,9 +8523,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/microcode.h linux-2.6.32.39/arch
  {
  	return NULL;
  }
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/mman.h linux-2.6.32.39/arch/x86/include/asm/mman.h
---- linux-2.6.32.39/arch/x86/include/asm/mman.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/mman.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/mman.h linux-2.6.32.40/arch/x86/include/asm/mman.h
+--- linux-2.6.32.40/arch/x86/include/asm/mman.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/mman.h	2011-04-17 15:56:46.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -8243,9 +8541,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/mman.h linux-2.6.32.39/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu_context.h linux-2.6.32.39/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.39/arch/x86/include/asm/mmu_context.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/mmu_context.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/mmu_context.h linux-2.6.32.40/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.32.40/arch/x86/include/asm/mmu_context.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/mmu_context.h	2011-04-17 15:56:46.000000000 -0400
 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -8369,9 +8667,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu_context.h linux-2.6.32.39/ar
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu.h linux-2.6.32.39/arch/x86/include/asm/mmu.h
---- linux-2.6.32.39/arch/x86/include/asm/mmu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/mmu.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/mmu.h linux-2.6.32.40/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.40/arch/x86/include/asm/mmu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/mmu.h	2011-04-17 15:56:46.000000000 -0400
 @@ -9,10 +9,23 @@
   * we put the segment information here.
   */
@@ -8398,9 +8696,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/mmu.h linux-2.6.32.39/arch/x86/i
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/module.h linux-2.6.32.39/arch/x86/include/asm/module.h
---- linux-2.6.32.39/arch/x86/include/asm/module.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/module.h	2011-04-23 13:18:57.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/module.h linux-2.6.32.40/arch/x86/include/asm/module.h
+--- linux-2.6.32.40/arch/x86/include/asm/module.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/module.h	2011-04-23 13:18:57.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -8453,9 +8751,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/module.h linux-2.6.32.39/arch/x8
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/page_64_types.h linux-2.6.32.39/arch/x86/include/asm/page_64_types.h
---- linux-2.6.32.39/arch/x86/include/asm/page_64_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/page_64_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/page_64_types.h linux-2.6.32.40/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.32.40/arch/x86/include/asm/page_64_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/page_64_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -8465,9 +8763,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/page_64_types.h linux-2.6.32.39/
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt.h linux-2.6.32.39/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.39/arch/x86/include/asm/paravirt.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/paravirt.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/paravirt.h linux-2.6.32.40/arch/x86/include/asm/paravirt.h
+--- linux-2.6.32.40/arch/x86/include/asm/paravirt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/paravirt.h	2011-04-17 15:56:46.000000000 -0400
 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
  	pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
@@ -8521,9 +8819,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt.h linux-2.6.32.39/arch/
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/paravirt_types.h linux-2.6.32.40/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.32.40/arch/x86/include/asm/paravirt_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/paravirt_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -316,6 +316,12 @@ struct pv_mmu_ops {
  	   an mfn.  We can tell which is which from the index. */
  	void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -8537,9 +8835,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/paravirt_types.h linux-2.6.32.39
  };
  
  struct raw_spinlock;
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pci_x86.h linux-2.6.32.39/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.39/arch/x86/include/asm/pci_x86.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pci_x86.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pci_x86.h linux-2.6.32.40/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.32.40/arch/x86/include/asm/pci_x86.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pci_x86.h	2011-04-17 15:56:46.000000000 -0400
 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 
  extern void (*pcibios_disable_irq)(struct pci_dev *dev);
  
@@ -8562,9 +8860,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pci_x86.h linux-2.6.32.39/arch/x
  extern bool port_cf9_safe;
  
  /* arch_initcall level */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgalloc.h linux-2.6.32.39/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.39/arch/x86/include/asm/pgalloc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgalloc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgalloc.h linux-2.6.32.40/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgalloc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgalloc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
  				       pmd_t *pmd, pte_t *pte)
  {
@@ -8579,9 +8877,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgalloc.h linux-2.6.32.39/arch/x
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.40/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable-2level.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable-2level.h	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8592,9 +8890,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.39
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable_32.h linux-2.6.32.40/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -26,9 +26,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -8638,9 +8936,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32.h linux-2.6.32.39/arc
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.40/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable_32_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable_32_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8670,9 +8968,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
  #define MODULES_VADDR	VMALLOC_START
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.40/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable-3level.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable-3level.h	2011-04-17 15:56:46.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8690,9 +8988,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.39
  }
  
  /*
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable_64.h linux-2.6.32.40/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8729,9 +9027,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64.h linux-2.6.32.39/arc
  }
  
  static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.40/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable_64_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable_64_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -8743,9 +9041,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
 +#define ktva_ktla(addr)		(addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable.h linux-2.6.32.39/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable.h linux-2.6.32.40/arch/x86/include/asm/pgtable.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable.h	2011-04-17 15:56:46.000000000 -0400
 @@ -74,12 +74,51 @@ extern struct list_head pgd_list;
  
  #define arch_end_context_switch(prev)	do {} while(0)
@@ -8915,9 +9213,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable.h linux-2.6.32.39/arch/x
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/pgtable_types.h linux-2.6.32.40/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.32.40/arch/x86/include/asm/pgtable_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/pgtable_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -16,12 +16,11 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -9038,9 +9336,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/pgtable_types.h linux-2.6.32.39/
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32.39/arch/x86/include/asm/processor.h
---- linux-2.6.32.39/arch/x86/include/asm/processor.h	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/processor.h	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/processor.h linux-2.6.32.40/arch/x86/include/asm/processor.h
+--- linux-2.6.32.40/arch/x86/include/asm/processor.h	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/processor.h	2011-05-11 18:25:15.000000000 -0400
 @@ -272,7 +272,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -9050,7 +9348,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32.39/arch
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -888,8 +888,15 @@ static inline void spin_lock_prefetch(co
+@@ -888,11 +888,18 @@ static inline void spin_lock_prefetch(co
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -9066,7 +9364,11 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32.39/arch
 +#define STACK_TOP_MAX		TASK_SIZE
  
  #define INIT_THREAD  {							  \
- 	.sp0			= sizeof(init_stack) + (long)&init_stack, \
+-	.sp0			= sizeof(init_stack) + (long)&init_stack, \
++	.sp0			= sizeof(init_stack) + (long)&init_stack - 8, \
+ 	.vm86_info		= NULL,					  \
+ 	.sysenter_cs		= __KERNEL_CS,				  \
+ 	.io_bitmap_ptr		= NULL,					  \
 @@ -906,7 +913,7 @@ static inline void spin_lock_prefetch(co
   */
  #define INIT_TSS  {							  \
@@ -9114,6 +9416,20 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32.39/arch
  
  #define TASK_SIZE		(test_thread_flag(TIF_IA32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
+@@ -963,11 +966,11 @@ extern unsigned long thread_saved_pc(str
+ #define STACK_TOP_MAX		TASK_SIZE_MAX
+ 
+ #define INIT_THREAD  { \
+-	.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
++	.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
+ }
+ 
+ #define INIT_TSS  { \
+-	.x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
++	.x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
+ }
+ 
+ /*
 @@ -989,6 +992,10 @@ extern void start_thread(struct pt_regs 
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
@@ -9125,9 +9441,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/processor.h linux-2.6.32.39/arch
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/ptrace.h linux-2.6.32.39/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.39/arch/x86/include/asm/ptrace.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/ptrace.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/ptrace.h linux-2.6.32.40/arch/x86/include/asm/ptrace.h
+--- linux-2.6.32.40/arch/x86/include/asm/ptrace.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/ptrace.h	2011-04-17 15:56:46.000000000 -0400
 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_
  }
  
@@ -9164,9 +9480,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/ptrace.h linux-2.6.32.39/arch/x8
  #endif
  }
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/reboot.h linux-2.6.32.39/arch/x86/include/asm/reboot.h
---- linux-2.6.32.39/arch/x86/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/reboot.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/reboot.h linux-2.6.32.40/arch/x86/include/asm/reboot.h
+--- linux-2.6.32.40/arch/x86/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/reboot.h	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
  
  void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -9176,9 +9492,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/reboot.h linux-2.6.32.39/arch/x8
  
  typedef void (*nmi_shootdown_cb)(int, struct die_args*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/rwsem.h linux-2.6.32.39/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.39/arch/x86/include/asm/rwsem.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/rwsem.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/rwsem.h linux-2.6.32.40/arch/x86/include/asm/rwsem.h
+--- linux-2.6.32.40/arch/x86/include/asm/rwsem.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/rwsem.h	2011-04-17 15:56:46.000000000 -0400
 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
@@ -9303,9 +9619,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/rwsem.h linux-2.6.32.39/arch/x86
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/segment.h linux-2.6.32.39/arch/x86/include/asm/segment.h
---- linux-2.6.32.39/arch/x86/include/asm/segment.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/segment.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/segment.h linux-2.6.32.40/arch/x86/include/asm/segment.h
+--- linux-2.6.32.40/arch/x86/include/asm/segment.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/segment.h	2011-04-17 15:56:46.000000000 -0400
 @@ -62,8 +62,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -9374,9 +9690,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/segment.h linux-2.6.32.39/arch/x
  #define __KERNEL_DS	(GDT_ENTRY_KERNEL_DS * 8)
  #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
  #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/smp.h linux-2.6.32.39/arch/x86/include/asm/smp.h
---- linux-2.6.32.39/arch/x86/include/asm/smp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/smp.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/smp.h linux-2.6.32.40/arch/x86/include/asm/smp.h
+--- linux-2.6.32.40/arch/x86/include/asm/smp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/smp.h	2011-04-17 15:56:46.000000000 -0400
 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
  DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
  DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -9403,9 +9719,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/smp.h linux-2.6.32.39/arch/x86/i
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/spinlock.h linux-2.6.32.39/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.39/arch/x86/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/spinlock.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/spinlock.h linux-2.6.32.40/arch/x86/include/asm/spinlock.h
+--- linux-2.6.32.40/arch/x86/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/spinlock.h	2011-04-17 15:56:46.000000000 -0400
 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
  static inline void __raw_read_lock(raw_rwlock_t *rw)
  {
@@ -9468,9 +9784,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/spinlock.h linux-2.6.32.39/arch/
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/stackprotector.h linux-2.6.32.39/arch/x86/include/asm/stackprotector.h
---- linux-2.6.32.39/arch/x86/include/asm/stackprotector.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/stackprotector.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/stackprotector.h linux-2.6.32.40/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.32.40/arch/x86/include/asm/stackprotector.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/stackprotector.h	2011-04-17 15:56:46.000000000 -0400
 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
  
  static inline void load_stack_canary_segment(void)
@@ -9480,9 +9796,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/stackprotector.h linux-2.6.32.39
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/system.h linux-2.6.32.39/arch/x86/include/asm/system.h
---- linux-2.6.32.39/arch/x86/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/system.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/system.h linux-2.6.32.40/arch/x86/include/asm/system.h
+--- linux-2.6.32.40/arch/x86/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/system.h	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ do {									\
  	     "thread_return:\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
@@ -9519,9 +9835,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/system.h linux-2.6.32.39/arch/x8
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/thread_info.h linux-2.6.32.39/arch/x86/include/asm/thread_info.h
---- linux-2.6.32.39/arch/x86/include/asm/thread_info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/thread_info.h	2011-04-23 13:24:42.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/thread_info.h linux-2.6.32.40/arch/x86/include/asm/thread_info.h
+--- linux-2.6.32.40/arch/x86/include/asm/thread_info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/thread_info.h	2011-05-04 17:56:20.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -9563,7 +9879,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/thread_info.h linux-2.6.32.39/ar
  }
  
 -#define init_thread_info	(init_thread_union.thread_info)
-+#define init_thread_info	(init_task.tinfo)
++#define init_thread_info	(init_thread_union.stack)
  #define init_stack		(init_thread_union.stack)
  
  #else /* !__ASSEMBLY__ */
@@ -9666,9 +9982,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/thread_info.h linux-2.6.32.39/ar
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/uaccess_32.h linux-2.6.32.40/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.32.40/arch/x86/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9798,9 +10114,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_32.h linux-2.6.32.39/arc
  long __must_check strncpy_from_user(char *dst, const char __user *src,
  				    long count);
  long __must_check __strncpy_from_user(char *dst,
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/uaccess_64.h linux-2.6.32.40/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.32.40/arch/x86/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/uaccess_64.h	2011-05-04 17:56:20.000000000 -0400
 @@ -9,6 +9,9 @@
  #include <linux/prefetch.h>
  #include <linux/lockdep.h>
@@ -9811,7 +10127,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  
  /*
   * Copy To/From Userspace
-@@ -19,113 +22,179 @@ __must_check unsigned long
+@@ -19,113 +22,199 @@ __must_check unsigned long
  copy_user_generic(void *to, const void *from, unsigned len);
  
  __must_check unsigned long
@@ -9842,8 +10158,12 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
 +
 +	if (!__builtin_constant_p(size)) {
 +		check_object_size(dst, size, false);
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +			src += PAX_USER_SHADOW_BASE;
++#endif
++
 +		return copy_user_generic(dst, (__force const void *)src, size);
 +	}
  	switch (size) {
@@ -9887,8 +10207,12 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  		return ret;
  	default:
 -		return copy_user_generic(dst, (__force void *)src, size);
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +			src += PAX_USER_SHADOW_BASE;
++#endif
++
 +		return copy_user_generic(dst, (__force const void *)src, size);
  	}
  }
@@ -9913,8 +10237,12 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
 +
 +	if (!__builtin_constant_p(size)) {
 +		check_object_size(src, size, true);
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +			dst += PAX_USER_SHADOW_BASE;
++#endif
++
  		return copy_user_generic((__force void *)dst, src, size);
 +	}
  	switch (size) {
@@ -9957,8 +10285,12 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  			       ret, "q", "", "er", 8);
  		return ret;
  	default:
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +			dst += PAX_USER_SHADOW_BASE;
++#endif
++
  		return copy_user_generic((__force void *)dst, src, size);
  	}
  }
@@ -10008,10 +10340,14 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
 +#endif
 +
 +	if (!__builtin_constant_p(size)) {
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +			src += PAX_USER_SHADOW_BASE;
 +		if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +			dst += PAX_USER_SHADOW_BASE;
++#endif
++
  		return copy_user_generic((__force void *)dst,
 -					 (__force void *)src, size);
 +					 (__force const void *)src, size);
@@ -10024,7 +10360,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  			       ret, "b", "b", "=q", 1);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u8 __user *)dst,
-@@ -134,7 +203,7 @@ int __copy_in_user(void __user *dst, con
+@@ -134,7 +223,7 @@ int __copy_in_user(void __user *dst, con
  	}
  	case 2: {
  		u16 tmp;
@@ -10033,7 +10369,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  			       ret, "w", "w", "=r", 2);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u16 __user *)dst,
-@@ -144,7 +213,7 @@ int __copy_in_user(void __user *dst, con
+@@ -144,7 +233,7 @@ int __copy_in_user(void __user *dst, con
  
  	case 4: {
  		u32 tmp;
@@ -10042,7 +10378,7 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  			       ret, "l", "k", "=r", 4);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u32 __user *)dst,
-@@ -153,7 +222,7 @@ int __copy_in_user(void __user *dst, con
+@@ -153,7 +242,7 @@ int __copy_in_user(void __user *dst, con
  	}
  	case 8: {
  		u64 tmp;
@@ -10051,21 +10387,25 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  			       ret, "q", "", "=r", 8);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u64 __user *)dst,
-@@ -161,8 +230,12 @@ int __copy_in_user(void __user *dst, con
+@@ -161,8 +250,16 @@ int __copy_in_user(void __user *dst, con
  		return ret;
  	}
  	default:
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +			src += PAX_USER_SHADOW_BASE;
 +		if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +			dst += PAX_USER_SHADOW_BASE;
++#endif
++
  		return copy_user_generic((__force void *)dst,
 -					 (__force void *)src, size);
 +					 (__force const void *)src, size);
  	}
  }
  
-@@ -176,33 +249,71 @@ __must_check long strlen_user(const char
+@@ -176,33 +273,73 @@ __must_check long strlen_user(const char
  __must_check unsigned long clear_user(void __user *mem, unsigned long len);
  __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
  
@@ -10076,18 +10416,19 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
 +{
 +	if ((int)size < 0)
 +		return size;
-+
+ 
+-static __must_check __always_inline int
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if (!__access_ok(VERIFY_READ, src, size))
 +		return size;
-+#endif
 +
 +	if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +		src += PAX_USER_SHADOW_BASE;
++#endif
++
 +	return copy_user_generic(dst, (__force const void *)src, size);
 +}
- 
--static __must_check __always_inline int
++
 +static __must_check __always_inline unsigned long
  __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
  {
@@ -10097,10 +10438,11 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if (!__access_ok(VERIFY_WRITE, dst, size))
 +		return size;
-+#endif
 +
 +	if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +		dst += PAX_USER_SHADOW_BASE;
++#endif
++
  	return copy_user_generic((__force void *)dst, src, size);
  }
  
@@ -10146,9 +10488,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess_64.h linux-2.6.32.39/arc
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess.h linux-2.6.32.39/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.39/arch/x86/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/uaccess.h linux-2.6.32.40/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.40/arch/x86/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
 @@ -8,12 +8,15 @@
  #include <linux/thread_info.h>
  #include <linux/prefetch.h>
@@ -10367,9 +10709,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/uaccess.h linux-2.6.32.39/arch/x
  #ifdef CONFIG_X86_32
  # include "uaccess_32.h"
  #else
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/vgtod.h linux-2.6.32.39/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.39/arch/x86/include/asm/vgtod.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/vgtod.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/vgtod.h linux-2.6.32.40/arch/x86/include/asm/vgtod.h
+--- linux-2.6.32.40/arch/x86/include/asm/vgtod.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/vgtod.h	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -10378,9 +10720,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/vgtod.h linux-2.6.32.39/arch/x86
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/vmi.h linux-2.6.32.39/arch/x86/include/asm/vmi.h
---- linux-2.6.32.39/arch/x86/include/asm/vmi.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/vmi.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/vmi.h linux-2.6.32.40/arch/x86/include/asm/vmi.h
+--- linux-2.6.32.40/arch/x86/include/asm/vmi.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/vmi.h	2011-04-17 15:56:46.000000000 -0400
 @@ -191,6 +191,7 @@ struct vrom_header {
  	u8      reserved[96];   /* Reserved for headers */
  	char    vmi_init[8];    /* VMI_Init jump point */
@@ -10389,9 +10731,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/vmi.h linux-2.6.32.39/arch/x86/i
  } __attribute__((packed));
  
  struct pnp_header {
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/vsyscall.h linux-2.6.32.39/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.39/arch/x86/include/asm/vsyscall.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/vsyscall.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/vsyscall.h linux-2.6.32.40/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.32.40/arch/x86/include/asm/vsyscall.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/vsyscall.h	2011-04-17 15:56:46.000000000 -0400
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -10422,9 +10764,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/vsyscall.h linux-2.6.32.39/arch/
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.32.39/arch/x86/include/asm/xsave.h linux-2.6.32.39/arch/x86/include/asm/xsave.h
---- linux-2.6.32.39/arch/x86/include/asm/xsave.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/include/asm/xsave.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/include/asm/xsave.h linux-2.6.32.40/arch/x86/include/asm/xsave.h
+--- linux-2.6.32.40/arch/x86/include/asm/xsave.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/include/asm/xsave.h	2011-04-17 15:56:46.000000000 -0400
 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
  static inline int xsave_user(struct xsave_struct __user *buf)
  {
@@ -10450,9 +10792,9 @@ diff -urNp linux-2.6.32.39/arch/x86/include/asm/xsave.h linux-2.6.32.39/arch/x86
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.39/arch/x86/Kconfig linux-2.6.32.39/arch/x86/Kconfig
---- linux-2.6.32.39/arch/x86/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/Kconfig linux-2.6.32.40/arch/x86/Kconfig
+--- linux-2.6.32.40/arch/x86/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE
  
  config X86_32_LAZY_GS
@@ -10534,9 +10876,9 @@ diff -urNp linux-2.6.32.39/arch/x86/Kconfig linux-2.6.32.39/arch/x86/Kconfig
  	---help---
  	  Map the 32-bit VDSO to the predictable old-style address too.
  	---help---
-diff -urNp linux-2.6.32.39/arch/x86/Kconfig.cpu linux-2.6.32.39/arch/x86/Kconfig.cpu
---- linux-2.6.32.39/arch/x86/Kconfig.cpu	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/Kconfig.cpu	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/Kconfig.cpu linux-2.6.32.40/arch/x86/Kconfig.cpu
+--- linux-2.6.32.40/arch/x86/Kconfig.cpu	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/Kconfig.cpu	2011-04-17 15:56:46.000000000 -0400
 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -10564,9 +10906,9 @@ diff -urNp linux-2.6.32.39/arch/x86/Kconfig.cpu linux-2.6.32.39/arch/x86/Kconfig
  
  config X86_MINIMUM_CPU_FAMILY
  	int
-diff -urNp linux-2.6.32.39/arch/x86/Kconfig.debug linux-2.6.32.39/arch/x86/Kconfig.debug
---- linux-2.6.32.39/arch/x86/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/Kconfig.debug linux-2.6.32.40/arch/x86/Kconfig.debug
+--- linux-2.6.32.40/arch/x86/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
 @@ -99,7 +99,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
@@ -10576,9 +10918,9 @@ diff -urNp linux-2.6.32.39/arch/x86/Kconfig.debug linux-2.6.32.39/arch/x86/Kconf
  	---help---
  	  Mark the kernel read-only data as write-protected in the pagetables,
  	  in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.40/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.32.40/arch/x86/kernel/acpi/realmode/wakeup.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/acpi/realmode/wakeup.S	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ _start:
  	movl	%eax, %ecx
  	orl	%edx, %ecx
@@ -10588,9 +10930,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.3
  	wrmsr
  1:
  
-diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/acpi/sleep.c linux-2.6.32.40/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.32.40/arch/x86/kernel/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/acpi/sleep.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,11 +11,12 @@
  #include <linux/cpumask.h>
  #include <asm/segment.h>
@@ -10635,9 +10977,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/sleep.c linux-2.6.32.39/arch/x86
  }
  
  
-diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.40/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.32.40/arch/x86/kernel/acpi/wakeup_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/acpi/wakeup_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
  	# and restore the stack ... but you need gdt for this to work
  	movl	saved_context_esp, %esp
@@ -10654,9 +10996,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.39/arch
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-2.6.32.39/arch/x86/kernel/alternative.c linux-2.6.32.39/arch/x86/kernel/alternative.c
---- linux-2.6.32.39/arch/x86/kernel/alternative.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/alternative.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/alternative.c linux-2.6.32.40/arch/x86/kernel/alternative.c
+--- linux-2.6.32.40/arch/x86/kernel/alternative.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/alternative.c	2011-04-17 15:56:46.000000000 -0400
 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
  
  		BUG_ON(p->len > MAX_PATCH_LEN);
@@ -10739,9 +11081,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/alternative.c linux-2.6.32.39/arch/x8
 +		BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
  	return addr;
  }
-diff -urNp linux-2.6.32.39/arch/x86/kernel/amd_iommu.c linux-2.6.32.39/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.39/arch/x86/kernel/amd_iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/amd_iommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/amd_iommu.c linux-2.6.32.40/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.32.40/arch/x86/kernel/amd_iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/amd_iommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
  	}
  }
@@ -10751,9 +11093,21 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/amd_iommu.c linux-2.6.32.39/arch/x86/
  	.alloc_coherent = alloc_coherent,
  	.free_coherent = free_coherent,
  	.map_page = map_page,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/apic/apic.c linux-2.6.32.40/arch/x86/kernel/apic/apic.c
+--- linux-2.6.32.40/arch/x86/kernel/apic/apic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/apic/apic.c	2011-05-04 17:56:28.000000000 -0400
+@@ -1794,7 +1794,7 @@ void smp_error_interrupt(struct pt_regs 
+ 	apic_write(APIC_ESR, 0);
+ 	v1 = apic_read(APIC_ESR);
+ 	ack_APIC_irq();
+-	atomic_inc(&irq_err_count);
++	atomic_inc_unchecked(&irq_err_count);
+ 
+ 	/*
+ 	 * Here is what the APIC error bits mean:
+diff -urNp linux-2.6.32.40/arch/x86/kernel/apic/io_apic.c linux-2.6.32.40/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.32.40/arch/x86/kernel/apic/io_apic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/apic/io_apic.c	2011-05-04 17:56:20.000000000 -0400
 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
  	ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
  				GFP_ATOMIC);
@@ -10790,9 +11144,27 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/apic/io_apic.c linux-2.6.32.39/arch/x
  {
  	spin_unlock(&vector_lock);
  }
-diff -urNp linux-2.6.32.39/arch/x86/kernel/apm_32.c linux-2.6.32.39/arch/x86/kernel/apm_32.c
---- linux-2.6.32.39/arch/x86/kernel/apm_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/apm_32.c	2011-04-23 12:56:10.000000000 -0400
+@@ -2542,7 +2542,7 @@ static void ack_apic_edge(unsigned int i
+ 	ack_APIC_irq();
+ }
+ 
+-atomic_t irq_mis_count;
++atomic_unchecked_t irq_mis_count;
+ 
+ static void ack_apic_level(unsigned int irq)
+ {
+@@ -2626,7 +2626,7 @@ static void ack_apic_level(unsigned int 
+ 
+ 	/* Tail end of version 0x11 I/O APIC bug workaround */
+ 	if (!(v & (1 << (i & 0x1f)))) {
+-		atomic_inc(&irq_mis_count);
++		atomic_inc_unchecked(&irq_mis_count);
+ 		spin_lock(&ioapic_lock);
+ 		__mask_and_edge_IO_APIC_irq(cfg);
+ 		__unmask_and_level_IO_APIC_irq(cfg);
+diff -urNp linux-2.6.32.40/arch/x86/kernel/apm_32.c linux-2.6.32.40/arch/x86/kernel/apm_32.c
+--- linux-2.6.32.40/arch/x86/kernel/apm_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/apm_32.c	2011-04-23 12:56:10.000000000 -0400
 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -10873,9 +11245,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/apm_32.c linux-2.6.32.39/arch/x86/ker
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.40/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.32.40/arch/x86/kernel/asm-offsets_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/asm-offsets_32.c	2011-05-11 18:25:24.000000000 -0400
 @@ -51,7 +51,6 @@ void foo(void)
  	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
  	BLANK();
@@ -10884,7 +11256,15 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.39/arch
  	OFFSET(TI_exec_domain, thread_info, exec_domain);
  	OFFSET(TI_flags, thread_info, flags);
  	OFFSET(TI_status, thread_info, status);
-@@ -115,6 +114,11 @@ void foo(void)
+@@ -99,6 +98,7 @@ void foo(void)
+ 
+ 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
+ 	DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
++	DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
+ 	DEFINE(PTRS_PER_PTE, PTRS_PER_PTE);
+ 	DEFINE(PTRS_PER_PMD, PTRS_PER_PMD);
+ 	DEFINE(PTRS_PER_PGD, PTRS_PER_PGD);
+@@ -115,6 +115,11 @@ void foo(void)
  	OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
  	OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
  	OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
@@ -10896,9 +11276,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.39/arch
  #endif
  
  #ifdef CONFIG_XEN
-diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.40/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.32.40/arch/x86/kernel/asm-offsets_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/asm-offsets_64.c	2011-05-04 17:56:20.000000000 -0400
 @@ -63,6 +63,18 @@ int main(void)
  	OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
  	OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10926,9 +11306,17 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.39/arch
  	DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
  	BLANK();
  	DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/amd.c linux-2.6.32.39/arch/x86/kernel/cpu/amd.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/amd.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/amd.c	2011-04-22 19:16:41.000000000 -0400
+@@ -130,6 +143,7 @@ int main(void)
+ 
+ 	BLANK();
+ 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++	DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
+ #ifdef CONFIG_XEN
+ 	BLANK();
+ 	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/amd.c linux-2.6.32.40/arch/x86/kernel/cpu/amd.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/amd.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/amd.c	2011-05-10 22:12:26.000000000 -0400
 @@ -596,7 +596,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
@@ -10938,9 +11326,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/amd.c linux-2.6.32.39/arch/x86/ke
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/common.c linux-2.6.32.39/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/common.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/common.c linux-2.6.32.40/arch/x86/kernel/cpu/common.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/common.c	2011-05-11 18:25:15.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -11037,7 +11425,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/common.c linux-2.6.32.39/arch/x86
  
  DEFINE_PER_CPU(unsigned long, kernel_stack) =
 -	(unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
-+	(unsigned long)&init_thread_union - 8 + THREAD_SIZE;
++	(unsigned long)&init_thread_union - 16 + THREAD_SIZE;
  EXPORT_PER_CPU_SYMBOL(kernel_stack);
  
  DEFINE_PER_CPU(char *, irq_stack_ptr) =
@@ -11085,9 +11473,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/common.c linux-2.6.32.39/arch/x86
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel.c linux-2.6.32.39/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/intel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/intel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/intel.c linux-2.6.32.40/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/intel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/intel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
  	 * Update the IDT descriptor and reload the IDT so that
  	 * it uses the read-only mapped virtual address.
@@ -11097,9 +11485,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel.c linux-2.6.32.39/arch/x86/
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.40/arch/x86/kernel/cpu/intel_cacheinfo.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
  	return ret;
  }
@@ -11109,9 +11497,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.39
  	.show   = show,
  	.store  = store,
  };
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/Makefile linux-2.6.32.39/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.39/arch/x86/kernel/cpu/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/Makefile linux-2.6.32.40/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.40/arch/x86/kernel/cpu/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
  CFLAGS_REMOVE_common.o = -pg
  endif
@@ -11123,9 +11511,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/Makefile linux-2.6.32.39/arch/x86
  obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
  obj-y			+= vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
  	return ret;
  }
@@ -11135,9 +11523,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.39/
  	.show			= show,
  	.store			= store,
  };
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-04 17:56:20.000000000 -0400
 @@ -43,6 +43,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
@@ -11155,6 +11543,46 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.39/arch
  			print_symbol("{%s}", m->ip);
  		pr_cont("\n");
  	}
+@@ -221,10 +222,10 @@ static void print_mce_tail(void)
+ 
+ #define PANIC_TIMEOUT 5 /* 5 seconds */
+ 
+-static atomic_t mce_paniced;
++static atomic_unchecked_t mce_paniced;
+ 
+ static int fake_panic;
+-static atomic_t mce_fake_paniced;
++static atomic_unchecked_t mce_fake_paniced;
+ 
+ /* Panic in progress. Enable interrupts and wait for final IPI */
+ static void wait_for_panic(void)
+@@ -248,7 +249,7 @@ static void mce_panic(char *msg, struct 
+ 		/*
+ 		 * Make sure only one CPU runs in machine check panic
+ 		 */
+-		if (atomic_inc_return(&mce_paniced) > 1)
++		if (atomic_inc_return_unchecked(&mce_paniced) > 1)
+ 			wait_for_panic();
+ 		barrier();
+ 
+@@ -256,7 +257,7 @@ static void mce_panic(char *msg, struct 
+ 		console_verbose();
+ 	} else {
+ 		/* Don't log too much for fake panic */
+-		if (atomic_inc_return(&mce_fake_paniced) > 1)
++		if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
+ 			return;
+ 	}
+ 	print_mce_head();
+@@ -616,7 +617,7 @@ static int mce_timed_out(u64 *t)
+ 	 * might have been modified by someone else.
+ 	 */
+ 	rmb();
+-	if (atomic_read(&mce_paniced))
++	if (atomic_read_unchecked(&mce_paniced))
+ 		wait_for_panic();
+ 	if (!monarch_timeout)
+ 		goto out;
 @@ -1429,14 +1430,14 @@ void __cpuinit mcheck_init(struct cpuinf
   */
  
@@ -11190,9 +11618,18 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.39/arch
  	open_exclu = 0;
  
  	spin_unlock(&mce_state_lock);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c	2011-04-17 15:56:46.000000000 -0400
+@@ -2082,7 +2083,7 @@ struct dentry *mce_get_debugfs_dir(void)
+ static void mce_reset(void)
+ {
+ 	cpu_missing = 0;
+-	atomic_set(&mce_fake_paniced, 0);
++	atomic_set_unchecked(&mce_fake_paniced, 0);
+ 	atomic_set(&mce_executing, 0);
+ 	atomic_set(&mce_callin, 0);
+ 	atomic_set(&global_nwo, 0);
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/amd.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/amd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/amd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
  	return 0;
  }
@@ -11202,9 +11639,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.39/arch/x
  	.vendor            = X86_VENDOR_AMD,
  	.set               = amd_set_mtrr,
  	.get               = amd_get_mtrr,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/centaur.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/centaur.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/centaur.c	2011-04-17 15:56:46.000000000 -0400
 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 
  	return 0;
  }
@@ -11214,9 +11651,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.39/ar
  	.vendor            = X86_VENDOR_CENTAUR,
  	.set               = centaur_set_mcr,
  	.get               = centaur_get_mcr,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/cyrix.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-04-17 15:56:46.000000000 -0400
 @@ -265,7 +265,7 @@ static void cyrix_set_all(void)
  	post_set();
  }
@@ -11226,9 +11663,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.39/arch
  	.vendor            = X86_VENDOR_CYRIX,
  	.set_all	   = cyrix_set_all,
  	.set               = cyrix_set_arr,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/generic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/generic.c	2011-04-23 12:56:10.000000000 -0400
 @@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
  /*
   * Generic structure...
@@ -11238,9 +11675,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.39/ar
  	.use_intel_if		= 1,
  	.set_all		= generic_set_all,
  	.get			= generic_get_mtrr,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:03:05.000000000 -0400
 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -11259,9 +11696,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.39/arch/
  {
  	if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
  		mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,19 +12,19 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
@@ -11312,9 +11749,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.39/arch/
  
  #define is_cpu(vnd)	(mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
  #define use_intel()	(mtrr_if && mtrr_if->use_intel_if == 1)
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.40/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
  
  /* Interface defining a CPU specific perfctr watchdog */
@@ -11348,9 +11785,40 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.3
  static struct wd_ops intel_arch_wd_ops __read_mostly = {
  	.reserve	= single_msr_reserve,
  	.unreserve	= single_msr_unreserve,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.40/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.32.40/arch/x86/kernel/cpu/perf_event.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/cpu/perf_event.c	2011-05-04 17:56:20.000000000 -0400
+@@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event 
+ 	 * count to the generic event atomically:
+ 	 */
+ again:
+-	prev_raw_count = atomic64_read(&hwc->prev_count);
++	prev_raw_count = atomic64_read_unchecked(&hwc->prev_count);
+ 	rdmsrl(hwc->event_base + idx, new_raw_count);
+ 
+-	if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
++	if (atomic64_cmpxchg_unchecked(&hwc->prev_count, prev_raw_count,
+ 					new_raw_count) != prev_raw_count)
+ 		goto again;
+ 
+@@ -741,7 +741,7 @@ again:
+ 	delta = (new_raw_count << shift) - (prev_raw_count << shift);
+ 	delta >>= shift;
+ 
+-	atomic64_add(delta, &event->count);
++	atomic64_add_unchecked(delta, &event->count);
+ 	atomic64_sub(delta, &hwc->period_left);
+ 
+ 	return new_raw_count;
+@@ -1353,7 +1353,7 @@ x86_perf_event_set_period(struct perf_ev
+ 	 * The hw event starts counting from this event offset,
+ 	 * mark it to be able to extra future deltas:
+ 	 */
+-	atomic64_set(&hwc->prev_count, (u64)-left);
++	atomic64_set_unchecked(&hwc->prev_count, (u64)-left);
+ 
+ 	err = checking_wrmsrl(hwc->event_base + idx,
+ 			     (u64)(-left) & x86_pmu.event_mask);
 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
  			break;
  
@@ -11360,9 +11828,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.39/arch
  	}
  }
  
-diff -urNp linux-2.6.32.39/arch/x86/kernel/crash.c linux-2.6.32.39/arch/x86/kernel/crash.c
---- linux-2.6.32.39/arch/x86/kernel/crash.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/crash.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/crash.c linux-2.6.32.40/arch/x86/kernel/crash.c
+--- linux-2.6.32.40/arch/x86/kernel/crash.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/crash.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
@@ -11372,9 +11840,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/crash.c linux-2.6.32.39/arch/x86/kern
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-2.6.32.39/arch/x86/kernel/doublefault_32.c linux-2.6.32.39/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.39/arch/x86/kernel/doublefault_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/doublefault_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/doublefault_32.c linux-2.6.32.40/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.32.40/arch/x86/kernel/doublefault_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/doublefault_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -11406,9 +11874,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/doublefault_32.c linux-2.6.32.39/arch
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/dumpstack_32.c linux-2.6.32.40/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.32.40/arch/x86/kernel/dumpstack_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/dumpstack_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task
  #endif
  
@@ -11474,9 +11942,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_32.c linux-2.6.32.39/arch/x
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/dumpstack_64.c linux-2.6.32.40/arch/x86/kernel/dumpstack_64.c
+--- linux-2.6.32.40/arch/x86/kernel/dumpstack_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/dumpstack_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task
  	unsigned long *irq_stack_end =
  		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -11527,9 +11995,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack_64.c linux-2.6.32.39/arch/x
  	put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.c linux-2.6.32.39/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.39/arch/x86/kernel/dumpstack.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/dumpstack.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/dumpstack.c linux-2.6.32.40/arch/x86/kernel/dumpstack.c
+--- linux-2.6.32.40/arch/x86/kernel/dumpstack.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/dumpstack.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11646,9 +12114,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.c linux-2.6.32.39/arch/x86/
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.h linux-2.6.32.39/arch/x86/kernel/dumpstack.h
---- linux-2.6.32.39/arch/x86/kernel/dumpstack.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/dumpstack.h	2011-04-23 13:25:26.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/dumpstack.h linux-2.6.32.40/arch/x86/kernel/dumpstack.h
+--- linux-2.6.32.40/arch/x86/kernel/dumpstack.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/dumpstack.h	2011-04-23 13:25:26.000000000 -0400
 @@ -15,7 +15,7 @@
  #endif
  
@@ -11658,9 +12126,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/dumpstack.h linux-2.6.32.39/arch/x86/
  		unsigned long *stack, unsigned long bp,
  		const struct stacktrace_ops *ops, void *data,
  		unsigned long *end, int *graph);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/e820.c linux-2.6.32.39/arch/x86/kernel/e820.c
---- linux-2.6.32.39/arch/x86/kernel/e820.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/e820.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/e820.c linux-2.6.32.40/arch/x86/kernel/e820.c
+--- linux-2.6.32.40/arch/x86/kernel/e820.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/e820.c	2011-04-17 15:56:46.000000000 -0400
 @@ -733,7 +733,7 @@ struct early_res {
  };
  static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -11670,9 +12138,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/e820.c linux-2.6.32.39/arch/x86/kerne
  };
  
  static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_32.c linux-2.6.32.39/arch/x86/kernel/efi_32.c
---- linux-2.6.32.39/arch/x86/kernel/efi_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/efi_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/efi_32.c linux-2.6.32.40/arch/x86/kernel/efi_32.c
+--- linux-2.6.32.40/arch/x86/kernel/efi_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/efi_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -38,70 +38,38 @@
   */
  
@@ -11753,9 +12221,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_32.c linux-2.6.32.39/arch/x86/ker
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/efi_stub_32.S linux-2.6.32.40/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.32.40/arch/x86/kernel/efi_stub_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/efi_stub_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -11854,10 +12322,10 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/efi_stub_32.S linux-2.6.32.39/arch/x8
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/kernel/entry_32.S
---- linux-2.6.32.39/arch/x86/kernel/entry_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/entry_32.S	2011-04-19 17:24:49.000000000 -0400
-@@ -185,13 +185,81 @@
+diff -urNp linux-2.6.32.40/arch/x86/kernel/entry_32.S linux-2.6.32.40/arch/x86/kernel/entry_32.S
+--- linux-2.6.32.40/arch/x86/kernel/entry_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/entry_32.S	2011-05-10 21:27:27.000000000 -0400
+@@ -185,13 +185,139 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
  .macro SET_KERNEL_GS reg
@@ -11876,38 +12344,20 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  #endif	/* CONFIG_X86_32_LAZY_GS */
  
 -.macro SAVE_ALL
-+.macro PAX_EXIT_KERNEL
++.macro pax_enter_kernel
 +#ifdef CONFIG_PAX_KERNEXEC
-+#ifdef CONFIG_PARAVIRT
-+	push %eax; push %ecx
-+#endif
-+	mov %cs, %esi
-+	cmp $__KERNEXEC_KERNEL_CS, %esi
-+	jnz 2f
-+#ifdef CONFIG_PARAVIRT
-+	call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
-+	mov %eax, %esi
-+#else
-+	mov %cr0, %esi
-+#endif
-+	btr $16, %esi
-+	ljmp $__KERNEL_CS, $1f
-+1:
-+#ifdef CONFIG_PARAVIRT
-+	mov %esi, %eax
-+	call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
-+#else
-+	mov %esi, %cr0
-+#endif
-+2:
-+#ifdef CONFIG_PARAVIRT
-+	pop %ecx; pop %eax
++	call pax_enter_kernel
 +#endif
++.endm
++
++.macro pax_exit_kernel
++#ifdef CONFIG_PAX_KERNEXEC
++	call pax_exit_kernel
 +#endif
 +.endm
 +
-+.macro PAX_ENTER_KERNEL
 +#ifdef CONFIG_PAX_KERNEXEC
++ENTRY(pax_enter_kernel)
 +#ifdef CONFIG_PARAVIRT
 +	push %eax; push %ecx
 +	call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
@@ -11933,14 +12383,90 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
 +#ifdef CONFIG_PARAVIRT
 +	pop %ecx; pop %eax
 +#endif
++	ret
++ENDPROC(pax_enter_kernel)
++
++ENTRY(pax_exit_kernel)
++#ifdef CONFIG_PARAVIRT
++	push %eax; push %ecx
++#endif
++	mov %cs, %esi
++	cmp $__KERNEXEC_KERNEL_CS, %esi
++	jnz 2f
++#ifdef CONFIG_PARAVIRT
++	call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
++	mov %eax, %esi
++#else
++	mov %cr0, %esi
++#endif
++	btr $16, %esi
++	ljmp $__KERNEL_CS, $1f
++1:
++#ifdef CONFIG_PARAVIRT
++	mov %esi, %eax
++	call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
++#else
++	mov %esi, %cr0
++#endif
++2:
++#ifdef CONFIG_PARAVIRT
++	pop %ecx; pop %eax
++#endif
++	ret
++ENDPROC(pax_exit_kernel)
++#endif
++
++.macro pax_erase_kstack
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++	call pax_erase_kstack
 +#endif
 +.endm
 +
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++ENTRY(pax_erase_kstack)
++	push %edi
++
++	lea -64(%esp), %edi
++	and $-64, %edi
++	mov $-0xBEEF, %eax
++	std
++1:
++	mov %edi, %ecx
++	and $THREAD_SIZE_asm - 1, %ecx
++	shr $2, %ecx
++	repne scasl
++	jecxz 2f
++
++	and $-64, %edi
++	and $-16, %ecx
++
++	sub $128, %ecx
++	jc 2f
++	mov $16, %ecx
++	repe scasl
++	jne 1b
++	sub $(512 - 64), %edi
++	mov $16, %ecx
++	repe scasl
++	jecxz 2f
++	jne 1b
++2:
++	cld
++	mov %esp, %ecx
++	sub %edi, %ecx
++	shr $2, %ecx
++	rep stosl
++
++	pop %edi
++	ret
++ENDPROC(pax_erase_kstack)
++#endif
++
 +.macro __SAVE_ALL _DS
  	cld
  	PUSH_GS
  	pushl %fs
-@@ -224,7 +292,7 @@
+@@ -224,7 +350,7 @@
  	pushl %ebx
  	CFI_ADJUST_CFA_OFFSET 4
  	CFI_REL_OFFSET ebx, 0
@@ -11949,14 +12475,14 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	movl %edx, %ds
  	movl %edx, %es
  	movl $(__KERNEL_PERCPU), %edx
-@@ -232,6 +300,15 @@
+@@ -232,6 +358,15 @@
  	SET_KERNEL_GS %edx
  .endm
  
 +.macro SAVE_ALL
 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
 +	__SAVE_ALL __KERNEL_DS
-+	PAX_ENTER_KERNEL
++	pax_enter_kernel
 +#else
 +	__SAVE_ALL __USER_DS
 +#endif
@@ -11965,7 +12491,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  .macro RESTORE_INT_REGS
  	popl %ebx
  	CFI_ADJUST_CFA_OFFSET -4
-@@ -352,7 +429,15 @@ check_userspace:
+@@ -352,7 +487,15 @@ check_userspace:
  	movb PT_CS(%esp), %al
  	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
  	cmpl $USER_RPL, %eax
@@ -11981,7 +12507,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  
  ENTRY(resume_userspace)
  	LOCKDEP_SYS_EXIT
-@@ -414,25 +499,36 @@ sysenter_past_esp:
+@@ -414,25 +557,36 @@ sysenter_past_esp:
  	/*CFI_REL_OFFSET cs, 0*/
  	/*
  	 * Push current_thread_info()->sysenter_return to the stack.
@@ -12021,17 +12547,21 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -455,12 +551,23 @@ sysenter_do_call:
+@@ -455,12 +609,27 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
-+	pushl %eax
-+	CFI_ADJUST_CFA_OFFSET 4
++	pushl_cfi %eax
 +	call pax_randomize_kstack
-+	popl %eax
-+	CFI_ADJUST_CFA_OFFSET -4
++	popl_cfi %eax
++#endif
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++	pushl_cfi %eax
++	call pax_erase_kstack
++	popl_cfi %eax
 +#endif
 +
  /* if something modifies registers it must also disable sysexit */
@@ -12045,7 +12575,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -504,11 +611,17 @@ sysexit_audit:
+@@ -504,11 +673,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -12065,7 +12595,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -538,6 +651,10 @@ syscall_exit:
+@@ -538,6 +713,14 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
@@ -12073,10 +12603,14 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
 +	call pax_randomize_kstack
 +#endif
 +
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++	pax_erase_kstack
++#endif
++
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -602,7 +719,13 @@ ldt_ss:
+@@ -602,7 +785,13 @@ ldt_ss:
  	mov PT_OLDESP(%esp), %eax	/* load userspace esp */
  	mov %dx, %ax			/* eax: new kernel esp */
  	sub %eax, %edx			/* offset (low word is 0) */
@@ -12091,7 +12625,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	shr $16, %edx
  	mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
  	mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
-@@ -642,25 +765,19 @@ work_resched:
+@@ -642,25 +831,19 @@ work_resched:
  
  work_notifysig:				# deal with pending signals and
  					# notify-resume requests
@@ -12120,7 +12654,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  #endif
  	xorl %edx, %edx
  	call do_notify_resume
-@@ -695,6 +812,10 @@ END(syscall_exit_work)
+@@ -695,6 +878,10 @@ END(syscall_exit_work)
  
  	RING0_INT_FRAME			# can't unwind into user space anyway
  syscall_fault:
@@ -12131,7 +12665,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	GET_THREAD_INFO(%ebp)
  	movl $-EFAULT,PT_EAX(%esp)
  	jmp resume_userspace
-@@ -726,6 +847,33 @@ PTREGSCALL(rt_sigreturn)
+@@ -726,6 +913,33 @@ PTREGSCALL(rt_sigreturn)
  PTREGSCALL(vm86)
  PTREGSCALL(vm86old)
  
@@ -12165,7 +12699,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -735,7 +883,13 @@ PTREGSCALL(vm86old)
+@@ -735,7 +949,13 @@ PTREGSCALL(vm86old)
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -12180,7 +12714,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
  	mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
  	shl $16, %eax
-@@ -1198,7 +1352,6 @@ return_to_handler:
+@@ -1198,7 +1418,6 @@ return_to_handler:
  	ret
  #endif
  
@@ -12188,7 +12722,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1255,9 +1408,12 @@ error_code:
+@@ -1255,9 +1474,12 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -12197,34 +12731,34 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_32.S linux-2.6.32.39/arch/x86/k
  	movl %ecx, %ds
  	movl %ecx, %es
 +
-+	PAX_ENTER_KERNEL
++	pax_enter_kernel
 +
  	TRACE_IRQS_OFF
  	movl %esp,%eax			# pt_regs pointer
  	call *%edi
-@@ -1351,6 +1507,9 @@ nmi_stack_correct:
+@@ -1351,6 +1573,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
 +
-+	PAX_EXIT_KERNEL
++	pax_exit_kernel
 +
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1391,6 +1550,9 @@ nmi_espfix_stack:
+@@ -1391,6 +1616,9 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
 +
-+	PAX_EXIT_KERNEL
++	pax_exit_kernel
 +
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/kernel/entry_64.S
---- linux-2.6.32.39/arch/x86/kernel/entry_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/entry_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/entry_64.S linux-2.6.32.40/arch/x86/kernel/entry_64.S
+--- linux-2.6.32.40/arch/x86/kernel/entry_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/entry_64.S	2011-05-10 21:29:37.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -12233,12 +12767,12 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -174,6 +175,206 @@ ENTRY(native_usergs_sysret64)
+@@ -174,6 +175,251 @@ ENTRY(native_usergs_sysret64)
  ENDPROC(native_usergs_sysret64)
  #endif /* CONFIG_PARAVIRT */
  
 +	.macro ljmpq sel, off
-+#if defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
++#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
 +	.byte 0x48; ljmp *1234f(%rip)
 +	.pushsection .rodata
 +	.align 16
@@ -12330,6 +12864,11 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
 +	call pax_randomize_kstack
 +	pop %rax
 +#endif
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++	push %rax
++	call pax_erase_kstack
++	pop %rax
++#endif
 +	.endm
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -12437,10 +12976,50 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
 +	retq
 +ENDPROC(pax_exit_kernel_user)
 +#endif
++
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++ENTRY(pax_erase_kstack)
++	push %rdi
++
++	lea -128(%rsp), %rdi
++	and $-64, %rdi
++	mov $-0xBEEF, %rax
++	std
++1:
++	mov %edi, %ecx
++	and $THREAD_SIZE_asm - 1, %ecx
++	shr $3, %ecx
++	repne scasq
++	jecxz 2f
++
++	and $-64, %rdi
++	and $-8, %ecx
++
++	sub $64, %ecx
++	jc 2f
++	mov $8, %ecx
++	repe scasq
++	jne 1b
++	sub $(512 - 64), %rdi
++	mov $8, %ecx
++	repe scasq
++	jecxz 2f
++	jne 1b
++2:
++	cld
++	mov %esp, %ecx
++	sub %edi, %ecx
++	shr $3, %ecx
++	rep stosq
++
++	pop %rdi
++	ret
++ENDPROC(pax_erase_kstack)
++#endif
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -317,7 +518,7 @@ ENTRY(save_args)
+@@ -317,7 +563,7 @@ ENTRY(save_args)
  	leaq -ARGOFFSET+16(%rsp),%rdi	/* arg1 for handler */
  	movq_cfi rbp, 8		/* push %rbp */
  	leaq 8(%rsp), %rbp		/* mov %rsp, %ebp */
@@ -12449,7 +13028,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	je 1f
  	SWAPGS
  	/*
-@@ -409,7 +610,7 @@ ENTRY(ret_from_fork)
+@@ -409,7 +655,7 @@ ENTRY(ret_from_fork)
  
  	RESTORE_REST
  
@@ -12458,7 +13037,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	je   int_ret_from_sys_call
  
  	testl $_TIF_IA32, TI_flags(%rcx)	# 32-bit compat task needs IRET
-@@ -455,7 +656,7 @@ END(ret_from_fork)
+@@ -455,7 +701,7 @@ END(ret_from_fork)
  ENTRY(system_call)
  	CFI_STARTPROC	simple
  	CFI_SIGNAL_FRAME
@@ -12467,7 +13046,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	CFI_REGISTER	rip,rcx
  	/*CFI_REGISTER	rflags,r11*/
  	SWAPGS_UNSAFE_STACK
-@@ -468,12 +669,13 @@ ENTRY(system_call_after_swapgs)
+@@ -468,12 +714,13 @@ ENTRY(system_call_after_swapgs)
  
  	movq	%rsp,PER_CPU_VAR(old_rsp)
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -12482,7 +13061,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	movq  %rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq  %rcx,RIP-ARGOFFSET(%rsp)
  	CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -502,6 +704,7 @@ sysret_check:
+@@ -502,6 +749,7 @@ sysret_check:
  	andl %edi,%edx
  	jnz  sysret_careful
  	CFI_REMEMBER_STATE
@@ -12490,7 +13069,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	/*
  	 * sysretq will re-enable interrupts:
  	 */
-@@ -613,7 +816,7 @@ tracesys:
+@@ -613,7 +861,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
@@ -12499,7 +13078,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	je retint_restore_args
  	movl $_TIF_ALLWORK_MASK,%edi
  	/* edi:	mask to check */
-@@ -800,6 +1003,16 @@ END(interrupt)
+@@ -800,6 +1048,16 @@ END(interrupt)
  	CFI_ADJUST_CFA_OFFSET 10*8
  	call save_args
  	PARTIAL_FRAME 0
@@ -12516,7 +13095,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	call \func
  	.endm
  
-@@ -822,7 +1035,7 @@ ret_from_intr:
+@@ -822,7 +1080,7 @@ ret_from_intr:
  	CFI_ADJUST_CFA_OFFSET	-8
  exit_intr:
  	GET_THREAD_INFO(%rcx)
@@ -12525,7 +13104,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -844,12 +1057,14 @@ retint_swapgs:		/* return to user-space 
+@@ -844,12 +1102,14 @@ retint_swapgs:		/* return to user-space 
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -12540,7 +13119,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -1032,6 +1247,16 @@ ENTRY(\sym)
+@@ -1032,6 +1292,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET 15*8
  	call error_entry
  	DEFAULT_FRAME 0
@@ -12557,7 +13136,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1049,6 +1274,16 @@ ENTRY(\sym)
+@@ -1049,6 +1319,16 @@ ENTRY(\sym)
  	subq $15*8, %rsp
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -12574,7 +13153,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1066,9 +1301,24 @@ ENTRY(\sym)
+@@ -1066,9 +1346,24 @@ ENTRY(\sym)
  	subq $15*8, %rsp
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -12600,7 +13179,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
  	call \do_sym
  	addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
-@@ -1085,6 +1335,16 @@ ENTRY(\sym)
+@@ -1085,6 +1380,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET 15*8
  	call error_entry
  	DEFAULT_FRAME 0
@@ -12617,7 +13196,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1104,6 +1364,16 @@ ENTRY(\sym)
+@@ -1104,6 +1409,16 @@ ENTRY(\sym)
  	call save_paranoid
  	DEFAULT_FRAME 0
  	TRACE_IRQS_OFF
@@ -12634,7 +13213,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1405,14 +1675,27 @@ ENTRY(paranoid_exit)
+@@ -1405,14 +1720,27 @@ ENTRY(paranoid_exit)
  	TRACE_IRQS_OFF
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
@@ -12663,7 +13242,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	TRACE_IRQS_IRETQ 0
  	RESTORE_ALL 8
  	jmp irq_return
-@@ -1470,7 +1753,7 @@ ENTRY(error_entry)
+@@ -1470,7 +1798,7 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -12672,7 +13251,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	je error_kernelspace
  error_swapgs:
  	SWAPGS
-@@ -1529,6 +1812,16 @@ ENTRY(nmi)
+@@ -1529,6 +1857,16 @@ ENTRY(nmi)
  	CFI_ADJUST_CFA_OFFSET 15*8
  	call save_paranoid
  	DEFAULT_FRAME 0
@@ -12689,7 +13268,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1539,11 +1832,25 @@ ENTRY(nmi)
+@@ -1539,11 +1877,25 @@ ENTRY(nmi)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz nmi_restore
@@ -12716,19 +13295,39 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/entry_64.S linux-2.6.32.39/arch/x86/k
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.32.39/arch/x86/kernel/ftrace.c linux-2.6.32.39/arch/x86/kernel/ftrace.c
---- linux-2.6.32.39/arch/x86/kernel/ftrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/ftrace.c	2011-04-17 15:56:46.000000000 -0400
-@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
+diff -urNp linux-2.6.32.40/arch/x86/kernel/ftrace.c linux-2.6.32.40/arch/x86/kernel/ftrace.c
+--- linux-2.6.32.40/arch/x86/kernel/ftrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/ftrace.c	2011-05-04 17:56:20.000000000 -0400
+@@ -103,7 +103,7 @@ static void *mod_code_ip;		/* holds the 
+ static void *mod_code_newcode;		/* holds the text to write to the IP */
+ 
+ static unsigned nmi_wait_count;
+-static atomic_t nmi_update_count = ATOMIC_INIT(0);
++static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
+ 
+ int ftrace_arch_read_dyn_info(char *buf, int size)
+ {
+@@ -111,7 +111,7 @@ int ftrace_arch_read_dyn_info(char *buf,
+ 
+ 	r = snprintf(buf, size, "%u %u",
+ 		     nmi_wait_count,
+-		     atomic_read(&nmi_update_count));
++		     atomic_read_unchecked(&nmi_update_count));
+ 	return r;
+ }
+ 
+@@ -149,8 +149,10 @@ void ftrace_nmi_enter(void)
  {
  	if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
  		smp_rmb();
 +		pax_open_kernel();
  		ftrace_mod_code();
+-		atomic_inc(&nmi_update_count);
 +		pax_close_kernel();
- 		atomic_inc(&nmi_update_count);
++		atomic_inc_unchecked(&nmi_update_count);
  	}
  	/* Must have previous changes seen before executions */
+ 	smp_mb();
 @@ -215,7 +217,7 @@ do_ftrace_mod_code(unsigned long ip, voi
  
  
@@ -12784,9 +13383,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/ftrace.c linux-2.6.32.39/arch/x86/ker
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.39/arch/x86/kernel/head32.c linux-2.6.32.39/arch/x86/kernel/head32.c
---- linux-2.6.32.39/arch/x86/kernel/head32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/head32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/head32.c linux-2.6.32.40/arch/x86/kernel/head32.c
+--- linux-2.6.32.40/arch/x86/kernel/head32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/head32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <asm/apic.h>
  #include <asm/io_apic.h>
@@ -12804,9 +13403,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/head32.c linux-2.6.32.39/arch/x86/ker
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-2.6.32.39/arch/x86/kernel/head_32.S linux-2.6.32.39/arch/x86/kernel/head_32.S
---- linux-2.6.32.39/arch/x86/kernel/head_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/head_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/head_32.S linux-2.6.32.40/arch/x86/kernel/head_32.S
+--- linux-2.6.32.40/arch/x86/kernel/head_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/head_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -19,10 +19,17 @@
  #include <asm/setup.h>
  #include <asm/processor-flags.h>
@@ -13276,9 +13875,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/head_32.S linux-2.6.32.39/arch/x86/ke
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff -urNp linux-2.6.32.39/arch/x86/kernel/head_64.S linux-2.6.32.39/arch/x86/kernel/head_64.S
---- linux-2.6.32.39/arch/x86/kernel/head_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/head_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/head_64.S linux-2.6.32.40/arch/x86/kernel/head_64.S
+--- linux-2.6.32.40/arch/x86/kernel/head_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/head_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -13549,9 +14148,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/head_64.S linux-2.6.32.39/arch/x86/ke
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.40/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.32.40/arch/x86/kernel/i386_ksyms_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/i386_ksyms_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -13573,9 +14172,21 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.39/arch/
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.32.39/arch/x86/kernel/init_task.c linux-2.6.32.39/arch/x86/kernel/init_task.c
---- linux-2.6.32.39/arch/x86/kernel/init_task.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/init_task.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/i8259.c linux-2.6.32.40/arch/x86/kernel/i8259.c
+--- linux-2.6.32.40/arch/x86/kernel/i8259.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/i8259.c	2011-05-04 17:56:28.000000000 -0400
+@@ -208,7 +208,7 @@ spurious_8259A_irq:
+ 			       "spurious 8259A interrupt: IRQ%d.\n", irq);
+ 			spurious_irq_mask |= irqmask;
+ 		}
+-		atomic_inc(&irq_err_count);
++		atomic_inc_unchecked(&irq_err_count);
+ 		/*
+ 		 * Theoretically we do not have to handle this IRQ,
+ 		 * but in Linux this does not cause problems and is
+diff -urNp linux-2.6.32.40/arch/x86/kernel/init_task.c linux-2.6.32.40/arch/x86/kernel/init_task.c
+--- linux-2.6.32.40/arch/x86/kernel/init_task.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/init_task.c	2011-04-17 15:56:46.000000000 -0400
 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
   * way process stacks are handled. This is done by having a special
   * "init_task" linker map entry..
@@ -13594,9 +14205,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/init_task.c linux-2.6.32.39/arch/x86/
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/ioport.c linux-2.6.32.39/arch/x86/kernel/ioport.c
---- linux-2.6.32.39/arch/x86/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/ioport.c linux-2.6.32.40/arch/x86/kernel/ioport.c
+--- linux-2.6.32.40/arch/x86/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -13640,9 +14251,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/ioport.c linux-2.6.32.39/arch/x86/ker
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-2.6.32.39/arch/x86/kernel/irq_32.c linux-2.6.32.39/arch/x86/kernel/irq_32.c
---- linux-2.6.32.39/arch/x86/kernel/irq_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/irq_32.c	2011-04-23 13:26:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/irq_32.c linux-2.6.32.40/arch/x86/kernel/irq_32.c
+--- linux-2.6.32.40/arch/x86/kernel/irq_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/irq_32.c	2011-04-23 13:26:46.000000000 -0400
 @@ -35,7 +35,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -13785,9 +14396,71 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/irq_32.c linux-2.6.32.39/arch/x86/ker
  		/*
  		 * Shouldnt happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-2.6.32.39/arch/x86/kernel/kgdb.c linux-2.6.32.39/arch/x86/kernel/kgdb.c
---- linux-2.6.32.39/arch/x86/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/kgdb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/irq.c linux-2.6.32.40/arch/x86/kernel/irq.c
+--- linux-2.6.32.40/arch/x86/kernel/irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -15,7 +15,7 @@
+ #include <asm/mce.h>
+ #include <asm/hw_irq.h>
+ 
+-atomic_t irq_err_count;
++atomic_unchecked_t irq_err_count;
+ 
+ /* Function pointer for generic interrupt vector handling */
+ void (*generic_interrupt_extension)(void) = NULL;
+@@ -114,9 +114,9 @@ static int show_other_interrupts(struct 
+ 		seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
+ 	seq_printf(p, "  Machine check polls\n");
+ #endif
+-	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
++	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
+ #if defined(CONFIG_X86_IO_APIC)
+-	seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
++	seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
+ #endif
+ 	return 0;
+ }
+@@ -209,10 +209,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
+ 
+ u64 arch_irq_stat(void)
+ {
+-	u64 sum = atomic_read(&irq_err_count);
++	u64 sum = atomic_read_unchecked(&irq_err_count);
+ 
+ #ifdef CONFIG_X86_IO_APIC
+-	sum += atomic_read(&irq_mis_count);
++	sum += atomic_read_unchecked(&irq_mis_count);
+ #endif
+ 	return sum;
+ }
+diff -urNp linux-2.6.32.40/arch/x86/kernel/kgdb.c linux-2.6.32.40/arch/x86/kernel/kgdb.c
+--- linux-2.6.32.40/arch/x86/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
+@@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vec
+ 
+ 		/* clear the trace bit */
+ 		linux_regs->flags &= ~X86_EFLAGS_TF;
+-		atomic_set(&kgdb_cpu_doing_single_step, -1);
++		atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
+ 
+ 		/* set the trace bit if we're stepping */
+ 		if (remcomInBuffer[0] == 's') {
+ 			linux_regs->flags |= X86_EFLAGS_TF;
+ 			kgdb_single_step = 1;
+-			atomic_set(&kgdb_cpu_doing_single_step,
++			atomic_set_unchecked(&kgdb_cpu_doing_single_step,
+ 				   raw_smp_processor_id());
+ 		}
+ 
+@@ -476,7 +476,7 @@ static int __kgdb_notify(struct die_args
+ 		break;
+ 
+ 	case DIE_DEBUG:
+-		if (atomic_read(&kgdb_cpu_doing_single_step) ==
++		if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) ==
+ 		    raw_smp_processor_id()) {
+ 			if (user_mode(regs))
+ 				return single_step_cont(regs, args);
 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
  	return instruction_pointer(regs);
  }
@@ -13797,9 +14470,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/kgdb.c linux-2.6.32.39/arch/x86/kerne
  	/* Breakpoint instruction: */
  	.gdb_bpt_instr		= { 0xcc },
  	.flags			= KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/kprobes.c linux-2.6.32.39/arch/x86/kernel/kprobes.c
---- linux-2.6.32.39/arch/x86/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/kprobes.c linux-2.6.32.40/arch/x86/kernel/kprobes.c
+--- linux-2.6.32.40/arch/x86/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
  		char op;
  		s32 raddr;
@@ -13901,9 +14574,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/kprobes.c linux-2.6.32.39/arch/x86/ke
  		return ret;
  
  	switch (val) {
-diff -urNp linux-2.6.32.39/arch/x86/kernel/ldt.c linux-2.6.32.39/arch/x86/kernel/ldt.c
---- linux-2.6.32.39/arch/x86/kernel/ldt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/ldt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/ldt.c linux-2.6.32.40/arch/x86/kernel/ldt.c
+--- linux-2.6.32.40/arch/x86/kernel/ldt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/ldt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
@@ -13968,9 +14641,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/ldt.c linux-2.6.32.39/arch/x86/kernel
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.40/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.32.40/arch/x86/kernel/machine_kexec_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/machine_kexec_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <asm/system.h>
  #include <asm/cacheflush.h>
@@ -13998,9 +14671,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.39/ar
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_amd.c linux-2.6.32.39/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.39/arch/x86/kernel/microcode_amd.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/microcode_amd.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/microcode_amd.c linux-2.6.32.40/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.32.40/arch/x86/kernel/microcode_amd.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/microcode_amd.c	2011-04-17 17:03:05.000000000 -0400
 @@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c
  	uci->mc = NULL;
  }
@@ -14019,9 +14692,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_amd.c linux-2.6.32.39/arch/
  {
  	return &microcode_amd_ops;
  }
-diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_core.c linux-2.6.32.39/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.39/arch/x86/kernel/microcode_core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/microcode_core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/microcode_core.c linux-2.6.32.40/arch/x86/kernel/microcode_core.c
+--- linux-2.6.32.40/arch/x86/kernel/microcode_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/microcode_core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
  
  #define MICROCODE_VERSION	"2.00"
@@ -14031,9 +14704,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_core.c linux-2.6.32.39/arch
  
  /*
   * Synchronization.
-diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_intel.c linux-2.6.32.39/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.39/arch/x86/kernel/microcode_intel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/microcode_intel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/microcode_intel.c linux-2.6.32.40/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.32.40/arch/x86/kernel/microcode_intel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/microcode_intel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -14068,9 +14741,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/microcode_intel.c linux-2.6.32.39/arc
  {
  	return &microcode_intel_ops;
  }
-diff -urNp linux-2.6.32.39/arch/x86/kernel/module.c linux-2.6.32.39/arch/x86/kernel/module.c
---- linux-2.6.32.39/arch/x86/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/module.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/module.c linux-2.6.32.40/arch/x86/kernel/module.c
+--- linux-2.6.32.40/arch/x86/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/module.c	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@
  #define DEBUGP(fmt...)
  #endif
@@ -14211,9 +14884,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/module.c linux-2.6.32.39/arch/x86/ker
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt.c linux-2.6.32.39/arch/x86/kernel/paravirt.c
---- linux-2.6.32.39/arch/x86/kernel/paravirt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/paravirt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/paravirt.c linux-2.6.32.40/arch/x86/kernel/paravirt.c
+--- linux-2.6.32.40/arch/x86/kernel/paravirt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/paravirt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
   * corresponding structure. */
  static void *get_call_destination(u8 type)
@@ -14317,9 +14990,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt.c linux-2.6.32.39/arch/x86/k
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.40/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.40/arch/x86/kernel/paravirt-spinlocks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/paravirt-spinlocks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
  	__raw_spin_lock(lock);
  }
@@ -14329,9 +15002,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.39/
  #ifdef CONFIG_SMP
  	.spin_is_locked = __ticket_spin_is_locked,
  	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.40/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.32.40/arch/x86/kernel/pci-calgary_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/pci-calgary_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
  	free_pages((unsigned long)vaddr, get_order(size));
  }
@@ -14341,9 +15014,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.39/arch
  	.alloc_coherent = calgary_alloc_coherent,
  	.free_coherent = calgary_free_coherent,
  	.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-dma.c linux-2.6.32.39/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.39/arch/x86/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/pci-dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/pci-dma.c linux-2.6.32.40/arch/x86/kernel/pci-dma.c
+--- linux-2.6.32.40/arch/x86/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/pci-dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,7 +14,7 @@
  
  static int forbid_dac __read_mostly;
@@ -14362,9 +15035,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-dma.c linux-2.6.32.39/arch/x86/ke
  
  #ifdef CONFIG_PCI
  	if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/pci-gart_64.c linux-2.6.32.40/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.32.40/arch/x86/kernel/pci-gart_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/pci-gart_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
  	return -1;
  }
@@ -14374,9 +15047,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-gart_64.c linux-2.6.32.39/arch/x8
  	.map_sg				= gart_map_sg,
  	.unmap_sg			= gart_unmap_sg,
  	.map_page			= gart_map_page,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-nommu.c linux-2.6.32.39/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.39/arch/x86/kernel/pci-nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/pci-nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/pci-nommu.c linux-2.6.32.40/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.32.40/arch/x86/kernel/pci-nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/pci-nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
  	flush_write_buffers();
  }
@@ -14386,9 +15059,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-nommu.c linux-2.6.32.39/arch/x86/
  	.alloc_coherent		= dma_generic_alloc_coherent,
  	.free_coherent		= nommu_free_coherent,
  	.map_sg			= nommu_map_sg,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.40/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.32.40/arch/x86/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/pci-swiotlb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
  	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
  }
@@ -14398,9 +15071,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.39/arch/x8
  	.mapping_error = swiotlb_dma_mapping_error,
  	.alloc_coherent = x86_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.32.39/arch/x86/kernel/process_32.c linux-2.6.32.39/arch/x86/kernel/process_32.c
---- linux-2.6.32.39/arch/x86/kernel/process_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/process_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/process_32.c linux-2.6.32.40/arch/x86/kernel/process_32.c
+--- linux-2.6.32.40/arch/x86/kernel/process_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/process_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -14494,9 +15167,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/process_32.c linux-2.6.32.39/arch/x86
  	return 0;
  }
 -
-diff -urNp linux-2.6.32.39/arch/x86/kernel/process_64.c linux-2.6.32.39/arch/x86/kernel/process_64.c
---- linux-2.6.32.39/arch/x86/kernel/process_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/process_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/process_64.c linux-2.6.32.40/arch/x86/kernel/process_64.c
+--- linux-2.6.32.40/arch/x86/kernel/process_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/process_64.c	2011-05-11 18:25:15.000000000 -0400
 @@ -91,7 +91,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -14521,7 +15194,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/process_64.c linux-2.6.32.39/arch/x86
  
 -	childregs = ((struct pt_regs *)
 -			(THREAD_SIZE + task_stack_page(p))) - 1;
-+	childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
++	childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
  	*childregs = *regs;
  
  	childregs->ax = 0;
@@ -14552,19 +15225,19 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/process_64.c linux-2.6.32.39/arch/x86
  		return 0;
  	stack = (unsigned long)task_stack_page(p);
 -	if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
-+	if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-8-sizeof(u64))
++	if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
  		return 0;
  	fp = *(u64 *)(p->thread.sp);
  	do {
 -		if (fp < (unsigned long)stack ||
 -		    fp >= (unsigned long)stack+THREAD_SIZE)
-+		if (fp < stack || fp > stack+THREAD_SIZE-8-sizeof(u64))
++		if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.39/arch/x86/kernel/process.c linux-2.6.32.39/arch/x86/kernel/process.c
---- linux-2.6.32.39/arch/x86/kernel/process.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/process.c	2011-04-23 13:27:33.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/process.c linux-2.6.32.40/arch/x86/kernel/process.c
+--- linux-2.6.32.40/arch/x86/kernel/process.c	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/process.c	2011-05-11 18:25:15.000000000 -0400
 @@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -14622,7 +15295,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/process.c linux-2.6.32.39/arch/x86/ke
  	tsk->thread.debugreg0 = 0;
  	tsk->thread.debugreg1 = 0;
  	tsk->thread.debugreg2 = 0;
-@@ -568,16 +588,32 @@ static int __init idle_setup(char *str)
+@@ -568,16 +588,35 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
@@ -14648,10 +15321,13 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/process.c linux-2.6.32.39/arch/x86/ke
 +
 +	/* P4 seems to return a 0 LSB, ignore it */
 +#ifdef CONFIG_MPENTIUM4
-+	time &= 0x1EUL;
++	time &= 0x3EUL;
 +	time <<= 2;
-+#else
++#elif defined(CONFIG_X86_64)
 +	time &= 0xFUL;
++	time <<= 4;
++#else
++	time &= 0x1FUL;
 +	time <<= 3;
 +#endif
 +
@@ -14664,9 +15340,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/process.c linux-2.6.32.39/arch/x86/ke
  }
 +#endif
  
-diff -urNp linux-2.6.32.39/arch/x86/kernel/ptrace.c linux-2.6.32.39/arch/x86/kernel/ptrace.c
---- linux-2.6.32.39/arch/x86/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/ptrace.c linux-2.6.32.40/arch/x86/kernel/ptrace.c
+--- linux-2.6.32.40/arch/x86/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -925,7 +925,7 @@ static const struct user_regset_view use
  long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  {
@@ -14753,9 +15429,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/ptrace.c linux-2.6.32.39/arch/x86/ker
  {
  	if (unlikely(current->audit_context))
  		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/reboot.c linux-2.6.32.39/arch/x86/kernel/reboot.c
---- linux-2.6.32.39/arch/x86/kernel/reboot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/reboot.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/reboot.c linux-2.6.32.40/arch/x86/kernel/reboot.c
+--- linux-2.6.32.40/arch/x86/kernel/reboot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/reboot.c	2011-04-23 12:56:10.000000000 -0400
 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -14823,9 +15499,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/reboot.c linux-2.6.32.39/arch/x86/ker
  
  	/* Set up the IDT for real mode. */
  	load_idt(&real_mode_idt);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/setup.c linux-2.6.32.39/arch/x86/kernel/setup.c
---- linux-2.6.32.39/arch/x86/kernel/setup.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/setup.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/setup.c linux-2.6.32.40/arch/x86/kernel/setup.c
+--- linux-2.6.32.40/arch/x86/kernel/setup.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/setup.c	2011-04-17 17:03:05.000000000 -0400
 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
  
  	if (!boot_params.hdr.root_flags)
@@ -14846,9 +15522,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/setup.c linux-2.6.32.39/arch/x86/kern
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/setup_percpu.c linux-2.6.32.39/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.39/arch/x86/kernel/setup_percpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/setup_percpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/setup_percpu.c linux-2.6.32.40/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.32.40/arch/x86/kernel/setup_percpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/setup_percpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -25,19 +25,17 @@
  # define DBG(x...)
  #endif
@@ -14912,9 +15588,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/setup_percpu.c linux-2.6.32.39/arch/x
  		/*
  		 * Up to this point, the boot CPU has been using .data.init
  		 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.32.39/arch/x86/kernel/signal.c linux-2.6.32.39/arch/x86/kernel/signal.c
---- linux-2.6.32.39/arch/x86/kernel/signal.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/signal.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/signal.c linux-2.6.32.40/arch/x86/kernel/signal.c
+--- linux-2.6.32.40/arch/x86/kernel/signal.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/signal.c	2011-04-17 15:56:46.000000000 -0400
 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
  	 * Align the stack pointer according to the i386 ABI,
  	 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -14989,9 +15665,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/signal.c linux-2.6.32.39/arch/x86/ker
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.32.39/arch/x86/kernel/smpboot.c linux-2.6.32.39/arch/x86/kernel/smpboot.c
---- linux-2.6.32.39/arch/x86/kernel/smpboot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/smpboot.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/smpboot.c linux-2.6.32.40/arch/x86/kernel/smpboot.c
+--- linux-2.6.32.40/arch/x86/kernel/smpboot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/smpboot.c	2011-05-11 18:25:15.000000000 -0400
 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
   */
  static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
@@ -15026,7 +15702,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/smpboot.c linux-2.6.32.39/arch/x86/ke
 -	per_cpu(kernel_stack, cpu) =
 -		(unsigned long)task_stack_page(c_idle.idle) -
 -		KERNEL_STACK_OFFSET + THREAD_SIZE;
-+	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 8 + THREAD_SIZE;
++	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
  #endif
 +
 +	pax_open_kernel();
@@ -15049,9 +15725,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/smpboot.c linux-2.6.32.39/arch/x86/ke
  	err = do_boot_cpu(apicid, cpu);
  
  	if (err) {
-diff -urNp linux-2.6.32.39/arch/x86/kernel/step.c linux-2.6.32.39/arch/x86/kernel/step.c
---- linux-2.6.32.39/arch/x86/kernel/step.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/step.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/step.c linux-2.6.32.40/arch/x86/kernel/step.c
+--- linux-2.6.32.40/arch/x86/kernel/step.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/step.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
@@ -15094,17 +15770,17 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/step.c linux-2.6.32.39/arch/x86/kerne
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/syscall_table_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/syscall_table_32.S linux-2.6.32.40/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.40/arch/x86/kernel/syscall_table_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/syscall_table_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
-diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/sys_i386_32.c linux-2.6.32.40/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.32.40/arch/x86/kernel/sys_i386_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/sys_i386_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -24,6 +24,21 @@
  
  #include <asm/syscalls.h>
@@ -15376,9 +16052,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_i386_32.c linux-2.6.32.39/arch/x8
 -	: "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
 -	return __res;
 -}
-diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/sys_x86_64.c linux-2.6.32.40/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.32.40/arch/x86/kernel/sys_x86_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/sys_x86_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -15516,9 +16192,42 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/sys_x86_64.c linux-2.6.32.39/arch/x86
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/time.c linux-2.6.32.39/arch/x86/kernel/time.c
---- linux-2.6.32.39/arch/x86/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/tboot.c linux-2.6.32.40/arch/x86/kernel/tboot.c
+--- linux-2.6.32.40/arch/x86/kernel/tboot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/tboot.c	2011-05-04 17:56:28.000000000 -0400
+@@ -295,7 +295,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
+ 	tboot_shutdown(acpi_shutdown_map[sleep_state]);
+ }
+ 
+-static atomic_t ap_wfs_count;
++static atomic_unchecked_t ap_wfs_count;
+ 
+ static int tboot_wait_for_aps(int num_aps)
+ {
+@@ -319,9 +319,9 @@ static int __cpuinit tboot_cpu_callback(
+ {
+ 	switch (action) {
+ 	case CPU_DYING:
+-		atomic_inc(&ap_wfs_count);
++		atomic_inc_unchecked(&ap_wfs_count);
+ 		if (num_online_cpus() == 1)
+-			if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
++			if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
+ 				return NOTIFY_BAD;
+ 		break;
+ 	}
+@@ -340,7 +340,7 @@ static __init int tboot_late_init(void)
+ 
+ 	tboot_create_trampoline();
+ 
+-	atomic_set(&ap_wfs_count, 0);
++	atomic_set_unchecked(&ap_wfs_count, 0);
+ 	register_hotcpu_notifier(&tboot_cpu_notifier);
+ 	return 0;
+ }
+diff -urNp linux-2.6.32.40/arch/x86/kernel/time.c linux-2.6.32.40/arch/x86/kernel/time.c
+--- linux-2.6.32.40/arch/x86/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,17 +26,13 @@
  int timer_ack;
  #endif
@@ -15557,9 +16266,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/time.c linux-2.6.32.39/arch/x86/kerne
  	}
  	return pc;
  }
-diff -urNp linux-2.6.32.39/arch/x86/kernel/tls.c linux-2.6.32.39/arch/x86/kernel/tls.c
---- linux-2.6.32.39/arch/x86/kernel/tls.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/tls.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/tls.c linux-2.6.32.40/arch/x86/kernel/tls.c
+--- linux-2.6.32.40/arch/x86/kernel/tls.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/tls.c	2011-04-17 15:56:46.000000000 -0400
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
  	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
  		return -EINVAL;
@@ -15572,9 +16281,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/tls.c linux-2.6.32.39/arch/x86/kernel
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_32.S linux-2.6.32.39/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.39/arch/x86/kernel/trampoline_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/trampoline_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/trampoline_32.S linux-2.6.32.40/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.32.40/arch/x86/kernel/trampoline_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/trampoline_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -15597,9 +16306,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_32.S linux-2.6.32.39/arch/
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_64.S linux-2.6.32.39/arch/x86/kernel/trampoline_64.S
---- linux-2.6.32.39/arch/x86/kernel/trampoline_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/trampoline_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/trampoline_64.S linux-2.6.32.40/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.32.40/arch/x86/kernel/trampoline_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/trampoline_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -91,7 +91,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
@@ -15618,9 +16327,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/trampoline_64.S linux-2.6.32.39/arch/
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-2.6.32.39/arch/x86/kernel/traps.c linux-2.6.32.39/arch/x86/kernel/traps.c
---- linux-2.6.32.39/arch/x86/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/traps.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/traps.c linux-2.6.32.40/arch/x86/kernel/traps.c
+--- linux-2.6.32.40/arch/x86/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/traps.c	2011-04-17 15:56:46.000000000 -0400
 @@ -69,12 +69,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -15789,9 +16498,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/traps.c linux-2.6.32.39/arch/x86/kern
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-2.6.32.39/arch/x86/kernel/vm86_32.c linux-2.6.32.39/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.39/arch/x86/kernel/vm86_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/vm86_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/vm86_32.c linux-2.6.32.40/arch/x86/kernel/vm86_32.c
+--- linux-2.6.32.40/arch/x86/kernel/vm86_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/vm86_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -15856,9 +16565,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/vm86_32.c linux-2.6.32.39/arch/x86/ke
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.32.39/arch/x86/kernel/vmi_32.c linux-2.6.32.39/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.39/arch/x86/kernel/vmi_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/vmi_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/vmi_32.c linux-2.6.32.40/arch/x86/kernel/vmi_32.c
+--- linux-2.6.32.40/arch/x86/kernel/vmi_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/vmi_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 
  typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
  
@@ -16021,9 +16730,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/vmi_32.c linux-2.6.32.39/arch/x86/ker
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.40/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.32.40/arch/x86/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/vmlinux.lds.S	2011-04-17 15:56:46.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -16316,9 +17025,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.39/arch/x8
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/vsyscall_64.c linux-2.6.32.40/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.32.40/arch/x86/kernel/vsyscall_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/vsyscall_64.c	2011-04-23 12:56:10.000000000 -0400
 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
  
  	write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -16336,9 +17045,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/vsyscall_64.c linux-2.6.32.39/arch/x8
  		p = tcache->blob[1];
  	} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
  		/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.40/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.32.40/arch/x86/kernel/x8664_ksyms_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/x8664_ksyms_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
  
  EXPORT_SYMBOL(copy_user_generic);
@@ -16348,9 +17057,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.39/arch
  EXPORT_SYMBOL(__copy_from_user_inatomic);
  
  EXPORT_SYMBOL(copy_page);
-diff -urNp linux-2.6.32.39/arch/x86/kernel/xsave.c linux-2.6.32.39/arch/x86/kernel/xsave.c
---- linux-2.6.32.39/arch/x86/kernel/xsave.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kernel/xsave.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kernel/xsave.c linux-2.6.32.40/arch/x86/kernel/xsave.c
+--- linux-2.6.32.40/arch/x86/kernel/xsave.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kernel/xsave.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -1;
@@ -16378,9 +17087,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kernel/xsave.c linux-2.6.32.39/arch/x86/kern
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-2.6.32.39/arch/x86/kvm/emulate.c linux-2.6.32.39/arch/x86/kvm/emulate.c
---- linux-2.6.32.39/arch/x86/kvm/emulate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kvm/emulate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kvm/emulate.c linux-2.6.32.40/arch/x86/kvm/emulate.c
+--- linux-2.6.32.40/arch/x86/kvm/emulate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kvm/emulate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -81,8 +81,8 @@
  #define Src2CL      (1<<29)
  #define Src2ImmByte (2<<29)
@@ -16417,9 +17126,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/emulate.c linux-2.6.32.39/arch/x86/kvm/e
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b");  \
-diff -urNp linux-2.6.32.39/arch/x86/kvm/lapic.c linux-2.6.32.39/arch/x86/kvm/lapic.c
---- linux-2.6.32.39/arch/x86/kvm/lapic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kvm/lapic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kvm/lapic.c linux-2.6.32.40/arch/x86/kvm/lapic.c
+--- linux-2.6.32.40/arch/x86/kvm/lapic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kvm/lapic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -52,7 +52,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -16429,9 +17138,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/lapic.c linux-2.6.32.39/arch/x86/kvm/lap
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.32.39/arch/x86/kvm/svm.c linux-2.6.32.39/arch/x86/kvm/svm.c
---- linux-2.6.32.39/arch/x86/kvm/svm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kvm/svm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kvm/svm.c linux-2.6.32.40/arch/x86/kvm/svm.c
+--- linux-2.6.32.40/arch/x86/kvm/svm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kvm/svm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2483,9 +2483,12 @@ static int handle_exit(struct kvm_run *k
  static void reload_tss(struct kvm_vcpu *vcpu)
  {
@@ -16455,9 +17164,9 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/svm.c linux-2.6.32.39/arch/x86/kvm/svm.c
  	.cpu_has_kvm_support = has_svm,
  	.disabled_by_bios = is_disabled,
  	.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.32.39/arch/x86/kvm/vmx.c linux-2.6.32.39/arch/x86/kvm/vmx.c
---- linux-2.6.32.39/arch/x86/kvm/vmx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kvm/vmx.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/kvm/vmx.c linux-2.6.32.40/arch/x86/kvm/vmx.c
+--- linux-2.6.32.40/arch/x86/kvm/vmx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kvm/vmx.c	2011-05-04 17:56:20.000000000 -0400
 @@ -570,7 +570,11 @@ static void reload_tss(void)
  
  	kvm_get_gdt(&gdt);
@@ -16529,7 +17238,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/vmx.c linux-2.6.32.39/arch/x86/kvm/vmx.c
 +	asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
-+	asm("mov %0, %%fs" : : "r"(__KERNEL_PERCPU));
++	loadsegment(fs, __KERNEL_PERCPU);
 +#endif
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -16548,10 +17257,10 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/vmx.c linux-2.6.32.39/arch/x86/kvm/vmx.c
  	.cpu_has_kvm_support = cpu_has_kvm_support,
  	.disabled_by_bios = vmx_disabled_by_bios,
  	.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c
---- linux-2.6.32.39/arch/x86/kvm/x86.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/kvm/x86.c	2011-04-23 12:56:10.000000000 -0400
-@@ -81,7 +81,7 @@ static void update_cr8_intercept(struct 
+diff -urNp linux-2.6.32.40/arch/x86/kvm/x86.c linux-2.6.32.40/arch/x86/kvm/x86.c
+--- linux-2.6.32.40/arch/x86/kvm/x86.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/arch/x86/kvm/x86.c	2011-05-10 22:12:26.000000000 -0400
+@@ -82,7 +82,7 @@ static void update_cr8_intercept(struct 
  static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
  				    struct kvm_cpuid_entry2 __user *entries);
  
@@ -16560,7 +17269,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c
  EXPORT_SYMBOL_GPL(kvm_x86_ops);
  
  int ignore_msrs = 0;
-@@ -1390,15 +1390,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
+@@ -1430,15 +1430,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
  				     struct kvm_cpuid2 *cpuid,
  				     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -16584,7 +17293,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c
  	vcpu->arch.cpuid_nent = cpuid->nent;
  	kvm_apic_set_version(vcpu);
  	return 0;
-@@ -1411,16 +1416,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
+@@ -1451,16 +1456,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
  				     struct kvm_cpuid2 *cpuid,
  				     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -16608,7 +17317,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c
  	return 0;
  
  out:
-@@ -1638,7 +1647,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -1678,7 +1687,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
  				    struct kvm_interrupt *irq)
  {
@@ -16617,7 +17326,7 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c
  		return -EINVAL;
  	if (irqchip_in_kernel(vcpu->kvm))
  		return -ENXIO;
-@@ -3220,10 +3229,10 @@ static struct notifier_block kvmclock_cp
+@@ -3260,10 +3269,10 @@ static struct notifier_block kvmclock_cp
          .notifier_call  = kvmclock_cpufreq_notifier
  };
  
@@ -16630,9 +17339,234 @@ diff -urNp linux-2.6.32.39/arch/x86/kvm/x86.c linux-2.6.32.39/arch/x86/kvm/x86.c
  
  	if (kvm_x86_ops) {
  		printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.32.39/arch/x86/lib/checksum_32.S linux-2.6.32.39/arch/x86/lib/checksum_32.S
---- linux-2.6.32.39/arch/x86/lib/checksum_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/checksum_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/atomic64_32.c linux-2.6.32.40/arch/x86/lib/atomic64_32.c
+--- linux-2.6.32.40/arch/x86/lib/atomic64_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/atomic64_32.c	2011-05-04 17:56:28.000000000 -0400
+@@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u6
+ }
+ EXPORT_SYMBOL(atomic64_cmpxchg);
+ 
++u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val)
++{
++	return cmpxchg8b(&ptr->counter, old_val, new_val);
++}
++EXPORT_SYMBOL(atomic64_cmpxchg_unchecked);
++
+ /**
+  * atomic64_xchg - xchg atomic64 variable
+  * @ptr:      pointer to type atomic64_t
+@@ -56,6 +62,36 @@ u64 atomic64_xchg(atomic64_t *ptr, u64 n
+ EXPORT_SYMBOL(atomic64_xchg);
+ 
+ /**
++ * atomic64_xchg_unchecked - xchg atomic64 variable
++ * @ptr:      pointer to type atomic64_unchecked_t
++ * @new_val:  value to assign
++ *
++ * Atomically xchgs the value of @ptr to @new_val and returns
++ * the old value.
++ */
++u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
++{
++	/*
++	 * Try first with a (possibly incorrect) assumption about
++	 * what we have there. We'll do two loops most likely,
++	 * but we'll get an ownership MESI transaction straight away
++	 * instead of a read transaction followed by a
++	 * flush-for-ownership transaction:
++	 */
++	u64 old_val, real_val = 0;
++
++	do {
++		old_val = real_val;
++
++		real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
++
++	} while (real_val != old_val);
++
++	return old_val;
++}
++EXPORT_SYMBOL(atomic64_xchg_unchecked);
++
++/**
+  * atomic64_set - set atomic64 variable
+  * @ptr:      pointer to type atomic64_t
+  * @new_val:  value to assign
+@@ -69,7 +105,19 @@ void atomic64_set(atomic64_t *ptr, u64 n
+ EXPORT_SYMBOL(atomic64_set);
+ 
+ /**
+-EXPORT_SYMBOL(atomic64_read);
++ * atomic64_unchecked_set - set atomic64 variable
++ * @ptr:      pointer to type atomic64_unchecked_t
++ * @new_val:  value to assign
++ *
++ * Atomically sets the value of @ptr to @new_val.
++ */
++void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
++{
++	atomic64_xchg_unchecked(ptr, new_val);
++}
++EXPORT_SYMBOL(atomic64_set_unchecked);
++
++/**
+  * atomic64_add_return - add and return
+  * @delta: integer value to add
+  * @ptr:   pointer to type atomic64_t
+@@ -99,24 +147,72 @@ noinline u64 atomic64_add_return(u64 del
+ }
+ EXPORT_SYMBOL(atomic64_add_return);
+ 
++/**
++ * atomic64_add_return_unchecked - add and return
++ * @delta: integer value to add
++ * @ptr:   pointer to type atomic64_unchecked_t
++ *
++ * Atomically adds @delta to @ptr and returns @delta + *@ptr
++ */
++noinline u64 atomic64_add_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
++{
++	/*
++	 * Try first with a (possibly incorrect) assumption about
++	 * what we have there. We'll do two loops most likely,
++	 * but we'll get an ownership MESI transaction straight away
++	 * instead of a read transaction followed by a
++	 * flush-for-ownership transaction:
++	 */
++	u64 old_val, new_val, real_val = 0;
++
++	do {
++		old_val = real_val;
++		new_val = old_val + delta;
++
++		real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
++
++	} while (real_val != old_val);
++
++	return new_val;
++}
++EXPORT_SYMBOL(atomic64_add_return_unchecked);
++
+ u64 atomic64_sub_return(u64 delta, atomic64_t *ptr)
+ {
+ 	return atomic64_add_return(-delta, ptr);
+ }
+ EXPORT_SYMBOL(atomic64_sub_return);
+ 
++u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
++{
++	return atomic64_add_return_unchecked(-delta, ptr);
++}
++EXPORT_SYMBOL(atomic64_sub_return_unchecked);
++
+ u64 atomic64_inc_return(atomic64_t *ptr)
+ {
+ 	return atomic64_add_return(1, ptr);
+ }
+ EXPORT_SYMBOL(atomic64_inc_return);
+ 
++u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr)
++{
++	return atomic64_add_return_unchecked(1, ptr);
++}
++EXPORT_SYMBOL(atomic64_inc_return_unchecked);
++
+ u64 atomic64_dec_return(atomic64_t *ptr)
+ {
+ 	return atomic64_sub_return(1, ptr);
+ }
+ EXPORT_SYMBOL(atomic64_dec_return);
+ 
++u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr)
++{
++	return atomic64_sub_return_unchecked(1, ptr);
++}
++EXPORT_SYMBOL(atomic64_dec_return_unchecked);
++
+ /**
+  * atomic64_add - add integer to atomic64 variable
+  * @delta: integer value to add
+@@ -131,6 +227,19 @@ void atomic64_add(u64 delta, atomic64_t 
+ EXPORT_SYMBOL(atomic64_add);
+ 
+ /**
++ * atomic64_add_unchecked - add integer to atomic64 variable
++ * @delta: integer value to add
++ * @ptr:   pointer to type atomic64_unchecked_t
++ *
++ * Atomically adds @delta to @ptr.
++ */
++void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr)
++{
++	atomic64_add_return_unchecked(delta, ptr);
++}
++EXPORT_SYMBOL(atomic64_add_unchecked);
++
++/**
+  * atomic64_sub - subtract the atomic64 variable
+  * @delta: integer value to subtract
+  * @ptr:   pointer to type atomic64_t
+@@ -144,6 +253,19 @@ void atomic64_sub(u64 delta, atomic64_t 
+ EXPORT_SYMBOL(atomic64_sub);
+ 
+ /**
++ * atomic64_sub_unchecked - subtract the atomic64 variable
++ * @delta: integer value to subtract
++ * @ptr:   pointer to type atomic64_unchecked_t
++ *
++ * Atomically subtracts @delta from @ptr.
++ */
++void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr)
++{
++	atomic64_add_unchecked(-delta, ptr);
++}
++EXPORT_SYMBOL(atomic64_sub_unchecked);
++
++/**
+  * atomic64_sub_and_test - subtract value from variable and test result
+  * @delta: integer value to subtract
+  * @ptr:   pointer to type atomic64_t
+@@ -173,6 +295,18 @@ void atomic64_inc(atomic64_t *ptr)
+ EXPORT_SYMBOL(atomic64_inc);
+ 
+ /**
++ * atomic64_inc_unchecked - increment atomic64 variable
++ * @ptr: pointer to type atomic64_unchecked_t
++ *
++ * Atomically increments @ptr by 1.
++ */
++void atomic64_inc_unchecked(atomic64_unchecked_t *ptr)
++{
++	atomic64_add_unchecked(1, ptr);
++}
++EXPORT_SYMBOL(atomic64_inc_unchecked);
++
++/**
+  * atomic64_dec - decrement atomic64 variable
+  * @ptr: pointer to type atomic64_t
+  *
+@@ -185,6 +319,18 @@ void atomic64_dec(atomic64_t *ptr)
+ EXPORT_SYMBOL(atomic64_dec);
+ 
+ /**
++ * atomic64_dec_unchecked - decrement atomic64 variable
++ * @ptr: pointer to type atomic64_unchecked_t
++ *
++ * Atomically decrements @ptr by 1.
++ */
++void atomic64_dec_unchecked(atomic64_unchecked_t *ptr)
++{
++	atomic64_sub_unchecked(1, ptr);
++}
++EXPORT_SYMBOL(atomic64_dec_unchecked);
++
++/**
+  * atomic64_dec_and_test - decrement and test
+  * @ptr: pointer to type atomic64_t
+  *
+diff -urNp linux-2.6.32.40/arch/x86/lib/checksum_32.S linux-2.6.32.40/arch/x86/lib/checksum_32.S
+--- linux-2.6.32.40/arch/x86/lib/checksum_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/checksum_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -16893,9 +17827,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/checksum_32.S linux-2.6.32.39/arch/x86/l
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-2.6.32.39/arch/x86/lib/clear_page_64.S linux-2.6.32.39/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.39/arch/x86/lib/clear_page_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/clear_page_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/clear_page_64.S linux-2.6.32.40/arch/x86/lib/clear_page_64.S
+--- linux-2.6.32.40/arch/x86/lib/clear_page_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/clear_page_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -16905,9 +17839,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/clear_page_64.S linux-2.6.32.39/arch/x86
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.39/arch/x86/lib/copy_page_64.S linux-2.6.32.39/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.39/arch/x86/lib/copy_page_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/copy_page_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/copy_page_64.S linux-2.6.32.40/arch/x86/lib/copy_page_64.S
+--- linux-2.6.32.40/arch/x86/lib/copy_page_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/copy_page_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -16917,9 +17851,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/copy_page_64.S linux-2.6.32.39/arch/x86/
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_64.S linux-2.6.32.39/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.39/arch/x86/lib/copy_user_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/copy_user_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/copy_user_64.S linux-2.6.32.40/arch/x86/lib/copy_user_64.S
+--- linux-2.6.32.40/arch/x86/lib/copy_user_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/copy_user_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -15,13 +15,14 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -16988,9 +17922,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_64.S linux-2.6.32.39/arch/x86/
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.40/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.32.40/arch/x86/lib/copy_user_nocache_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/copy_user_nocache_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -17015,30 +17949,38 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.39/a
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff -urNp linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/csum-wrappers_64.c	2011-04-17 15:56:46.000000000 -0400
-@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
+diff -urNp linux-2.6.32.40/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.40/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.32.40/arch/x86/lib/csum-wrappers_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/csum-wrappers_64.c	2011-05-04 17:56:20.000000000 -0400
+@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
  	}
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +		src += PAX_USER_SHADOW_BASE;
++#endif
++
  	isum = csum_partial_copy_generic((__force const void *)src,
  				dst, len, isum, errp, NULL);
  	if (unlikely(*errp))
-@@ -105,6 +107,8 @@ csum_partial_copy_to_user(const void *sr
+@@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *sr
  	}
  
  	*errp = 0;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
 +		dst += PAX_USER_SHADOW_BASE;
++#endif
++
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff -urNp linux-2.6.32.39/arch/x86/lib/getuser.S linux-2.6.32.39/arch/x86/lib/getuser.S
---- linux-2.6.32.39/arch/x86/lib/getuser.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/getuser.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/getuser.S linux-2.6.32.40/arch/x86/lib/getuser.S
+--- linux-2.6.32.40/arch/x86/lib/getuser.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/getuser.S	2011-04-17 15:56:46.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17144,9 +18086,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/getuser.S linux-2.6.32.39/arch/x86/lib/g
  4:	movq -7(%_ASM_AX),%_ASM_DX
  	xor %eax,%eax
  	ret
-diff -urNp linux-2.6.32.39/arch/x86/lib/memcpy_64.S linux-2.6.32.39/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.39/arch/x86/lib/memcpy_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/memcpy_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/memcpy_64.S linux-2.6.32.40/arch/x86/lib/memcpy_64.S
+--- linux-2.6.32.40/arch/x86/lib/memcpy_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/memcpy_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -128,7 +128,7 @@ ENDPROC(__memcpy)
  	 * It is also a lot simpler. Use this when possible:
  	 */
@@ -17156,9 +18098,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/memcpy_64.S linux-2.6.32.39/arch/x86/lib
  1:	.byte 0xeb				/* jmp <disp8> */
  	.byte (memcpy_c - memcpy) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.39/arch/x86/lib/memset_64.S linux-2.6.32.39/arch/x86/lib/memset_64.S
---- linux-2.6.32.39/arch/x86/lib/memset_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/memset_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/memset_64.S linux-2.6.32.40/arch/x86/lib/memset_64.S
+--- linux-2.6.32.40/arch/x86/lib/memset_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/memset_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -118,7 +118,7 @@ ENDPROC(__memset)
  
  #include <asm/cpufeature.h>
@@ -17168,9 +18110,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/memset_64.S linux-2.6.32.39/arch/x86/lib
  1:	.byte 0xeb				/* jmp <disp8> */
  	.byte (memset_c - memset) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.39/arch/x86/lib/mmx_32.c linux-2.6.32.39/arch/x86/lib/mmx_32.c
---- linux-2.6.32.39/arch/x86/lib/mmx_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/mmx_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/mmx_32.c linux-2.6.32.40/arch/x86/lib/mmx_32.c
+--- linux-2.6.32.40/arch/x86/lib/mmx_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/mmx_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
@@ -17486,9 +18428,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/mmx_32.c linux-2.6.32.39/arch/x86/lib/mm
  
  		from += 64;
  		to += 64;
-diff -urNp linux-2.6.32.39/arch/x86/lib/putuser.S linux-2.6.32.39/arch/x86/lib/putuser.S
---- linux-2.6.32.39/arch/x86/lib/putuser.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/putuser.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/putuser.S linux-2.6.32.40/arch/x86/lib/putuser.S
+--- linux-2.6.32.40/arch/x86/lib/putuser.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/putuser.S	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -17626,9 +18568,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/putuser.S linux-2.6.32.39/arch/x86/lib/p
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_32.c linux-2.6.32.39/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.39/arch/x86/lib/usercopy_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/usercopy_32.c	2011-04-23 21:12:28.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/lib/usercopy_32.c linux-2.6.32.40/arch/x86/lib/usercopy_32.c
+--- linux-2.6.32.40/arch/x86/lib/usercopy_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/usercopy_32.c	2011-04-23 21:12:28.000000000 -0400
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -18234,37 +19176,49 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_32.c linux-2.6.32.39/arch/x86/l
 -EXPORT_SYMBOL(copy_from_user);
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_64.c linux-2.6.32.39/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.39/arch/x86/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/lib/usercopy_64.c	2011-04-17 15:56:46.000000000 -0400
-@@ -42,6 +42,8 @@ long
+diff -urNp linux-2.6.32.40/arch/x86/lib/usercopy_64.c linux-2.6.32.40/arch/x86/lib/usercopy_64.c
+--- linux-2.6.32.40/arch/x86/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/lib/usercopy_64.c	2011-05-04 17:56:20.000000000 -0400
+@@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
  	long res;
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if ((unsigned long)src < PAX_USER_SHADOW_BASE)
 +		src += PAX_USER_SHADOW_BASE;
++#endif
++
  	__do_strncpy_from_user(dst, src, count, res);
  	return res;
  }
-@@ -65,6 +67,8 @@ unsigned long __clear_user(void __user *
+@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *
  {
  	long __d0;
  	might_fault();
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
 +		addr += PAX_USER_SHADOW_BASE;
++#endif
++
  	/* no memory constraint because it doesn't change any memory gcc knows
  	   about */
  	asm volatile(
-@@ -151,10 +155,14 @@ EXPORT_SYMBOL(strlen_user);
+@@ -151,10 +163,18 @@ EXPORT_SYMBOL(strlen_user);
  
  unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
  {
 -	if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) { 
 +	if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if ((unsigned long)to < PAX_USER_SHADOW_BASE)
 +			to += PAX_USER_SHADOW_BASE;
 +		if ((unsigned long)from < PAX_USER_SHADOW_BASE)
 +			from += PAX_USER_SHADOW_BASE;
++#endif
++
  		return copy_user_generic((__force void *)to, (__force void *)from, len);
 -	} 
 -	return len;		
@@ -18273,9 +19227,9 @@ diff -urNp linux-2.6.32.39/arch/x86/lib/usercopy_64.c linux-2.6.32.39/arch/x86/l
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.39/arch/x86/Makefile linux-2.6.32.39/arch/x86/Makefile
---- linux-2.6.32.39/arch/x86/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/Makefile linux-2.6.32.40/arch/x86/Makefile
+--- linux-2.6.32.40/arch/x86/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -189,3 +189,12 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
@@ -18289,9 +19243,9 @@ diff -urNp linux-2.6.32.39/arch/x86/Makefile linux-2.6.32.39/arch/x86/Makefile
 +
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.32.39/arch/x86/mm/extable.c linux-2.6.32.39/arch/x86/mm/extable.c
---- linux-2.6.32.39/arch/x86/mm/extable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/extable.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/extable.c linux-2.6.32.40/arch/x86/mm/extable.c
+--- linux-2.6.32.40/arch/x86/mm/extable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/extable.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -18365,9 +19319,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/extable.c linux-2.6.32.39/arch/x86/mm/ext
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.32.39/arch/x86/mm/fault.c linux-2.6.32.39/arch/x86/mm/fault.c
---- linux-2.6.32.39/arch/x86/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/fault.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/fault.c linux-2.6.32.40/arch/x86/mm/fault.c
+--- linux-2.6.32.40/arch/x86/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/fault.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,10 +11,19 @@
  #include <linux/kprobes.h>		/* __kprobes, ...		*/
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
@@ -19052,9 +20006,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/fault.c linux-2.6.32.39/arch/x86/mm/fault
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.32.39/arch/x86/mm/gup.c linux-2.6.32.39/arch/x86/mm/gup.c
---- linux-2.6.32.39/arch/x86/mm/gup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/gup.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/gup.c linux-2.6.32.40/arch/x86/mm/gup.c
+--- linux-2.6.32.40/arch/x86/mm/gup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/gup.c	2011-04-17 15:56:46.000000000 -0400
 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -19064,9 +20018,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/gup.c linux-2.6.32.39/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-2.6.32.39/arch/x86/mm/highmem_32.c linux-2.6.32.39/arch/x86/mm/highmem_32.c
---- linux-2.6.32.39/arch/x86/mm/highmem_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/highmem_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/highmem_32.c linux-2.6.32.40/arch/x86/mm/highmem_32.c
+--- linux-2.6.32.40/arch/x86/mm/highmem_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/highmem_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -19078,9 +20032,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/highmem_32.c linux-2.6.32.39/arch/x86/mm/
  
  	return (void *)vaddr;
  }
-diff -urNp linux-2.6.32.39/arch/x86/mm/hugetlbpage.c linux-2.6.32.39/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.39/arch/x86/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/hugetlbpage.c linux-2.6.32.40/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.32.40/arch/x86/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -19288,9 +20242,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/hugetlbpage.c linux-2.6.32.39/arch/x86/mm
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.32.39/arch/x86/mm/init_32.c linux-2.6.32.39/arch/x86/mm/init_32.c
---- linux-2.6.32.39/arch/x86/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/init_32.c linux-2.6.32.40/arch/x86/mm/init_32.c
+--- linux-2.6.32.40/arch/x86/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -19594,9 +20548,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/init_32.c linux-2.6.32.39/arch/x86/mm/ini
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff -urNp linux-2.6.32.39/arch/x86/mm/init_64.c linux-2.6.32.39/arch/x86/mm/init_64.c
---- linux-2.6.32.39/arch/x86/mm/init_64.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/init_64.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/init_64.c linux-2.6.32.40/arch/x86/mm/init_64.c
+--- linux-2.6.32.40/arch/x86/mm/init_64.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/init_64.c	2011-04-17 17:03:05.000000000 -0400
 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
  	pmd = fill_pmd(pud, vaddr);
  	pte = fill_pte(pmd, vaddr);
@@ -19657,9 +20611,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/init_64.c linux-2.6.32.39/arch/x86/mm/ini
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-2.6.32.39/arch/x86/mm/init.c linux-2.6.32.39/arch/x86/mm/init.c
---- linux-2.6.32.39/arch/x86/mm/init.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/init.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/init.c linux-2.6.32.40/arch/x86/mm/init.c
+--- linux-2.6.32.40/arch/x86/mm/init.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/init.c	2011-04-17 17:03:05.000000000 -0400
 @@ -69,11 +69,7 @@ static void __init find_early_table_spac
  	 * cause a hotspot and fill up ZONE_DMA. The page tables
  	 * need roughly 0.5KB per GB.
@@ -19787,9 +20741,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/init.c linux-2.6.32.39/arch/x86/mm/init.c
  	free_init_pages("unused kernel memory",
  			(unsigned long)(&__init_begin),
  			(unsigned long)(&__init_end));
-diff -urNp linux-2.6.32.39/arch/x86/mm/iomap_32.c linux-2.6.32.39/arch/x86/mm/iomap_32.c
---- linux-2.6.32.39/arch/x86/mm/iomap_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/iomap_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/iomap_32.c linux-2.6.32.40/arch/x86/mm/iomap_32.c
+--- linux-2.6.32.40/arch/x86/mm/iomap_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/iomap_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	debug_kmap_atomic(type);
  	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -19802,9 +20756,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/iomap_32.c linux-2.6.32.39/arch/x86/mm/io
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-2.6.32.39/arch/x86/mm/ioremap.c linux-2.6.32.39/arch/x86/mm/ioremap.c
---- linux-2.6.32.39/arch/x86/mm/ioremap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/ioremap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/ioremap.c linux-2.6.32.40/arch/x86/mm/ioremap.c
+--- linux-2.6.32.40/arch/x86/mm/ioremap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/ioremap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
  	 * Second special case: Some BIOSen report the PC BIOS
  	 * area (640->1Mb) as ram even though it is not.
@@ -19851,9 +20805,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/ioremap.c linux-2.6.32.39/arch/x86/mm/ior
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.40/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.32.40/arch/x86/mm/kmemcheck/kmemcheck.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/kmemcheck/kmemcheck.c	2011-04-17 15:56:46.000000000 -0400
 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
  	 * memory (e.g. tracked pages)? For now, we need this to avoid
  	 * invoking kmemcheck for PnP BIOS calls.
@@ -19866,9 +20820,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.39/arc
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.32.39/arch/x86/mm/mmap.c linux-2.6.32.39/arch/x86/mm/mmap.c
---- linux-2.6.32.39/arch/x86/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/mmap.c linux-2.6.32.40/arch/x86/mm/mmap.c
+--- linux-2.6.32.40/arch/x86/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -19950,9 +20904,30 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/mmap.c linux-2.6.32.39/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.39/arch/x86/mm/numa_32.c linux-2.6.32.39/arch/x86/mm/numa_32.c
---- linux-2.6.32.39/arch/x86/mm/numa_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/numa_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/mmio-mod.c linux-2.6.32.40/arch/x86/mm/mmio-mod.c
+--- linux-2.6.32.40/arch/x86/mm/mmio-mod.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/mmio-mod.c	2011-05-04 17:56:28.000000000 -0400
+@@ -233,7 +233,7 @@ static void post(struct kmmio_probe *p, 
+ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
+ 							void __iomem *addr)
+ {
+-	static atomic_t next_id;
++	static atomic_unchecked_t next_id;
+ 	struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
+ 	/* These are page-unaligned. */
+ 	struct mmiotrace_map map = {
+@@ -257,7 +257,7 @@ static void ioremap_trace_core(resource_
+ 			.private = trace
+ 		},
+ 		.phys = offset,
+-		.id = atomic_inc_return(&next_id)
++		.id = atomic_inc_return_unchecked(&next_id)
+ 	};
+ 	map.map_id = trace->id;
+ 
+diff -urNp linux-2.6.32.40/arch/x86/mm/numa_32.c linux-2.6.32.40/arch/x86/mm/numa_32.c
+--- linux-2.6.32.40/arch/x86/mm/numa_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/numa_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
  }
  #endif
@@ -19961,9 +20936,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/numa_32.c linux-2.6.32.39/arch/x86/mm/num
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr.c linux-2.6.32.39/arch/x86/mm/pageattr.c
---- linux-2.6.32.39/arch/x86/mm/pageattr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/pageattr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/pageattr.c linux-2.6.32.40/arch/x86/mm/pageattr.c
+--- linux-2.6.32.40/arch/x86/mm/pageattr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/pageattr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
  	 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
  	 */
@@ -20040,9 +21015,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr.c linux-2.6.32.39/arch/x86/mm/pa
  }
  
  static int
-diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr-test.c linux-2.6.32.39/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.39/arch/x86/mm/pageattr-test.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/pageattr-test.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/pageattr-test.c linux-2.6.32.40/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.40/arch/x86/mm/pageattr-test.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/pageattr-test.c	2011-04-17 15:56:46.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -20052,9 +21027,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pageattr-test.c linux-2.6.32.39/arch/x86/
  }
  
  struct split_state {
-diff -urNp linux-2.6.32.39/arch/x86/mm/pat.c linux-2.6.32.39/arch/x86/mm/pat.c
---- linux-2.6.32.39/arch/x86/mm/pat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/pat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/pat.c linux-2.6.32.40/arch/x86/mm/pat.c
+--- linux-2.6.32.40/arch/x86/mm/pat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/pat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
  
   conflict:
@@ -20102,9 +21077,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pat.c linux-2.6.32.39/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable_32.c linux-2.6.32.39/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.39/arch/x86/mm/pgtable_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/pgtable_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/pgtable_32.c linux-2.6.32.40/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.40/arch/x86/mm/pgtable_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/pgtable_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 
  		return;
  	}
@@ -20119,10 +21094,10 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable_32.c linux-2.6.32.39/arch/x86/mm/
  
  	/*
  	 * It's enough to flush this one mapping.
-diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgtable.c
---- linux-2.6.32.39/arch/x86/mm/pgtable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/pgtable.c	2011-04-17 15:56:46.000000000 -0400
-@@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p
+diff -urNp linux-2.6.32.40/arch/x86/mm/pgtable.c linux-2.6.32.40/arch/x86/mm/pgtable.c
+--- linux-2.6.32.40/arch/x86/mm/pgtable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/pgtable.c	2011-05-11 18:25:15.000000000 -0400
+@@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
  
@@ -20130,7 +21105,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
 -	(SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
-+
+ 
 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
 +{
 +	while (count--)
@@ -20152,9 +21127,6 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
 +}
 +#endif
 +
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+static inline void pgd_ctor(pgd_t *pgd) {}
-+static inline void pgd_dtor(pgd_t *pgd) {}
 +#ifdef CONFIG_X86_64
 +#define pxd_t				pud_t
 +#define pyd_t				pgd_t
@@ -20172,18 +21144,15 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
 +#define pyd_offset(mm ,address)		pud_offset((mm), (address))
 +#define PYD_SIZE			PUD_SIZE
 +#endif
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++static inline void pgd_ctor(pgd_t *pgd) {}
++static inline void pgd_dtor(pgd_t *pgd) {}
 +#else
-+#define pxd_t				pmd_t
-+#define pyd_t				pud_t
-+#define paravirt_release_pxd(pfn)	paravirt_release_pmd(pfn)
-+#define pxd_free(mm, pmd)		pmd_free((mm), (pmd))
-+#define pyd_populate(mm, pud, pmd)	pud_populate((mm), (pud), (pmd))
-+#define pyd_offset(mm ,address)		pud_offset((mm), (address))
-+#define PYD_SIZE			PUD_SIZE
- 
  static void pgd_ctor(pgd_t *pgd)
  {
-@@ -119,6 +169,7 @@ static void pgd_dtor(pgd_t *pgd)
+ 	/* If the pgd points to a shared pagetable level (either the
+@@ -119,6 +162,7 @@ static void pgd_dtor(pgd_t *pgd)
  	pgd_list_del(pgd);
  	spin_unlock_irqrestore(&pgd_lock, flags);
  }
@@ -20191,7 +21160,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  
  /*
   * List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -131,7 +182,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -131,7 +175,7 @@ static void pgd_dtor(pgd_t *pgd)
   * -- wli
   */
  
@@ -20200,7 +21169,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  /*
   * In PAE mode, we need to do a cr3 reload (=tlb flush) when
   * updating the top-level pagetable entries to guarantee the
-@@ -143,7 +194,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -143,7 +187,7 @@ static void pgd_dtor(pgd_t *pgd)
   * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
   * and initialize the kernel pmds here.
   */
@@ -20209,7 +21178,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  
  void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  {
-@@ -161,36 +212,38 @@ void pud_populate(struct mm_struct *mm, 
+@@ -161,36 +205,38 @@ void pud_populate(struct mm_struct *mm, 
  	 */
  	flush_tlb_mm(mm);
  }
@@ -20259,7 +21228,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  		return -ENOMEM;
  	}
  
-@@ -203,51 +256,56 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -203,51 +249,56 @@ static int preallocate_pmds(pmd_t *pmds[
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -20333,7 +21302,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  	unsigned long flags;
  
  	pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
-@@ -257,11 +315,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -257,11 +308,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
  	mm->pgd = pgd;
  
@@ -20347,7 +21316,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  
  	/*
  	 * Make sure that pre-populating the pmds is atomic with
-@@ -271,14 +329,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -271,14 +322,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  	spin_lock_irqsave(&pgd_lock, flags);
  
  	pgd_ctor(pgd);
@@ -20365,7 +21334,7 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  out_free_pgd:
  	free_page((unsigned long)pgd);
  out:
-@@ -287,7 +345,7 @@ out:
+@@ -287,7 +338,7 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)
  {
@@ -20374,9 +21343,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/pgtable.c linux-2.6.32.39/arch/x86/mm/pgt
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-2.6.32.39/arch/x86/mm/setup_nx.c linux-2.6.32.39/arch/x86/mm/setup_nx.c
---- linux-2.6.32.39/arch/x86/mm/setup_nx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/setup_nx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/setup_nx.c linux-2.6.32.40/arch/x86/mm/setup_nx.c
+--- linux-2.6.32.40/arch/x86/mm/setup_nx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/setup_nx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -4,11 +4,10 @@
  
  #include <asm/pgtable.h>
@@ -20442,9 +21411,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/setup_nx.c linux-2.6.32.39/arch/x86/mm/se
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  #endif
-diff -urNp linux-2.6.32.39/arch/x86/mm/tlb.c linux-2.6.32.39/arch/x86/mm/tlb.c
---- linux-2.6.32.39/arch/x86/mm/tlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/mm/tlb.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/mm/tlb.c linux-2.6.32.40/arch/x86/mm/tlb.c
+--- linux-2.6.32.40/arch/x86/mm/tlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/mm/tlb.c	2011-04-23 12:56:10.000000000 -0400
 @@ -61,7 +61,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -20457,9 +21426,9 @@ diff -urNp linux-2.6.32.39/arch/x86/mm/tlb.c linux-2.6.32.39/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-2.6.32.39/arch/x86/oprofile/backtrace.c linux-2.6.32.39/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.39/arch/x86/oprofile/backtrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/oprofile/backtrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/oprofile/backtrace.c linux-2.6.32.40/arch/x86/oprofile/backtrace.c
+--- linux-2.6.32.40/arch/x86/oprofile/backtrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/oprofile/backtrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
  	struct frame_head bufhead[2];
  
@@ -20478,9 +21447,9 @@ diff -urNp linux-2.6.32.39/arch/x86/oprofile/backtrace.c linux-2.6.32.39/arch/x8
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/oprofile/op_model_p4.c linux-2.6.32.40/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.32.40/arch/x86/oprofile/op_model_p4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/oprofile/op_model_p4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
  #endif
  }
@@ -20490,9 +21459,9 @@ diff -urNp linux-2.6.32.39/arch/x86/oprofile/op_model_p4.c linux-2.6.32.39/arch/
  {
  #ifdef CONFIG_SMP
  	return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.32.39/arch/x86/pci/common.c linux-2.6.32.39/arch/x86/pci/common.c
---- linux-2.6.32.39/arch/x86/pci/common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/common.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/common.c linux-2.6.32.40/arch/x86/pci/common.c
+--- linux-2.6.32.40/arch/x86/pci/common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/common.c	2011-04-23 12:56:10.000000000 -0400
 @@ -31,8 +31,8 @@ int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
@@ -20504,9 +21473,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/common.c linux-2.6.32.39/arch/x86/pci/co
  
  int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
  						int reg, int len, u32 *val)
-diff -urNp linux-2.6.32.39/arch/x86/pci/direct.c linux-2.6.32.39/arch/x86/pci/direct.c
---- linux-2.6.32.39/arch/x86/pci/direct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/direct.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/direct.c linux-2.6.32.40/arch/x86/pci/direct.c
+--- linux-2.6.32.40/arch/x86/pci/direct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/direct.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
  
  #undef PCI_CONF1_ADDRESS
@@ -20534,9 +21503,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/direct.c linux-2.6.32.39/arch/x86/pci/di
  {
  	u32 x = 0;
  	int year, devfn;
-diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_32.c linux-2.6.32.39/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.39/arch/x86/pci/mmconfig_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/mmconfig_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/mmconfig_32.c linux-2.6.32.40/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.32.40/arch/x86/pci/mmconfig_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/mmconfig_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 
  	return 0;
  }
@@ -20546,9 +21515,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_32.c linux-2.6.32.39/arch/x86/p
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_64.c linux-2.6.32.39/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.39/arch/x86/pci/mmconfig_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/mmconfig_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/mmconfig_64.c linux-2.6.32.40/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.32.40/arch/x86/pci/mmconfig_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/mmconfig_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 
  	return 0;
  }
@@ -20558,9 +21527,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/mmconfig_64.c linux-2.6.32.39/arch/x86/p
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.32.39/arch/x86/pci/numaq_32.c linux-2.6.32.39/arch/x86/pci/numaq_32.c
---- linux-2.6.32.39/arch/x86/pci/numaq_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/numaq_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/numaq_32.c linux-2.6.32.40/arch/x86/pci/numaq_32.c
+--- linux-2.6.32.40/arch/x86/pci/numaq_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/numaq_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
  
  #undef PCI_CONF1_MQ_ADDRESS
@@ -20570,9 +21539,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/numaq_32.c linux-2.6.32.39/arch/x86/pci/
  	.read	= pci_conf1_mq_read,
  	.write	= pci_conf1_mq_write
  };
-diff -urNp linux-2.6.32.39/arch/x86/pci/olpc.c linux-2.6.32.39/arch/x86/pci/olpc.c
---- linux-2.6.32.39/arch/x86/pci/olpc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/olpc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/olpc.c linux-2.6.32.40/arch/x86/pci/olpc.c
+--- linux-2.6.32.40/arch/x86/pci/olpc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/olpc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
  	return 0;
  }
@@ -20582,9 +21551,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/olpc.c linux-2.6.32.39/arch/x86/pci/olpc
  	.read =	pci_olpc_read,
  	.write = pci_olpc_write,
  };
-diff -urNp linux-2.6.32.39/arch/x86/pci/pcbios.c linux-2.6.32.39/arch/x86/pci/pcbios.c
---- linux-2.6.32.39/arch/x86/pci/pcbios.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/pci/pcbios.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/pci/pcbios.c linux-2.6.32.40/arch/x86/pci/pcbios.c
+--- linux-2.6.32.40/arch/x86/pci/pcbios.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/pci/pcbios.c	2011-04-17 15:56:46.000000000 -0400
 @@ -56,50 +56,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -20907,9 +21876,9 @@ diff -urNp linux-2.6.32.39/arch/x86/pci/pcbios.c linux-2.6.32.39/arch/x86/pci/pc
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.32.39/arch/x86/power/cpu.c linux-2.6.32.39/arch/x86/power/cpu.c
---- linux-2.6.32.39/arch/x86/power/cpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/power/cpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/power/cpu.c linux-2.6.32.40/arch/x86/power/cpu.c
+--- linux-2.6.32.40/arch/x86/power/cpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/power/cpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -129,7 +129,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -20929,9 +21898,9 @@ diff -urNp linux-2.6.32.39/arch/x86/power/cpu.c linux-2.6.32.39/arch/x86/power/c
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.32.39/arch/x86/vdso/Makefile linux-2.6.32.39/arch/x86/vdso/Makefile
---- linux-2.6.32.39/arch/x86/vdso/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/vdso/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/vdso/Makefile linux-2.6.32.40/arch/x86/vdso/Makefile
+--- linux-2.6.32.40/arch/x86/vdso/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/vdso/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO    $@
  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -20941,9 +21910,9 @@ diff -urNp linux-2.6.32.39/arch/x86/vdso/Makefile linux-2.6.32.39/arch/x86/vdso/
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/vdso/vclock_gettime.c linux-2.6.32.40/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.32.40/arch/x86/vdso/vclock_gettime.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/vdso/vclock_gettime.c	2011-04-17 15:56:46.000000000 -0400
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -21042,9 +22011,9 @@ diff -urNp linux-2.6.32.39/arch/x86/vdso/vclock_gettime.c linux-2.6.32.39/arch/x
  }
  int gettimeofday(struct timeval *, struct timezone *)
  	__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/vdso/vdso32-setup.c linux-2.6.32.40/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.32.40/arch/x86/vdso/vdso32-setup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/vdso/vdso32-setup.c	2011-04-23 12:56:10.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -21127,9 +22096,9 @@ diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso32-setup.c linux-2.6.32.39/arch/x86
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso.lds.S linux-2.6.32.39/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.39/arch/x86/vdso/vdso.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/vdso/vdso.lds.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/vdso/vdso.lds.S linux-2.6.32.40/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.40/arch/x86/vdso/vdso.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/vdso/vdso.lds.S	2011-04-17 15:56:46.000000000 -0400
 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
  #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
  #include "vextern.h"
@@ -21140,9 +22109,9 @@ diff -urNp linux-2.6.32.39/arch/x86/vdso/vdso.lds.S linux-2.6.32.39/arch/x86/vds
 +VEXTERN(fallback_time)
 +VEXTERN(getcpu)
 +#undef	VEXTERN
-diff -urNp linux-2.6.32.39/arch/x86/vdso/vextern.h linux-2.6.32.39/arch/x86/vdso/vextern.h
---- linux-2.6.32.39/arch/x86/vdso/vextern.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/vdso/vextern.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/vdso/vextern.h linux-2.6.32.40/arch/x86/vdso/vextern.h
+--- linux-2.6.32.40/arch/x86/vdso/vextern.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/vdso/vextern.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,5 @@
     put into vextern.h and be referenced as a pointer with vdso prefix.
     The main kernel later fills in the values.   */
@@ -21150,9 +22119,9 @@ diff -urNp linux-2.6.32.39/arch/x86/vdso/vextern.h linux-2.6.32.39/arch/x86/vdso
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.32.39/arch/x86/vdso/vma.c linux-2.6.32.39/arch/x86/vdso/vma.c
---- linux-2.6.32.39/arch/x86/vdso/vma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/vdso/vma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/vdso/vma.c linux-2.6.32.40/arch/x86/vdso/vma.c
+--- linux-2.6.32.40/arch/x86/vdso/vma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/vdso/vma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
  	if (!vbase)
  		goto oom;
@@ -21199,9 +22168,9 @@ diff -urNp linux-2.6.32.39/arch/x86/vdso/vma.c linux-2.6.32.39/arch/x86/vdso/vma
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.32.39/arch/x86/xen/enlighten.c linux-2.6.32.39/arch/x86/xen/enlighten.c
---- linux-2.6.32.39/arch/x86/xen/enlighten.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/xen/enlighten.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/xen/enlighten.c linux-2.6.32.40/arch/x86/xen/enlighten.c
+--- linux-2.6.32.40/arch/x86/xen/enlighten.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/xen/enlighten.c	2011-04-17 15:56:46.000000000 -0400
 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -21257,9 +22226,9 @@ diff -urNp linux-2.6.32.39/arch/x86/xen/enlighten.c linux-2.6.32.39/arch/x86/xen
  	xen_smp_init();
  
  	pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.32.39/arch/x86/xen/mmu.c linux-2.6.32.39/arch/x86/xen/mmu.c
---- linux-2.6.32.39/arch/x86/xen/mmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/xen/mmu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/xen/mmu.c linux-2.6.32.40/arch/x86/xen/mmu.c
+--- linux-2.6.32.40/arch/x86/xen/mmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/xen/mmu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1714,6 +1714,8 @@ __init pgd_t *xen_setup_kernel_pagetable
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
@@ -21280,9 +22249,9 @@ diff -urNp linux-2.6.32.39/arch/x86/xen/mmu.c linux-2.6.32.39/arch/x86/xen/mmu.c
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff -urNp linux-2.6.32.39/arch/x86/xen/smp.c linux-2.6.32.39/arch/x86/xen/smp.c
---- linux-2.6.32.39/arch/x86/xen/smp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/xen/smp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/xen/smp.c linux-2.6.32.40/arch/x86/xen/smp.c
+--- linux-2.6.32.40/arch/x86/xen/smp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/xen/smp.c	2011-05-11 18:25:15.000000000 -0400
 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
@@ -21323,13 +22292,13 @@ diff -urNp linux-2.6.32.39/arch/x86/xen/smp.c linux-2.6.32.39/arch/x86/xen/smp.c
 -	per_cpu(kernel_stack, cpu) =
 -		(unsigned long)task_stack_page(idle) -
 -		KERNEL_STACK_OFFSET + THREAD_SIZE;
-+	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 8 + THREAD_SIZE;
++	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-2.6.32.39/arch/x86/xen/xen-asm_32.S linux-2.6.32.39/arch/x86/xen/xen-asm_32.S
---- linux-2.6.32.39/arch/x86/xen/xen-asm_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/xen/xen-asm_32.S	2011-04-22 19:13:13.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/xen/xen-asm_32.S linux-2.6.32.40/arch/x86/xen/xen-asm_32.S
+--- linux-2.6.32.40/arch/x86/xen/xen-asm_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/xen/xen-asm_32.S	2011-04-22 19:13:13.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -21351,9 +22320,9 @@ diff -urNp linux-2.6.32.39/arch/x86/xen/xen-asm_32.S linux-2.6.32.39/arch/x86/xe
  #else
  	movl per_cpu__xen_vcpu, %eax
  #endif
-diff -urNp linux-2.6.32.39/arch/x86/xen/xen-head.S linux-2.6.32.39/arch/x86/xen/xen-head.S
---- linux-2.6.32.39/arch/x86/xen/xen-head.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/xen/xen-head.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/xen/xen-head.S linux-2.6.32.40/arch/x86/xen/xen-head.S
+--- linux-2.6.32.40/arch/x86/xen/xen-head.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/xen/xen-head.S	2011-04-17 15:56:46.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -21372,9 +22341,9 @@ diff -urNp linux-2.6.32.39/arch/x86/xen/xen-head.S linux-2.6.32.39/arch/x86/xen/
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.32.39/arch/x86/xen/xen-ops.h linux-2.6.32.39/arch/x86/xen/xen-ops.h
---- linux-2.6.32.39/arch/x86/xen/xen-ops.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/arch/x86/xen/xen-ops.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/arch/x86/xen/xen-ops.h linux-2.6.32.40/arch/x86/xen/xen-ops.h
+--- linux-2.6.32.40/arch/x86/xen/xen-ops.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/arch/x86/xen/xen-ops.h	2011-04-17 15:56:46.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -21384,9 +22353,9 @@ diff -urNp linux-2.6.32.39/arch/x86/xen/xen-ops.h linux-2.6.32.39/arch/x86/xen/x
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.32.39/block/blk-integrity.c linux-2.6.32.39/block/blk-integrity.c
---- linux-2.6.32.39/block/blk-integrity.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/blk-integrity.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/block/blk-integrity.c linux-2.6.32.40/block/blk-integrity.c
+--- linux-2.6.32.40/block/blk-integrity.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/blk-integrity.c	2011-04-17 15:56:46.000000000 -0400
 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
  	NULL,
  };
@@ -21396,9 +22365,9 @@ diff -urNp linux-2.6.32.39/block/blk-integrity.c linux-2.6.32.39/block/blk-integ
  	.show	= &integrity_attr_show,
  	.store	= &integrity_attr_store,
  };
-diff -urNp linux-2.6.32.39/block/blk-iopoll.c linux-2.6.32.39/block/blk-iopoll.c
---- linux-2.6.32.39/block/blk-iopoll.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/blk-iopoll.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/block/blk-iopoll.c linux-2.6.32.40/block/blk-iopoll.c
+--- linux-2.6.32.40/block/blk-iopoll.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/blk-iopoll.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -21408,9 +22377,9 @@ diff -urNp linux-2.6.32.39/block/blk-iopoll.c linux-2.6.32.39/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.32.39/block/blk-map.c linux-2.6.32.39/block/blk-map.c
---- linux-2.6.32.39/block/blk-map.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/blk-map.c	2011-04-18 16:57:33.000000000 -0400
+diff -urNp linux-2.6.32.40/block/blk-map.c linux-2.6.32.40/block/blk-map.c
+--- linux-2.6.32.40/block/blk-map.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/blk-map.c	2011-04-18 16:57:33.000000000 -0400
 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
  	 * direct dma. else, set up kernel bounce buffers
  	 */
@@ -21445,9 +22414,9 @@ diff -urNp linux-2.6.32.39/block/blk-map.c linux-2.6.32.39/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-2.6.32.39/block/blk-softirq.c linux-2.6.32.39/block/blk-softirq.c
---- linux-2.6.32.39/block/blk-softirq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/blk-softirq.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/block/blk-softirq.c linux-2.6.32.40/block/blk-softirq.c
+--- linux-2.6.32.40/block/blk-softirq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/blk-softirq.c	2011-04-17 15:56:46.000000000 -0400
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -21457,9 +22426,9 @@ diff -urNp linux-2.6.32.39/block/blk-softirq.c linux-2.6.32.39/block/blk-softirq
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.32.39/block/blk-sysfs.c linux-2.6.32.39/block/blk-sysfs.c
---- linux-2.6.32.39/block/blk-sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/blk-sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/block/blk-sysfs.c linux-2.6.32.40/block/blk-sysfs.c
+--- linux-2.6.32.40/block/blk-sysfs.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/block/blk-sysfs.c	2011-05-10 22:12:26.000000000 -0400
 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
  	kmem_cache_free(blk_requestq_cachep, q);
  }
@@ -21469,9 +22438,9 @@ diff -urNp linux-2.6.32.39/block/blk-sysfs.c linux-2.6.32.39/block/blk-sysfs.c
  	.show	= queue_attr_show,
  	.store	= queue_attr_store,
  };
-diff -urNp linux-2.6.32.39/block/bsg.c linux-2.6.32.39/block/bsg.c
---- linux-2.6.32.39/block/bsg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/bsg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/block/bsg.c linux-2.6.32.40/block/bsg.c
+--- linux-2.6.32.40/block/bsg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/bsg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
  				struct sg_io_v4 *hdr, struct bsg_device *bd,
  				fmode_t has_write_perm)
@@ -21499,9 +22468,9 @@ diff -urNp linux-2.6.32.39/block/bsg.c linux-2.6.32.39/block/bsg.c
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-diff -urNp linux-2.6.32.39/block/elevator.c linux-2.6.32.39/block/elevator.c
---- linux-2.6.32.39/block/elevator.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/elevator.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/block/elevator.c linux-2.6.32.40/block/elevator.c
+--- linux-2.6.32.40/block/elevator.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/elevator.c	2011-04-17 15:56:46.000000000 -0400
 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
  	return error;
  }
@@ -21511,9 +22480,9 @@ diff -urNp linux-2.6.32.39/block/elevator.c linux-2.6.32.39/block/elevator.c
  	.show	= elv_attr_show,
  	.store	= elv_attr_store,
  };
-diff -urNp linux-2.6.32.39/block/scsi_ioctl.c linux-2.6.32.39/block/scsi_ioctl.c
---- linux-2.6.32.39/block/scsi_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/block/scsi_ioctl.c	2011-04-23 13:28:22.000000000 -0400
+diff -urNp linux-2.6.32.40/block/scsi_ioctl.c linux-2.6.32.40/block/scsi_ioctl.c
+--- linux-2.6.32.40/block/scsi_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/block/scsi_ioctl.c	2011-04-23 13:28:22.000000000 -0400
 @@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -21565,9 +22534,9 @@ diff -urNp linux-2.6.32.39/block/scsi_ioctl.c linux-2.6.32.39/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-2.6.32.39/Documentation/dontdiff linux-2.6.32.39/Documentation/dontdiff
---- linux-2.6.32.39/Documentation/dontdiff	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/Documentation/dontdiff	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/Documentation/dontdiff linux-2.6.32.40/Documentation/dontdiff
+--- linux-2.6.32.40/Documentation/dontdiff	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/Documentation/dontdiff	2011-04-17 15:56:45.000000000 -0400
 @@ -3,6 +3,7 @@
  *.bin
  *.cpio
@@ -21685,9 +22654,9 @@ diff -urNp linux-2.6.32.39/Documentation/dontdiff linux-2.6.32.39/Documentation/
  zImage*
  zconf.hash.c
 +zoffset.h
-diff -urNp linux-2.6.32.39/Documentation/kernel-parameters.txt linux-2.6.32.39/Documentation/kernel-parameters.txt
---- linux-2.6.32.39/Documentation/kernel-parameters.txt	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/Documentation/kernel-parameters.txt	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.40/Documentation/kernel-parameters.txt linux-2.6.32.40/Documentation/kernel-parameters.txt
+--- linux-2.6.32.40/Documentation/kernel-parameters.txt	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/Documentation/kernel-parameters.txt	2011-04-17 15:56:45.000000000 -0400
 @@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. 
  			the specified number of seconds.  This is to be used if
  			your oopses keep scrolling off the screen.
@@ -21702,9 +22671,9 @@ diff -urNp linux-2.6.32.39/Documentation/kernel-parameters.txt linux-2.6.32.39/D
  	pcbit=		[HW,ISDN]
  
  	pcd.		[PARIDE]
-diff -urNp linux-2.6.32.39/drivers/acpi/acpi_pad.c linux-2.6.32.39/drivers/acpi/acpi_pad.c
---- linux-2.6.32.39/drivers/acpi/acpi_pad.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/acpi_pad.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/acpi_pad.c linux-2.6.32.40/drivers/acpi/acpi_pad.c
+--- linux-2.6.32.40/drivers/acpi/acpi_pad.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/acpi_pad.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
@@ -21714,9 +22683,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/acpi_pad.c linux-2.6.32.39/drivers/acpi/
  #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
  #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
  static DEFINE_MUTEX(isolated_cpus_lock);
-diff -urNp linux-2.6.32.39/drivers/acpi/battery.c linux-2.6.32.39/drivers/acpi/battery.c
---- linux-2.6.32.39/drivers/acpi/battery.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/battery.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/battery.c linux-2.6.32.40/drivers/acpi/battery.c
+--- linux-2.6.32.40/drivers/acpi/battery.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/battery.c	2011-04-17 15:56:46.000000000 -0400
 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
  	}
  
@@ -21726,9 +22695,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/battery.c linux-2.6.32.39/drivers/acpi/b
  	mode_t mode;
  	const char *name;
  } acpi_battery_file[] = {
-diff -urNp linux-2.6.32.39/drivers/acpi/dock.c linux-2.6.32.39/drivers/acpi/dock.c
---- linux-2.6.32.39/drivers/acpi/dock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/dock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/dock.c linux-2.6.32.40/drivers/acpi/dock.c
+--- linux-2.6.32.40/drivers/acpi/dock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/dock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ struct dock_dependent_device {
  	struct list_head list;
  	struct list_head hotplug_list;
@@ -21747,9 +22716,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/dock.c linux-2.6.32.39/drivers/acpi/dock
  			     void *context)
  {
  	struct dock_dependent_device *dd;
-diff -urNp linux-2.6.32.39/drivers/acpi/osl.c linux-2.6.32.39/drivers/acpi/osl.c
---- linux-2.6.32.39/drivers/acpi/osl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/osl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/osl.c linux-2.6.32.40/drivers/acpi/osl.c
+--- linux-2.6.32.40/drivers/acpi/osl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/osl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
  	void __iomem *virt_addr;
  
@@ -21768,9 +22737,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/osl.c linux-2.6.32.39/drivers/acpi/osl.c
  
  	switch (width) {
  	case 8:
-diff -urNp linux-2.6.32.39/drivers/acpi/power_meter.c linux-2.6.32.39/drivers/acpi/power_meter.c
---- linux-2.6.32.39/drivers/acpi/power_meter.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/power_meter.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/power_meter.c linux-2.6.32.40/drivers/acpi/power_meter.c
+--- linux-2.6.32.40/drivers/acpi/power_meter.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/power_meter.c	2011-04-17 15:56:46.000000000 -0400
 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
  		return res;
  
@@ -21780,9 +22749,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/power_meter.c linux-2.6.32.39/drivers/ac
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.32.39/drivers/acpi/proc.c linux-2.6.32.39/drivers/acpi/proc.c
---- linux-2.6.32.39/drivers/acpi/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/proc.c linux-2.6.32.40/drivers/acpi/proc.c
+--- linux-2.6.32.40/drivers/acpi/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
@@ -21818,9 +22787,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/proc.c linux-2.6.32.39/drivers/acpi/proc
  			dev->wakeup.state.enabled =
  			    dev->wakeup.state.enabled ? 0 : 1;
  			found_dev = dev;
-diff -urNp linux-2.6.32.39/drivers/acpi/processor_core.c linux-2.6.32.39/drivers/acpi/processor_core.c
---- linux-2.6.32.39/drivers/acpi/processor_core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/processor_core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/processor_core.c linux-2.6.32.40/drivers/acpi/processor_core.c
+--- linux-2.6.32.40/drivers/acpi/processor_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/processor_core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  	}
@@ -21830,9 +22799,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/processor_core.c linux-2.6.32.39/drivers
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-2.6.32.39/drivers/acpi/sbshc.c linux-2.6.32.39/drivers/acpi/sbshc.c
---- linux-2.6.32.39/drivers/acpi/sbshc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/sbshc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/sbshc.c linux-2.6.32.40/drivers/acpi/sbshc.c
+--- linux-2.6.32.40/drivers/acpi/sbshc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/sbshc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -17,7 +17,7 @@
  
  #define PREFIX "ACPI: "
@@ -21842,9 +22811,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/sbshc.c linux-2.6.32.39/drivers/acpi/sbs
  #define ACPI_SMB_HC_DEVICE_NAME	"ACPI SMBus HC"
  
  struct acpi_smb_hc {
-diff -urNp linux-2.6.32.39/drivers/acpi/sleep.c linux-2.6.32.39/drivers/acpi/sleep.c
---- linux-2.6.32.39/drivers/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/sleep.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/sleep.c linux-2.6.32.40/drivers/acpi/sleep.c
+--- linux-2.6.32.40/drivers/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/sleep.c	2011-04-17 15:56:46.000000000 -0400
 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
  	}
  }
@@ -21881,9 +22850,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/sleep.c linux-2.6.32.39/drivers/acpi/sle
  	.begin = acpi_hibernation_begin_old,
  	.end = acpi_pm_end,
  	.pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.32.39/drivers/acpi/video.c linux-2.6.32.39/drivers/acpi/video.c
---- linux-2.6.32.39/drivers/acpi/video.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/acpi/video.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/acpi/video.c linux-2.6.32.40/drivers/acpi/video.c
+--- linux-2.6.32.40/drivers/acpi/video.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/acpi/video.c	2011-04-17 15:56:46.000000000 -0400
 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
  				vd->brightness->levels[request_level]);
  }
@@ -21893,9 +22862,9 @@ diff -urNp linux-2.6.32.39/drivers/acpi/video.c linux-2.6.32.39/drivers/acpi/vid
  	.get_brightness = acpi_video_get_brightness,
  	.update_status  = acpi_video_set_brightness,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/ahci.c linux-2.6.32.39/drivers/ata/ahci.c
---- linux-2.6.32.39/drivers/ata/ahci.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/ahci.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/ahci.c linux-2.6.32.40/drivers/ata/ahci.c
+--- linux-2.6.32.40/drivers/ata/ahci.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/ahci.c	2011-04-23 12:56:10.000000000 -0400
 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
  	.sdev_attrs		= ahci_sdev_attrs,
  };
@@ -21926,9 +22895,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/ahci.c linux-2.6.32.39/drivers/ata/ahci.c
  	.inherits		= &ahci_ops,
  	.softreset		= ahci_sb600_softreset,
  	.pmp_softreset		= ahci_sb600_softreset,
-diff -urNp linux-2.6.32.39/drivers/ata/ata_generic.c linux-2.6.32.39/drivers/ata/ata_generic.c
---- linux-2.6.32.39/drivers/ata/ata_generic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/ata_generic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/ata_generic.c linux-2.6.32.40/drivers/ata/ata_generic.c
+--- linux-2.6.32.40/drivers/ata/ata_generic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/ata_generic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ static struct scsi_host_template generic
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21938,9 +22907,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/ata_generic.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_unknown,
  	.set_mode	= generic_set_mode,
-diff -urNp linux-2.6.32.39/drivers/ata/ata_piix.c linux-2.6.32.39/drivers/ata/ata_piix.c
---- linux-2.6.32.39/drivers/ata/ata_piix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/ata_piix.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/ata_piix.c linux-2.6.32.40/drivers/ata/ata_piix.c
+--- linux-2.6.32.40/drivers/ata/ata_piix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/ata_piix.c	2011-04-23 12:56:10.000000000 -0400
 @@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -21977,9 +22946,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/ata_piix.c linux-2.6.32.39/drivers/ata/at
  	.inherits		= &piix_sata_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= piix_sidpr_scr_read,
-diff -urNp linux-2.6.32.39/drivers/ata/libata-acpi.c linux-2.6.32.39/drivers/ata/libata-acpi.c
---- linux-2.6.32.39/drivers/ata/libata-acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/libata-acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/libata-acpi.c linux-2.6.32.40/drivers/ata/libata-acpi.c
+--- linux-2.6.32.40/drivers/ata/libata-acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/libata-acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
  	ata_acpi_uevent(dev->link->ap, dev, event);
  }
@@ -21995,9 +22964,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/libata-acpi.c linux-2.6.32.39/drivers/ata
  	.handler = ata_acpi_ap_notify_dock,
  	.uevent = ata_acpi_ap_uevent,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/libata-core.c linux-2.6.32.39/drivers/ata/libata-core.c
---- linux-2.6.32.39/drivers/ata/libata-core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/libata-core.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/libata-core.c linux-2.6.32.40/drivers/ata/libata-core.c
+--- linux-2.6.32.40/drivers/ata/libata-core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/libata-core.c	2011-04-23 12:56:10.000000000 -0400
 @@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
@@ -22062,9 +23031,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/libata-core.c linux-2.6.32.39/drivers/ata
  	.qc_prep		= ata_noop_qc_prep,
  	.qc_issue		= ata_dummy_qc_issue,
  	.error_handler		= ata_dummy_error_handler,
-diff -urNp linux-2.6.32.39/drivers/ata/libata-eh.c linux-2.6.32.39/drivers/ata/libata-eh.c
---- linux-2.6.32.39/drivers/ata/libata-eh.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/libata-eh.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/libata-eh.c linux-2.6.32.40/drivers/ata/libata-eh.c
+--- linux-2.6.32.40/drivers/ata/libata-eh.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/libata-eh.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
   */
  void ata_std_error_handler(struct ata_port *ap)
@@ -22074,9 +23043,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/libata-eh.c linux-2.6.32.39/drivers/ata/l
  	ata_reset_fn_t hardreset = ops->hardreset;
  
  	/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.32.39/drivers/ata/libata-pmp.c linux-2.6.32.39/drivers/ata/libata-pmp.c
---- linux-2.6.32.39/drivers/ata/libata-pmp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/libata-pmp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/libata-pmp.c linux-2.6.32.40/drivers/ata/libata-pmp.c
+--- linux-2.6.32.40/drivers/ata/libata-pmp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/libata-pmp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
   */
  static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -22086,9 +23055,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/libata-pmp.c linux-2.6.32.39/drivers/ata/
  	int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
  	struct ata_link *pmp_link = &ap->link;
  	struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.32.39/drivers/ata/pata_acpi.c linux-2.6.32.39/drivers/ata/pata_acpi.c
---- linux-2.6.32.39/drivers/ata/pata_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_acpi.c linux-2.6.32.40/drivers/ata/pata_acpi.c
+--- linux-2.6.32.40/drivers/ata/pata_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22098,9 +23067,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_acpi.c linux-2.6.32.39/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= pacpi_qc_issue,
  	.cable_detect		= pacpi_cable_detect,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_ali.c linux-2.6.32.39/drivers/ata/pata_ali.c
---- linux-2.6.32.39/drivers/ata/pata_ali.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_ali.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_ali.c linux-2.6.32.40/drivers/ata/pata_ali.c
+--- linux-2.6.32.40/drivers/ata/pata_ali.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_ali.c	2011-04-17 15:56:46.000000000 -0400
 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
   *	Port operations for PIO only ALi
   */
@@ -22146,9 +23115,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_ali.c linux-2.6.32.39/drivers/ata/pa
  	.inherits	= &ali_dma_base_ops,
  	.check_atapi_dma = ali_check_atapi_dma,
  	.dev_config	= ali_warn_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_amd.c linux-2.6.32.39/drivers/ata/pata_amd.c
---- linux-2.6.32.39/drivers/ata/pata_amd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_amd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_amd.c linux-2.6.32.40/drivers/ata/pata_amd.c
+--- linux-2.6.32.40/drivers/ata/pata_amd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_amd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -397,28 +397,28 @@ static const struct ata_port_operations 
  	.prereset	= amd_pre_reset,
  };
@@ -22198,9 +23167,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_amd.c linux-2.6.32.39/drivers/ata/pa
  	.inherits	= &nv_base_port_ops,
  	.set_piomode	= nv133_set_piomode,
  	.set_dmamode	= nv133_set_dmamode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_artop.c linux-2.6.32.39/drivers/ata/pata_artop.c
---- linux-2.6.32.39/drivers/ata/pata_artop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_artop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_artop.c linux-2.6.32.40/drivers/ata/pata_artop.c
+--- linux-2.6.32.40/drivers/ata/pata_artop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_artop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22219,9 +23188,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_artop.c linux-2.6.32.39/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= artop6260_cable_detect,
  	.set_piomode		= artop6260_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_at32.c linux-2.6.32.39/drivers/ata/pata_at32.c
---- linux-2.6.32.39/drivers/ata/pata_at32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_at32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_at32.c linux-2.6.32.40/drivers/ata/pata_at32.c
+--- linux-2.6.32.40/drivers/ata/pata_at32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_at32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22231,9 +23200,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_at32.c linux-2.6.32.39/drivers/ata/p
  	.inherits		= &ata_sff_port_ops,
  	.cable_detect		= ata_cable_40wire,
  	.set_piomode		= pata_at32_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_at91.c linux-2.6.32.39/drivers/ata/pata_at91.c
---- linux-2.6.32.39/drivers/ata/pata_at91.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_at91.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_at91.c linux-2.6.32.40/drivers/ata/pata_at91.c
+--- linux-2.6.32.40/drivers/ata/pata_at91.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_at91.c	2011-04-17 15:56:46.000000000 -0400
 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22243,9 +23212,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_at91.c linux-2.6.32.39/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  
  	.sff_data_xfer	= pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_atiixp.c linux-2.6.32.39/drivers/ata/pata_atiixp.c
---- linux-2.6.32.39/drivers/ata/pata_atiixp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_atiixp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_atiixp.c linux-2.6.32.40/drivers/ata/pata_atiixp.c
+--- linux-2.6.32.40/drivers/ata/pata_atiixp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_atiixp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
@@ -22255,9 +23224,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_atiixp.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.qc_prep 	= ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_atp867x.c linux-2.6.32.39/drivers/ata/pata_atp867x.c
---- linux-2.6.32.39/drivers/ata/pata_atp867x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_atp867x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_atp867x.c linux-2.6.32.40/drivers/ata/pata_atp867x.c
+--- linux-2.6.32.40/drivers/ata/pata_atp867x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_atp867x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22267,9 +23236,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_atp867x.c linux-2.6.32.39/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= atp867x_cable_detect,
  	.set_piomode		= atp867x_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_bf54x.c linux-2.6.32.39/drivers/ata/pata_bf54x.c
---- linux-2.6.32.39/drivers/ata/pata_bf54x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_bf54x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_bf54x.c linux-2.6.32.40/drivers/ata/pata_bf54x.c
+--- linux-2.6.32.40/drivers/ata/pata_bf54x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_bf54x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -22279,9 +23248,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_bf54x.c linux-2.6.32.39/drivers/ata/
  	.inherits		= &ata_sff_port_ops,
  
  	.set_piomode		= bfin_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd640.c linux-2.6.32.39/drivers/ata/pata_cmd640.c
---- linux-2.6.32.39/drivers/ata/pata_cmd640.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cmd640.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cmd640.c linux-2.6.32.40/drivers/ata/pata_cmd640.c
+--- linux-2.6.32.40/drivers/ata/pata_cmd640.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cmd640.c	2011-04-17 15:56:46.000000000 -0400
 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22291,9 +23260,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd640.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	/* In theory xfer_noirq is not needed once we kill the prefetcher */
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd64x.c linux-2.6.32.39/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.39/drivers/ata/pata_cmd64x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cmd64x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cmd64x.c linux-2.6.32.40/drivers/ata/pata_cmd64x.c
+--- linux-2.6.32.40/drivers/ata/pata_cmd64x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cmd64x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -275,18 +275,18 @@ static const struct ata_port_operations 
  	.set_dmamode	= cmd64x_set_dmamode,
  };
@@ -22316,9 +23285,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cmd64x.c linux-2.6.32.39/drivers/ata
  	.inherits	= &cmd64x_base_ops,
  	.bmdma_stop	= cmd648_bmdma_stop,
  	.cable_detect	= cmd648_cable_detect,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5520.c linux-2.6.32.39/drivers/ata/pata_cs5520.c
---- linux-2.6.32.39/drivers/ata/pata_cs5520.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cs5520.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cs5520.c linux-2.6.32.40/drivers/ata/pata_cs5520.c
+--- linux-2.6.32.40/drivers/ata/pata_cs5520.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cs5520.c	2011-04-17 15:56:46.000000000 -0400
 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
@@ -22328,9 +23297,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5520.c linux-2.6.32.39/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_prep		= ata_sff_dumb_qc_prep,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5530.c linux-2.6.32.39/drivers/ata/pata_cs5530.c
---- linux-2.6.32.39/drivers/ata/pata_cs5530.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cs5530.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cs5530.c linux-2.6.32.40/drivers/ata/pata_cs5530.c
+--- linux-2.6.32.40/drivers/ata/pata_cs5530.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cs5530.c	2011-04-17 15:56:46.000000000 -0400
 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
@@ -22340,9 +23309,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5530.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.qc_prep 	= ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5535.c linux-2.6.32.39/drivers/ata/pata_cs5535.c
---- linux-2.6.32.39/drivers/ata/pata_cs5535.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cs5535.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cs5535.c linux-2.6.32.40/drivers/ata/pata_cs5535.c
+--- linux-2.6.32.40/drivers/ata/pata_cs5535.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cs5535.c	2011-04-17 15:56:46.000000000 -0400
 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22352,9 +23321,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5535.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= cs5535_cable_detect,
  	.set_piomode	= cs5535_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5536.c linux-2.6.32.39/drivers/ata/pata_cs5536.c
---- linux-2.6.32.39/drivers/ata/pata_cs5536.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cs5536.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cs5536.c linux-2.6.32.40/drivers/ata/pata_cs5536.c
+--- linux-2.6.32.40/drivers/ata/pata_cs5536.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cs5536.c	2011-04-17 15:56:46.000000000 -0400
 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22364,9 +23333,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cs5536.c linux-2.6.32.39/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= cs5536_cable_detect,
  	.set_piomode		= cs5536_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_cypress.c linux-2.6.32.39/drivers/ata/pata_cypress.c
---- linux-2.6.32.39/drivers/ata/pata_cypress.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_cypress.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_cypress.c linux-2.6.32.40/drivers/ata/pata_cypress.c
+--- linux-2.6.32.40/drivers/ata/pata_cypress.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_cypress.c	2011-04-17 15:56:46.000000000 -0400
 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22376,9 +23345,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_cypress.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= cy82c693_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_efar.c linux-2.6.32.39/drivers/ata/pata_efar.c
---- linux-2.6.32.39/drivers/ata/pata_efar.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_efar.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_efar.c linux-2.6.32.40/drivers/ata/pata_efar.c
+--- linux-2.6.32.40/drivers/ata/pata_efar.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_efar.c	2011-04-17 15:56:46.000000000 -0400
 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22388,9 +23357,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_efar.c linux-2.6.32.39/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= efar_cable_detect,
  	.set_piomode		= efar_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt366.c linux-2.6.32.39/drivers/ata/pata_hpt366.c
---- linux-2.6.32.39/drivers/ata/pata_hpt366.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_hpt366.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_hpt366.c linux-2.6.32.40/drivers/ata/pata_hpt366.c
+--- linux-2.6.32.40/drivers/ata/pata_hpt366.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_hpt366.c	2011-04-17 15:56:46.000000000 -0400
 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
   *	Configuration for HPT366/68
   */
@@ -22400,9 +23369,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt366.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= hpt36x_cable_detect,
  	.mode_filter	= hpt366_filter,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt37x.c linux-2.6.32.39/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.39/drivers/ata/pata_hpt37x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_hpt37x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_hpt37x.c linux-2.6.32.40/drivers/ata/pata_hpt37x.c
+--- linux-2.6.32.40/drivers/ata/pata_hpt37x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_hpt37x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
   *	Configuration for HPT370
   */
@@ -22439,9 +23408,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt37x.c linux-2.6.32.39/drivers/ata
  	.inherits	= &hpt372_port_ops,
  	.prereset	= hpt374_fn1_pre_reset,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_hpt3x2n.c linux-2.6.32.40/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.32.40/drivers/ata/pata_hpt3x2n.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_hpt3x2n.c	2011-04-17 15:56:46.000000000 -0400
 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
   *	Configuration for HPT3x2n.
   */
@@ -22451,9 +23420,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x2n.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  
  	.bmdma_stop	= hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x3.c linux-2.6.32.39/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.39/drivers/ata/pata_hpt3x3.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_hpt3x3.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_hpt3x3.c linux-2.6.32.40/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.32.40/drivers/ata/pata_hpt3x3.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_hpt3x3.c	2011-04-17 15:56:46.000000000 -0400
 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22463,9 +23432,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_hpt3x3.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= hpt3x3_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_icside.c linux-2.6.32.39/drivers/ata/pata_icside.c
---- linux-2.6.32.39/drivers/ata/pata_icside.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_icside.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_icside.c linux-2.6.32.40/drivers/ata/pata_icside.c
+--- linux-2.6.32.40/drivers/ata/pata_icside.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_icside.c	2011-04-17 15:56:46.000000000 -0400
 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
  	}
  }
@@ -22475,9 +23444,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_icside.c linux-2.6.32.39/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	/* no need to build any PRD tables for DMA */
  	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_isapnp.c linux-2.6.32.39/drivers/ata/pata_isapnp.c
---- linux-2.6.32.39/drivers/ata/pata_isapnp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_isapnp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_isapnp.c linux-2.6.32.40/drivers/ata/pata_isapnp.c
+--- linux-2.6.32.40/drivers/ata/pata_isapnp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_isapnp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22493,9 +23462,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_isapnp.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.32.39/drivers/ata/pata_it8213.c linux-2.6.32.39/drivers/ata/pata_it8213.c
---- linux-2.6.32.39/drivers/ata/pata_it8213.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_it8213.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_it8213.c linux-2.6.32.40/drivers/ata/pata_it8213.c
+--- linux-2.6.32.40/drivers/ata/pata_it8213.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_it8213.c	2011-04-17 15:56:46.000000000 -0400
 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
  };
  
@@ -22505,9 +23474,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_it8213.c linux-2.6.32.39/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= it8213_cable_detect,
  	.set_piomode		= it8213_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_it821x.c linux-2.6.32.39/drivers/ata/pata_it821x.c
---- linux-2.6.32.39/drivers/ata/pata_it821x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_it821x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_it821x.c linux-2.6.32.40/drivers/ata/pata_it821x.c
+--- linux-2.6.32.40/drivers/ata/pata_it821x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_it821x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22535,9 +23504,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_it821x.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.40/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.32.40/drivers/ata/pata_ixp4xx_cf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_ixp4xx_cf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22547,9 +23516,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.39/drivers/
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ixp4xx_mmio_data_xfer,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_jmicron.c linux-2.6.32.39/drivers/ata/pata_jmicron.c
---- linux-2.6.32.39/drivers/ata/pata_jmicron.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_jmicron.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_jmicron.c linux-2.6.32.40/drivers/ata/pata_jmicron.c
+--- linux-2.6.32.40/drivers/ata/pata_jmicron.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_jmicron.c	2011-04-17 15:56:46.000000000 -0400
 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22559,9 +23528,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_jmicron.c linux-2.6.32.39/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= jmicron_pre_reset,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/pata_legacy.c linux-2.6.32.39/drivers/ata/pata_legacy.c
---- linux-2.6.32.39/drivers/ata/pata_legacy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_legacy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_legacy.c linux-2.6.32.40/drivers/ata/pata_legacy.c
+--- linux-2.6.32.40/drivers/ata/pata_legacy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_legacy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -106,7 +106,7 @@ struct legacy_probe {
  
  struct legacy_controller {
@@ -22673,9 +23642,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_legacy.c linux-2.6.32.39/drivers/ata
  	struct legacy_data *ld = &legacy_data[probe->slot];
  	struct ata_host *host = NULL;
  	struct ata_port *ap;
-diff -urNp linux-2.6.32.39/drivers/ata/pata_marvell.c linux-2.6.32.39/drivers/ata/pata_marvell.c
---- linux-2.6.32.39/drivers/ata/pata_marvell.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_marvell.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_marvell.c linux-2.6.32.40/drivers/ata/pata_marvell.c
+--- linux-2.6.32.40/drivers/ata/pata_marvell.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_marvell.c	2011-04-17 15:56:46.000000000 -0400
 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22685,9 +23654,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_marvell.c linux-2.6.32.39/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= marvell_cable_detect,
  	.prereset		= marvell_pre_reset,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_mpc52xx.c linux-2.6.32.39/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.39/drivers/ata/pata_mpc52xx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_mpc52xx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_mpc52xx.c linux-2.6.32.40/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.32.40/drivers/ata/pata_mpc52xx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_mpc52xx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22697,9 +23666,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_mpc52xx.c linux-2.6.32.39/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_dev_select		= mpc52xx_ata_dev_select,
  	.set_piomode		= mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_mpiix.c linux-2.6.32.39/drivers/ata/pata_mpiix.c
---- linux-2.6.32.39/drivers/ata/pata_mpiix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_mpiix.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_mpiix.c linux-2.6.32.40/drivers/ata/pata_mpiix.c
+--- linux-2.6.32.40/drivers/ata/pata_mpiix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_mpiix.c	2011-04-17 15:56:46.000000000 -0400
 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22709,9 +23678,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_mpiix.c linux-2.6.32.39/drivers/ata/
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= mpiix_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_netcell.c linux-2.6.32.39/drivers/ata/pata_netcell.c
---- linux-2.6.32.39/drivers/ata/pata_netcell.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_netcell.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_netcell.c linux-2.6.32.40/drivers/ata/pata_netcell.c
+--- linux-2.6.32.40/drivers/ata/pata_netcell.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_netcell.c	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22721,9 +23690,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_netcell.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_80wire,
  	.read_id	= netcell_read_id,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_ninja32.c linux-2.6.32.39/drivers/ata/pata_ninja32.c
---- linux-2.6.32.39/drivers/ata/pata_ninja32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_ninja32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_ninja32.c linux-2.6.32.40/drivers/ata/pata_ninja32.c
+--- linux-2.6.32.40/drivers/ata/pata_ninja32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_ninja32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22733,9 +23702,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_ninja32.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.sff_dev_select = ninja32_dev_select,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87410.c linux-2.6.32.39/drivers/ata/pata_ns87410.c
---- linux-2.6.32.39/drivers/ata/pata_ns87410.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_ns87410.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_ns87410.c linux-2.6.32.40/drivers/ata/pata_ns87410.c
+--- linux-2.6.32.40/drivers/ata/pata_ns87410.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_ns87410.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22745,9 +23714,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87410.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= ns87410_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87415.c linux-2.6.32.39/drivers/ata/pata_ns87415.c
---- linux-2.6.32.39/drivers/ata/pata_ns87415.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_ns87415.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_ns87415.c linux-2.6.32.40/drivers/ata/pata_ns87415.c
+--- linux-2.6.32.40/drivers/ata/pata_ns87415.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_ns87415.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
  }
  #endif		/* 87560 SuperIO Support */
@@ -22766,9 +23735,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_ns87415.c linux-2.6.32.39/drivers/at
  	.inherits		= &ns87415_pata_ops,
  	.sff_tf_read		= ns87560_tf_read,
  	.sff_check_status	= ns87560_check_status,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_octeon_cf.c linux-2.6.32.39/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.39/drivers/ata/pata_octeon_cf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_octeon_cf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_octeon_cf.c linux-2.6.32.40/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.32.40/drivers/ata/pata_octeon_cf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_octeon_cf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
  	return 0;
  }
@@ -22777,9 +23746,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_octeon_cf.c linux-2.6.32.39/drivers/
  static struct ata_port_operations octeon_cf_ops = {
  	.inherits		= &ata_sff_port_ops,
  	.check_atapi_dma	= octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_oldpiix.c linux-2.6.32.39/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.39/drivers/ata/pata_oldpiix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_oldpiix.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_oldpiix.c linux-2.6.32.40/drivers/ata/pata_oldpiix.c
+--- linux-2.6.32.40/drivers/ata/pata_oldpiix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_oldpiix.c	2011-04-17 15:56:46.000000000 -0400
 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22789,9 +23758,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_oldpiix.c linux-2.6.32.39/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= oldpiix_qc_issue,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_opti.c linux-2.6.32.39/drivers/ata/pata_opti.c
---- linux-2.6.32.39/drivers/ata/pata_opti.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_opti.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_opti.c linux-2.6.32.40/drivers/ata/pata_opti.c
+--- linux-2.6.32.40/drivers/ata/pata_opti.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_opti.c	2011-04-17 15:56:46.000000000 -0400
 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22801,9 +23770,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_opti.c linux-2.6.32.39/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= opti_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_optidma.c linux-2.6.32.39/drivers/ata/pata_optidma.c
---- linux-2.6.32.39/drivers/ata/pata_optidma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_optidma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_optidma.c linux-2.6.32.40/drivers/ata/pata_optidma.c
+--- linux-2.6.32.40/drivers/ata/pata_optidma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_optidma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22822,9 +23791,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_optidma.c linux-2.6.32.39/drivers/at
  	.inherits	= &optidma_port_ops,
  	.set_piomode	= optiplus_set_pio_mode,
  	.set_dmamode	= optiplus_set_dma_mode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_palmld.c linux-2.6.32.39/drivers/ata/pata_palmld.c
---- linux-2.6.32.39/drivers/ata/pata_palmld.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_palmld.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_palmld.c linux-2.6.32.40/drivers/ata/pata_palmld.c
+--- linux-2.6.32.40/drivers/ata/pata_palmld.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_palmld.c	2011-04-17 15:56:46.000000000 -0400
 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22834,9 +23803,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_palmld.c linux-2.6.32.39/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_pcmcia.c linux-2.6.32.39/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.39/drivers/ata/pata_pcmcia.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_pcmcia.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_pcmcia.c linux-2.6.32.40/drivers/ata/pata_pcmcia.c
+--- linux-2.6.32.40/drivers/ata/pata_pcmcia.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_pcmcia.c	2011-04-17 15:56:46.000000000 -0400
 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22863,9 +23832,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_pcmcia.c linux-2.6.32.39/drivers/ata
  
  	info = kzalloc(sizeof(*info), GFP_KERNEL);
  	if (info == NULL)
-diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc2027x.c linux-2.6.32.39/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.39/drivers/ata/pata_pdc2027x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_pdc2027x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_pdc2027x.c linux-2.6.32.40/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.32.40/drivers/ata/pata_pdc2027x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_pdc2027x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22883,9 +23852,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc2027x.c linux-2.6.32.39/drivers/a
  	.inherits		= &pdc2027x_pata100_ops,
  	.mode_filter		= pdc2027x_mode_filter,
  	.set_piomode		= pdc2027x_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.40/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.32.40/drivers/ata/pata_pdc202xx_old.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_pdc202xx_old.c	2011-04-17 15:56:46.000000000 -0400
 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22904,9 +23873,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.39/drive
  	.inherits		= &pdc2024x_port_ops,
  
  	.check_atapi_dma	= pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_platform.c linux-2.6.32.39/drivers/ata/pata_platform.c
---- linux-2.6.32.39/drivers/ata/pata_platform.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_platform.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_platform.c linux-2.6.32.40/drivers/ata/pata_platform.c
+--- linux-2.6.32.40/drivers/ata/pata_platform.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_platform.c	2011-04-17 15:56:46.000000000 -0400
 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22916,9 +23885,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_platform.c linux-2.6.32.39/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_qdi.c linux-2.6.32.39/drivers/ata/pata_qdi.c
---- linux-2.6.32.39/drivers/ata/pata_qdi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_qdi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_qdi.c linux-2.6.32.40/drivers/ata/pata_qdi.c
+--- linux-2.6.32.40/drivers/ata/pata_qdi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_qdi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22937,9 +23906,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_qdi.c linux-2.6.32.39/drivers/ata/pa
  	.inherits	= &qdi6500_port_ops,
  	.set_piomode	= qdi6580_set_piomode,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/pata_radisys.c linux-2.6.32.39/drivers/ata/pata_radisys.c
---- linux-2.6.32.39/drivers/ata/pata_radisys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_radisys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_radisys.c linux-2.6.32.40/drivers/ata/pata_radisys.c
+--- linux-2.6.32.40/drivers/ata/pata_radisys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_radisys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22949,9 +23918,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_radisys.c linux-2.6.32.39/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= radisys_qc_issue,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_rb532_cf.c linux-2.6.32.39/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.39/drivers/ata/pata_rb532_cf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_rb532_cf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_rb532_cf.c linux-2.6.32.40/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.32.40/drivers/ata/pata_rb532_cf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_rb532_cf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
  	return IRQ_HANDLED;
  }
@@ -22961,9 +23930,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_rb532_cf.c linux-2.6.32.39/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer32,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/pata_rdc.c linux-2.6.32.39/drivers/ata/pata_rdc.c
---- linux-2.6.32.39/drivers/ata/pata_rdc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_rdc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_rdc.c linux-2.6.32.40/drivers/ata/pata_rdc.c
+--- linux-2.6.32.40/drivers/ata/pata_rdc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_rdc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
  	pci_write_config_byte(dev, 0x48, udma_enable);
  }
@@ -22973,9 +23942,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_rdc.c linux-2.6.32.39/drivers/ata/pa
  	.inherits		= &ata_bmdma32_port_ops,
  	.cable_detect		= rdc_pata_cable_detect,
  	.set_piomode		= rdc_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_rz1000.c linux-2.6.32.39/drivers/ata/pata_rz1000.c
---- linux-2.6.32.39/drivers/ata/pata_rz1000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_rz1000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_rz1000.c linux-2.6.32.40/drivers/ata/pata_rz1000.c
+--- linux-2.6.32.40/drivers/ata/pata_rz1000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_rz1000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22985,9 +23954,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_rz1000.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_mode	= rz1000_set_mode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_sc1200.c linux-2.6.32.39/drivers/ata/pata_sc1200.c
---- linux-2.6.32.39/drivers/ata/pata_sc1200.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_sc1200.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_sc1200.c linux-2.6.32.40/drivers/ata/pata_sc1200.c
+--- linux-2.6.32.40/drivers/ata/pata_sc1200.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_sc1200.c	2011-04-17 15:56:46.000000000 -0400
 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
@@ -22997,9 +23966,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_sc1200.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_prep 	= ata_sff_dumb_qc_prep,
  	.qc_issue	= sc1200_qc_issue,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_scc.c linux-2.6.32.39/drivers/ata/pata_scc.c
---- linux-2.6.32.39/drivers/ata/pata_scc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_scc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_scc.c linux-2.6.32.40/drivers/ata/pata_scc.c
+--- linux-2.6.32.40/drivers/ata/pata_scc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_scc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23009,9 +23978,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_scc.c linux-2.6.32.39/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  
  	.set_piomode		= scc_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_sch.c linux-2.6.32.39/drivers/ata/pata_sch.c
---- linux-2.6.32.39/drivers/ata/pata_sch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_sch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_sch.c linux-2.6.32.40/drivers/ata/pata_sch.c
+--- linux-2.6.32.40/drivers/ata/pata_sch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_sch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23021,9 +23990,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_sch.c linux-2.6.32.39/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= ata_cable_unknown,
  	.set_piomode		= sch_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_serverworks.c linux-2.6.32.39/drivers/ata/pata_serverworks.c
---- linux-2.6.32.39/drivers/ata/pata_serverworks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_serverworks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_serverworks.c linux-2.6.32.40/drivers/ata/pata_serverworks.c
+--- linux-2.6.32.40/drivers/ata/pata_serverworks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_serverworks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23042,9 +24011,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_serverworks.c linux-2.6.32.39/driver
  	.inherits	= &serverworks_osb4_port_ops,
  	.mode_filter	= serverworks_csb_filter,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/pata_sil680.c linux-2.6.32.39/drivers/ata/pata_sil680.c
---- linux-2.6.32.39/drivers/ata/pata_sil680.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_sil680.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_sil680.c linux-2.6.32.40/drivers/ata/pata_sil680.c
+--- linux-2.6.32.40/drivers/ata/pata_sil680.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_sil680.c	2011-04-17 15:56:46.000000000 -0400
 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23054,9 +24023,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_sil680.c linux-2.6.32.39/drivers/ata
  	.inherits	= &ata_bmdma32_port_ops,
  	.cable_detect	= sil680_cable_detect,
  	.set_piomode	= sil680_set_piomode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_sis.c linux-2.6.32.39/drivers/ata/pata_sis.c
---- linux-2.6.32.39/drivers/ata/pata_sis.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_sis.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_sis.c linux-2.6.32.40/drivers/ata/pata_sis.c
+--- linux-2.6.32.40/drivers/ata/pata_sis.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_sis.c	2011-04-17 15:56:46.000000000 -0400
 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23112,9 +24081,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_sis.c linux-2.6.32.39/drivers/ata/pa
  	.inherits		= &sis_base_ops,
  	.set_piomode		= sis_old_set_piomode,
  	.set_dmamode		= sis_old_set_dmamode,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_sl82c105.c linux-2.6.32.39/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.39/drivers/ata/pata_sl82c105.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_sl82c105.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_sl82c105.c linux-2.6.32.40/drivers/ata/pata_sl82c105.c
+--- linux-2.6.32.40/drivers/ata/pata_sl82c105.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_sl82c105.c	2011-04-17 15:56:46.000000000 -0400
 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23124,9 +24093,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_sl82c105.c linux-2.6.32.39/drivers/a
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_defer	= sl82c105_qc_defer,
  	.bmdma_start 	= sl82c105_bmdma_start,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_triflex.c linux-2.6.32.39/drivers/ata/pata_triflex.c
---- linux-2.6.32.39/drivers/ata/pata_triflex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_triflex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_triflex.c linux-2.6.32.40/drivers/ata/pata_triflex.c
+--- linux-2.6.32.40/drivers/ata/pata_triflex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_triflex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23136,9 +24105,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_triflex.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.bmdma_start 	= triflex_bmdma_start,
  	.bmdma_stop	= triflex_bmdma_stop,
-diff -urNp linux-2.6.32.39/drivers/ata/pata_via.c linux-2.6.32.39/drivers/ata/pata_via.c
---- linux-2.6.32.39/drivers/ata/pata_via.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_via.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_via.c linux-2.6.32.40/drivers/ata/pata_via.c
+--- linux-2.6.32.40/drivers/ata/pata_via.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_via.c	2011-04-17 15:56:46.000000000 -0400
 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23157,9 +24126,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_via.c linux-2.6.32.39/drivers/ata/pa
  	.inherits	= &via_port_ops,
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
  };
-diff -urNp linux-2.6.32.39/drivers/ata/pata_winbond.c linux-2.6.32.39/drivers/ata/pata_winbond.c
---- linux-2.6.32.39/drivers/ata/pata_winbond.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pata_winbond.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pata_winbond.c linux-2.6.32.40/drivers/ata/pata_winbond.c
+--- linux-2.6.32.40/drivers/ata/pata_winbond.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pata_winbond.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23169,9 +24138,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pata_winbond.c linux-2.6.32.39/drivers/at
  	.inherits	= &ata_sff_port_ops,
  	.sff_data_xfer	= winbond_data_xfer,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.39/drivers/ata/pdc_adma.c linux-2.6.32.39/drivers/ata/pdc_adma.c
---- linux-2.6.32.39/drivers/ata/pdc_adma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/pdc_adma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/pdc_adma.c linux-2.6.32.40/drivers/ata/pdc_adma.c
+--- linux-2.6.32.40/drivers/ata/pdc_adma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/pdc_adma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
  	.dma_boundary		= ADMA_DMA_BOUNDARY,
  };
@@ -23181,9 +24150,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/pdc_adma.c linux-2.6.32.39/drivers/ata/pd
  	.inherits		= &ata_sff_port_ops,
  
  	.lost_interrupt		= ATA_OP_NULL,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_fsl.c linux-2.6.32.39/drivers/ata/sata_fsl.c
---- linux-2.6.32.39/drivers/ata/sata_fsl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_fsl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_fsl.c linux-2.6.32.40/drivers/ata/sata_fsl.c
+--- linux-2.6.32.40/drivers/ata/sata_fsl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_fsl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
  	.dma_boundary = ATA_DMA_BOUNDARY,
  };
@@ -23193,9 +24162,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_fsl.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_inic162x.c linux-2.6.32.39/drivers/ata/sata_inic162x.c
---- linux-2.6.32.39/drivers/ata/sata_inic162x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_inic162x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_inic162x.c linux-2.6.32.40/drivers/ata/sata_inic162x.c
+--- linux-2.6.32.40/drivers/ata/sata_inic162x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_inic162x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
  	return 0;
  }
@@ -23205,9 +24174,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_inic162x.c linux-2.6.32.39/drivers/a
  	.inherits		= &sata_port_ops,
  
  	.check_atapi_dma	= inic_check_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_mv.c linux-2.6.32.39/drivers/ata/sata_mv.c
---- linux-2.6.32.39/drivers/ata/sata_mv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_mv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_mv.c linux-2.6.32.40/drivers/ata/sata_mv.c
+--- linux-2.6.32.40/drivers/ata/sata_mv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_mv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
  	.dma_boundary		= MV_DMA_BOUNDARY,
  };
@@ -23235,9 +24204,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_mv.c linux-2.6.32.39/drivers/ata/sat
  	.inherits		= &mv6_ops,
  	.dev_config		= ATA_OP_NULL,
  	.qc_prep		= mv_qc_prep_iie,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_nv.c linux-2.6.32.39/drivers/ata/sata_nv.c
---- linux-2.6.32.39/drivers/ata/sata_nv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_nv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_nv.c linux-2.6.32.40/drivers/ata/sata_nv.c
+--- linux-2.6.32.40/drivers/ata/sata_nv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_nv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
   * cases.  Define nv_hardreset() which only kicks in for post-boot
   * probing and use it for all variants.
@@ -23280,9 +24249,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_nv.c linux-2.6.32.39/drivers/ata/sat
  	.inherits		= &nv_generic_ops,
  
  	.qc_defer		= ata_std_qc_defer,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_promise.c linux-2.6.32.39/drivers/ata/sata_promise.c
---- linux-2.6.32.39/drivers/ata/sata_promise.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_promise.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_promise.c linux-2.6.32.40/drivers/ata/sata_promise.c
+--- linux-2.6.32.40/drivers/ata/sata_promise.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_promise.c	2011-04-17 15:56:46.000000000 -0400
 @@ -195,7 +195,7 @@ static const struct ata_port_operations 
  	.error_handler		= pdc_error_handler,
  };
@@ -23309,9 +24278,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_promise.c linux-2.6.32.39/drivers/at
  	.inherits		= &pdc_common_ops,
  	.cable_detect		= pdc_pata_cable_detect,
  	.freeze			= pdc_freeze,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_qstor.c linux-2.6.32.39/drivers/ata/sata_qstor.c
---- linux-2.6.32.39/drivers/ata/sata_qstor.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_qstor.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_qstor.c linux-2.6.32.40/drivers/ata/sata_qstor.c
+--- linux-2.6.32.40/drivers/ata/sata_qstor.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_qstor.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
  	.dma_boundary		= QS_DMA_BOUNDARY,
  };
@@ -23321,9 +24290,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_qstor.c linux-2.6.32.39/drivers/ata/
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= qs_check_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_sil24.c linux-2.6.32.39/drivers/ata/sata_sil24.c
---- linux-2.6.32.39/drivers/ata/sata_sil24.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_sil24.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_sil24.c linux-2.6.32.40/drivers/ata/sata_sil24.c
+--- linux-2.6.32.40/drivers/ata/sata_sil24.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_sil24.c	2011-04-17 15:56:46.000000000 -0400
 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -23333,9 +24302,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_sil24.c linux-2.6.32.39/drivers/ata/
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer		= sil24_qc_defer,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_sil.c linux-2.6.32.39/drivers/ata/sata_sil.c
---- linux-2.6.32.39/drivers/ata/sata_sil.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_sil.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_sil.c linux-2.6.32.40/drivers/ata/sata_sil.c
+--- linux-2.6.32.40/drivers/ata/sata_sil.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_sil.c	2011-04-17 15:56:46.000000000 -0400
 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
  	.sg_tablesize		= ATA_MAX_PRD
  };
@@ -23345,9 +24314,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_sil.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &ata_bmdma32_port_ops,
  	.dev_config		= sil_dev_config,
  	.set_mode		= sil_set_mode,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_sis.c linux-2.6.32.39/drivers/ata/sata_sis.c
---- linux-2.6.32.39/drivers/ata/sata_sis.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_sis.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_sis.c linux-2.6.32.40/drivers/ata/sata_sis.c
+--- linux-2.6.32.40/drivers/ata/sata_sis.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_sis.c	2011-04-17 15:56:46.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23357,9 +24326,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_sis.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= sis_scr_read,
  	.scr_write		= sis_scr_write,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_svw.c linux-2.6.32.39/drivers/ata/sata_svw.c
---- linux-2.6.32.39/drivers/ata/sata_svw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_svw.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_svw.c linux-2.6.32.40/drivers/ata/sata_svw.c
+--- linux-2.6.32.40/drivers/ata/sata_svw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_svw.c	2011-04-17 15:56:46.000000000 -0400
 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
  };
  
@@ -23369,9 +24338,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_svw.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_tf_load		= k2_sata_tf_load,
  	.sff_tf_read		= k2_sata_tf_read,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_sx4.c linux-2.6.32.39/drivers/ata/sata_sx4.c
---- linux-2.6.32.39/drivers/ata/sata_sx4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_sx4.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_sx4.c linux-2.6.32.40/drivers/ata/sata_sx4.c
+--- linux-2.6.32.40/drivers/ata/sata_sx4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_sx4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
  };
  
@@ -23381,9 +24350,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_sx4.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= pdc_check_atapi_dma,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_uli.c linux-2.6.32.39/drivers/ata/sata_uli.c
---- linux-2.6.32.39/drivers/ata/sata_uli.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_uli.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_uli.c linux-2.6.32.40/drivers/ata/sata_uli.c
+--- linux-2.6.32.40/drivers/ata/sata_uli.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_uli.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23393,10 +24362,10 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_uli.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= uli_scr_read,
  	.scr_write		= uli_scr_write,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_via.c linux-2.6.32.39/drivers/ata/sata_via.c
---- linux-2.6.32.39/drivers/ata/sata_via.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_via.c	2011-04-17 15:56:46.000000000 -0400
-@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
+diff -urNp linux-2.6.32.40/drivers/ata/sata_via.c linux-2.6.32.40/drivers/ata/sata_via.c
+--- linux-2.6.32.40/drivers/ata/sata_via.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_via.c	2011-05-10 22:15:08.000000000 -0400
+@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
  
@@ -23411,6 +24380,7 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_via.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &svia_base_ops,
  	.freeze			= svia_noop_freeze,
  	.prereset		= vt6420_prereset,
+ 	.bmdma_start		= vt6420_bmdma_start,
  };
  
 -static struct ata_port_operations vt6421_pata_ops = {
@@ -23433,9 +24403,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_via.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &svia_base_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= vt8251_scr_read,
-diff -urNp linux-2.6.32.39/drivers/ata/sata_vsc.c linux-2.6.32.39/drivers/ata/sata_vsc.c
---- linux-2.6.32.39/drivers/ata/sata_vsc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ata/sata_vsc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ata/sata_vsc.c linux-2.6.32.40/drivers/ata/sata_vsc.c
+--- linux-2.6.32.40/drivers/ata/sata_vsc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ata/sata_vsc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
  };
  
@@ -23445,9 +24415,9 @@ diff -urNp linux-2.6.32.39/drivers/ata/sata_vsc.c linux-2.6.32.39/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	/* The IRQ handling is not quite standard SFF behaviour so we
  	   cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.32.39/drivers/atm/adummy.c linux-2.6.32.39/drivers/atm/adummy.c
---- linux-2.6.32.39/drivers/atm/adummy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/adummy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/adummy.c linux-2.6.32.40/drivers/atm/adummy.c
+--- linux-2.6.32.40/drivers/atm/adummy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/adummy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
@@ -23457,9 +24427,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/adummy.c linux-2.6.32.39/drivers/atm/adum
  
  	return 0;
  }
-diff -urNp linux-2.6.32.39/drivers/atm/ambassador.c linux-2.6.32.39/drivers/atm/ambassador.c
---- linux-2.6.32.39/drivers/atm/ambassador.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/ambassador.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/ambassador.c linux-2.6.32.40/drivers/atm/ambassador.c
+--- linux-2.6.32.40/drivers/atm/ambassador.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/ambassador.c	2011-04-17 15:56:46.000000000 -0400
 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -23496,9 +24466,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/ambassador.c linux-2.6.32.39/drivers/atm/
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.32.39/drivers/atm/atmtcp.c linux-2.6.32.39/drivers/atm/atmtcp.c
---- linux-2.6.32.39/drivers/atm/atmtcp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/atmtcp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/atmtcp.c linux-2.6.32.40/drivers/atm/atmtcp.c
+--- linux-2.6.32.40/drivers/atm/atmtcp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/atmtcp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -23548,9 +24518,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/atmtcp.c linux-2.6.32.39/drivers/atm/atmt
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-2.6.32.39/drivers/atm/eni.c linux-2.6.32.39/drivers/atm/eni.c
---- linux-2.6.32.39/drivers/atm/eni.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/eni.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/eni.c linux-2.6.32.40/drivers/atm/eni.c
+--- linux-2.6.32.40/drivers/atm/eni.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/eni.c	2011-04-17 15:56:46.000000000 -0400
 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
@@ -23596,9 +24566,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/eni.c linux-2.6.32.39/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-2.6.32.39/drivers/atm/firestream.c linux-2.6.32.39/drivers/atm/firestream.c
---- linux-2.6.32.39/drivers/atm/firestream.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/firestream.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/firestream.c linux-2.6.32.40/drivers/atm/firestream.c
+--- linux-2.6.32.40/drivers/atm/firestream.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/firestream.c	2011-04-17 15:56:46.000000000 -0400
 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct
  				}
  			}
@@ -23632,9 +24602,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/firestream.c linux-2.6.32.39/drivers/atm/
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-2.6.32.39/drivers/atm/fore200e.c linux-2.6.32.39/drivers/atm/fore200e.c
---- linux-2.6.32.39/drivers/atm/fore200e.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/fore200e.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/fore200e.c linux-2.6.32.40/drivers/atm/fore200e.c
+--- linux-2.6.32.40/drivers/atm/fore200e.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/fore200e.c	2011-04-17 15:56:46.000000000 -0400
 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
@@ -23691,9 +24661,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/fore200e.c linux-2.6.32.39/drivers/atm/fo
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.32.39/drivers/atm/he.c linux-2.6.32.39/drivers/atm/he.c
---- linux-2.6.32.39/drivers/atm/he.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/he.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/he.c linux-2.6.32.40/drivers/atm/he.c
+--- linux-2.6.32.40/drivers/atm/he.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/he.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -23775,9 +24745,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/he.c linux-2.6.32.39/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-2.6.32.39/drivers/atm/horizon.c linux-2.6.32.39/drivers/atm/horizon.c
---- linux-2.6.32.39/drivers/atm/horizon.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/horizon.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/horizon.c linux-2.6.32.40/drivers/atm/horizon.c
+--- linux-2.6.32.40/drivers/atm/horizon.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/horizon.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -23796,9 +24766,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/horizon.c linux-2.6.32.39/drivers/atm/hor
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-2.6.32.39/drivers/atm/idt77252.c linux-2.6.32.39/drivers/atm/idt77252.c
---- linux-2.6.32.39/drivers/atm/idt77252.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/idt77252.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/idt77252.c linux-2.6.32.40/drivers/atm/idt77252.c
+--- linux-2.6.32.40/drivers/atm/idt77252.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/idt77252.c	2011-04-17 15:56:46.000000000 -0400
 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
@@ -23953,9 +24923,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/idt77252.c linux-2.6.32.39/drivers/atm/id
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.32.39/drivers/atm/iphase.c linux-2.6.32.39/drivers/atm/iphase.c
---- linux-2.6.32.39/drivers/atm/iphase.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/iphase.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/iphase.c linux-2.6.32.40/drivers/atm/iphase.c
+--- linux-2.6.32.40/drivers/atm/iphase.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/iphase.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	status = (u_short) (buf_desc_ptr->desc_mode);  
  	if (status & (RX_CER | RX_PTE | RX_OFL))  
@@ -24052,9 +25022,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/iphase.c linux-2.6.32.39/drivers/atm/ipha
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.32.39/drivers/atm/lanai.c linux-2.6.32.39/drivers/atm/lanai.c
---- linux-2.6.32.39/drivers/atm/lanai.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/lanai.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/lanai.c linux-2.6.32.40/drivers/atm/lanai.c
+--- linux-2.6.32.40/drivers/atm/lanai.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/lanai.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
  	vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
  	lanai_endtx(lanai, lvcc);
@@ -24109,9 +25079,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/lanai.c linux-2.6.32.39/drivers/atm/lanai
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.32.39/drivers/atm/nicstar.c linux-2.6.32.39/drivers/atm/nicstar.c
---- linux-2.6.32.39/drivers/atm/nicstar.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/nicstar.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/nicstar.c linux-2.6.32.40/drivers/atm/nicstar.c
+--- linux-2.6.32.40/drivers/atm/nicstar.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/nicstar.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 
     if ((vc = (vc_map *) vcc->dev_data) == NULL)
     {
@@ -24314,9 +25284,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/nicstar.c linux-2.6.32.39/drivers/atm/nic
           }
        }
  
-diff -urNp linux-2.6.32.39/drivers/atm/solos-pci.c linux-2.6.32.39/drivers/atm/solos-pci.c
---- linux-2.6.32.39/drivers/atm/solos-pci.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/solos-pci.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/solos-pci.c linux-2.6.32.40/drivers/atm/solos-pci.c
+--- linux-2.6.32.40/drivers/atm/solos-pci.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/solos-pci.c	2011-04-17 17:03:05.000000000 -0400
 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
@@ -24335,9 +25305,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/solos-pci.c linux-2.6.32.39/drivers/atm/s
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.32.39/drivers/atm/suni.c linux-2.6.32.39/drivers/atm/suni.c
---- linux-2.6.32.39/drivers/atm/suni.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/suni.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/suni.c linux-2.6.32.40/drivers/atm/suni.c
+--- linux-2.6.32.40/drivers/atm/suni.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/suni.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -24349,9 +25319,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/suni.c linux-2.6.32.39/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.32.39/drivers/atm/uPD98402.c linux-2.6.32.39/drivers/atm/uPD98402.c
---- linux-2.6.32.39/drivers/atm/uPD98402.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/uPD98402.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/uPD98402.c linux-2.6.32.40/drivers/atm/uPD98402.c
+--- linux-2.6.32.40/drivers/atm/uPD98402.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/uPD98402.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
@@ -24396,9 +25366,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/uPD98402.c linux-2.6.32.39/drivers/atm/uP
  	return 0;
  }
  
-diff -urNp linux-2.6.32.39/drivers/atm/zatm.c linux-2.6.32.39/drivers/atm/zatm.c
---- linux-2.6.32.39/drivers/atm/zatm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/atm/zatm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/atm/zatm.c linux-2.6.32.40/drivers/atm/zatm.c
+--- linux-2.6.32.40/drivers/atm/zatm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/atm/zatm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
@@ -24426,9 +25396,9 @@ diff -urNp linux-2.6.32.39/drivers/atm/zatm.c linux-2.6.32.39/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.32.39/drivers/base/bus.c linux-2.6.32.39/drivers/base/bus.c
---- linux-2.6.32.39/drivers/base/bus.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/base/bus.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/base/bus.c linux-2.6.32.40/drivers/base/bus.c
+--- linux-2.6.32.40/drivers/base/bus.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/base/bus.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
  	return ret;
  }
@@ -24456,9 +25426,9 @@ diff -urNp linux-2.6.32.39/drivers/base/bus.c linux-2.6.32.39/drivers/base/bus.c
  	.filter = bus_uevent_filter,
  };
  
-diff -urNp linux-2.6.32.39/drivers/base/class.c linux-2.6.32.39/drivers/base/class.c
---- linux-2.6.32.39/drivers/base/class.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/base/class.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/base/class.c linux-2.6.32.40/drivers/base/class.c
+--- linux-2.6.32.40/drivers/base/class.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/base/class.c	2011-04-17 15:56:46.000000000 -0400
 @@ -63,7 +63,7 @@ static void class_release(struct kobject
  	kfree(cp);
  }
@@ -24468,9 +25438,9 @@ diff -urNp linux-2.6.32.39/drivers/base/class.c linux-2.6.32.39/drivers/base/cla
  	.show	= class_attr_show,
  	.store	= class_attr_store,
  };
-diff -urNp linux-2.6.32.39/drivers/base/core.c linux-2.6.32.39/drivers/base/core.c
---- linux-2.6.32.39/drivers/base/core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/base/core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/base/core.c linux-2.6.32.40/drivers/base/core.c
+--- linux-2.6.32.40/drivers/base/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/base/core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
  	return ret;
  }
@@ -24489,9 +25459,9 @@ diff -urNp linux-2.6.32.39/drivers/base/core.c linux-2.6.32.39/drivers/base/core
  	.filter =	dev_uevent_filter,
  	.name =		dev_uevent_name,
  	.uevent =	dev_uevent,
-diff -urNp linux-2.6.32.39/drivers/base/memory.c linux-2.6.32.39/drivers/base/memory.c
---- linux-2.6.32.39/drivers/base/memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/base/memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/base/memory.c linux-2.6.32.40/drivers/base/memory.c
+--- linux-2.6.32.40/drivers/base/memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/base/memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
  	return retval;
  }
@@ -24501,9 +25471,9 @@ diff -urNp linux-2.6.32.39/drivers/base/memory.c linux-2.6.32.39/drivers/base/me
  	.name		= memory_uevent_name,
  	.uevent		= memory_uevent,
  };
-diff -urNp linux-2.6.32.39/drivers/base/sys.c linux-2.6.32.39/drivers/base/sys.c
---- linux-2.6.32.39/drivers/base/sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/base/sys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/base/sys.c linux-2.6.32.40/drivers/base/sys.c
+--- linux-2.6.32.40/drivers/base/sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/base/sys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
  	return -EIO;
  }
@@ -24522,9 +25492,9 @@ diff -urNp linux-2.6.32.39/drivers/base/sys.c linux-2.6.32.39/drivers/base/sys.c
  	.show	= sysdev_class_show,
  	.store	= sysdev_class_store,
  };
-diff -urNp linux-2.6.32.39/drivers/block/cciss.c linux-2.6.32.39/drivers/block/cciss.c
---- linux-2.6.32.39/drivers/block/cciss.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/block/cciss.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/block/cciss.c linux-2.6.32.40/drivers/block/cciss.c
+--- linux-2.6.32.40/drivers/block/cciss.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/block/cciss.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -24534,9 +25504,9 @@ diff -urNp linux-2.6.32.39/drivers/block/cciss.c linux-2.6.32.39/drivers/block/c
  	err = 0;
  	err |=
  	    copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff -urNp linux-2.6.32.39/drivers/block/pktcdvd.c linux-2.6.32.39/drivers/block/pktcdvd.c
---- linux-2.6.32.39/drivers/block/pktcdvd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/block/pktcdvd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/block/pktcdvd.c linux-2.6.32.40/drivers/block/pktcdvd.c
+--- linux-2.6.32.40/drivers/block/pktcdvd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/block/pktcdvd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
  	return len;
  }
@@ -24546,9 +25516,9 @@ diff -urNp linux-2.6.32.39/drivers/block/pktcdvd.c linux-2.6.32.39/drivers/block
  	.show = kobj_pkt_show,
  	.store = kobj_pkt_store
  };
-diff -urNp linux-2.6.32.39/drivers/char/agp/frontend.c linux-2.6.32.39/drivers/char/agp/frontend.c
---- linux-2.6.32.39/drivers/char/agp/frontend.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/agp/frontend.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/agp/frontend.c linux-2.6.32.40/drivers/char/agp/frontend.c
+--- linux-2.6.32.40/drivers/char/agp/frontend.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/agp/frontend.c	2011-04-17 15:56:46.000000000 -0400
 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
@@ -24558,70 +25528,9 @@ diff -urNp linux-2.6.32.39/drivers/char/agp/frontend.c linux-2.6.32.39/drivers/c
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.32.39/drivers/char/agp/generic.c linux-2.6.32.39/drivers/char/agp/generic.c
---- linux-2.6.32.39/drivers/char/agp/generic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/agp/generic.c	2011-04-22 19:37:29.000000000 -0400
-@@ -123,6 +123,9 @@ static struct agp_memory *agp_create_use
- 	struct agp_memory *new;
- 	unsigned long alloc_size = num_agp_pages*sizeof(struct page *);
- 
-+	if (INT_MAX/sizeof(struct page *) < num_agp_pages)
-+		return NULL;
-+
- 	new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
- 	if (new == NULL)
- 		return NULL;
-@@ -242,11 +245,14 @@ struct agp_memory *agp_allocate_memory(s
- 	int scratch_pages;
- 	struct agp_memory *new;
- 	size_t i;
-+	int cur_memory;
- 
- 	if (!bridge)
- 		return NULL;
- 
--	if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp)
-+	cur_memory = atomic_read(&bridge->current_memory_agp);
-+	if ((cur_memory + page_count > bridge->max_memory_agp) ||
-+	    (cur_memory + page_count < page_count))
- 		return NULL;
- 
- 	if (type >= AGP_USER_TYPES) {
-@@ -1123,8 +1129,8 @@ int agp_generic_insert_memory(struct agp
- 		return -EINVAL;
- 	}
- 
--	/* AK: could wrap */
--	if ((pg_start + mem->page_count) > num_entries)
-+	if (((pg_start + mem->page_count) > num_entries) ||
-+	    ((pg_start + mem->page_count) < pg_start))
- 		return -EINVAL;
- 
- 	j = pg_start;
-@@ -1158,7 +1164,7 @@ int agp_generic_remove_memory(struct agp
- {
- 	size_t i;
- 	struct agp_bridge_data *bridge;
--	int mask_type;
-+	int mask_type, num_entries;
- 
- 	bridge = mem->bridge;
- 	if (!bridge)
-@@ -1170,6 +1176,11 @@ int agp_generic_remove_memory(struct agp
- 	if (type != mem->type)
- 		return -EINVAL;
- 
-+	num_entries = agp_num_entries();
-+	if (((pg_start + mem->page_count) > num_entries) ||
-+	    ((pg_start + mem->page_count) < pg_start))
-+		return -EINVAL;
-+
- 	mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
- 	if (mask_type != 0) {
- 		/* The generic routines know nothing of memory types */
-diff -urNp linux-2.6.32.39/drivers/char/briq_panel.c linux-2.6.32.39/drivers/char/briq_panel.c
---- linux-2.6.32.39/drivers/char/briq_panel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/briq_panel.c	2011-04-18 19:48:57.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/briq_panel.c linux-2.6.32.40/drivers/char/briq_panel.c
+--- linux-2.6.32.40/drivers/char/briq_panel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/briq_panel.c	2011-04-18 19:48:57.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -24663,9 +25572,9 @@ diff -urNp linux-2.6.32.39/drivers/char/briq_panel.c linux-2.6.32.39/drivers/cha
  
  	return len;
  }
-diff -urNp linux-2.6.32.39/drivers/char/genrtc.c linux-2.6.32.39/drivers/char/genrtc.c
---- linux-2.6.32.39/drivers/char/genrtc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/genrtc.c	2011-04-18 19:45:42.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/genrtc.c linux-2.6.32.40/drivers/char/genrtc.c
+--- linux-2.6.32.40/drivers/char/genrtc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/genrtc.c	2011-04-18 19:45:42.000000000 -0400
 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i
  	switch (cmd) {
  
@@ -24674,9 +25583,9 @@ diff -urNp linux-2.6.32.39/drivers/char/genrtc.c linux-2.6.32.39/drivers/char/ge
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-2.6.32.39/drivers/char/hpet.c linux-2.6.32.39/drivers/char/hpet.c
---- linux-2.6.32.39/drivers/char/hpet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hpet.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hpet.c linux-2.6.32.40/drivers/char/hpet.c
+--- linux-2.6.32.40/drivers/char/hpet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hpet.c	2011-04-23 12:56:11.000000000 -0400
 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
  	return 0;
  }
@@ -24709,9 +25618,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hpet.c linux-2.6.32.39/drivers/char/hpet
  			info.hi_flags =
  			    readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
  			info.hi_hpet = hpetp->hp_which;
-diff -urNp linux-2.6.32.39/drivers/char/hvc_beat.c linux-2.6.32.39/drivers/char/hvc_beat.c
---- linux-2.6.32.39/drivers/char/hvc_beat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_beat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_beat.c linux-2.6.32.40/drivers/char/hvc_beat.c
+--- linux-2.6.32.40/drivers/char/hvc_beat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_beat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
  	return cnt;
  }
@@ -24721,9 +25630,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_beat.c linux-2.6.32.39/drivers/char/
  	.get_chars = hvc_beat_get_chars,
  	.put_chars = hvc_beat_put_chars,
  };
-diff -urNp linux-2.6.32.39/drivers/char/hvc_console.c linux-2.6.32.39/drivers/char/hvc_console.c
---- linux-2.6.32.39/drivers/char/hvc_console.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_console.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_console.c linux-2.6.32.40/drivers/char/hvc_console.c
+--- linux-2.6.32.40/drivers/char/hvc_console.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_console.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
   * console interfaces but can still be used as a tty device.  This has to be
   * static because kmalloc will not work during early console init.
@@ -24751,9 +25660,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_console.c linux-2.6.32.39/drivers/ch
  {
  	struct hvc_struct *hp;
  	int i;
-diff -urNp linux-2.6.32.39/drivers/char/hvc_console.h linux-2.6.32.39/drivers/char/hvc_console.h
---- linux-2.6.32.39/drivers/char/hvc_console.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_console.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_console.h linux-2.6.32.40/drivers/char/hvc_console.h
+--- linux-2.6.32.40/drivers/char/hvc_console.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_console.h	2011-04-17 15:56:46.000000000 -0400
 @@ -55,7 +55,7 @@ struct hvc_struct {
  	int outbuf_size;
  	int n_outbuf;
@@ -24777,9 +25686,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_console.h linux-2.6.32.39/drivers/ch
  /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
  extern int hvc_remove(struct hvc_struct *hp);
  
-diff -urNp linux-2.6.32.39/drivers/char/hvc_iseries.c linux-2.6.32.39/drivers/char/hvc_iseries.c
---- linux-2.6.32.39/drivers/char/hvc_iseries.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_iseries.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_iseries.c linux-2.6.32.40/drivers/char/hvc_iseries.c
+--- linux-2.6.32.40/drivers/char/hvc_iseries.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_iseries.c	2011-04-17 15:56:46.000000000 -0400
 @@ -197,7 +197,7 @@ done:
  	return sent;
  }
@@ -24789,9 +25698,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_iseries.c linux-2.6.32.39/drivers/ch
  	.get_chars = get_chars,
  	.put_chars = put_chars,
  	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.39/drivers/char/hvc_iucv.c linux-2.6.32.39/drivers/char/hvc_iucv.c
---- linux-2.6.32.39/drivers/char/hvc_iucv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_iucv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_iucv.c linux-2.6.32.40/drivers/char/hvc_iucv.c
+--- linux-2.6.32.40/drivers/char/hvc_iucv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_iucv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
  
  
@@ -24801,9 +25710,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_iucv.c linux-2.6.32.39/drivers/char/
  	.get_chars = hvc_iucv_get_chars,
  	.put_chars = hvc_iucv_put_chars,
  	.notifier_add = hvc_iucv_notifier_add,
-diff -urNp linux-2.6.32.39/drivers/char/hvc_rtas.c linux-2.6.32.39/drivers/char/hvc_rtas.c
---- linux-2.6.32.39/drivers/char/hvc_rtas.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_rtas.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_rtas.c linux-2.6.32.40/drivers/char/hvc_rtas.c
+--- linux-2.6.32.40/drivers/char/hvc_rtas.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_rtas.c	2011-04-17 15:56:46.000000000 -0400
 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
  	return i;
  }
@@ -24813,9 +25722,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_rtas.c linux-2.6.32.39/drivers/char/
  	.get_chars = hvc_rtas_read_console,
  	.put_chars = hvc_rtas_write_console,
  };
-diff -urNp linux-2.6.32.39/drivers/char/hvcs.c linux-2.6.32.39/drivers/char/hvcs.c
---- linux-2.6.32.39/drivers/char/hvcs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvcs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvcs.c linux-2.6.32.40/drivers/char/hvcs.c
+--- linux-2.6.32.40/drivers/char/hvcs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvcs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -82,6 +82,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -24918,9 +25827,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvcs.c linux-2.6.32.39/drivers/char/hvcs
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.39/drivers/char/hvc_udbg.c linux-2.6.32.39/drivers/char/hvc_udbg.c
---- linux-2.6.32.39/drivers/char/hvc_udbg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_udbg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_udbg.c linux-2.6.32.40/drivers/char/hvc_udbg.c
+--- linux-2.6.32.40/drivers/char/hvc_udbg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_udbg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
  	return i;
  }
@@ -24930,9 +25839,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_udbg.c linux-2.6.32.39/drivers/char/
  	.get_chars = hvc_udbg_get,
  	.put_chars = hvc_udbg_put,
  };
-diff -urNp linux-2.6.32.39/drivers/char/hvc_vio.c linux-2.6.32.39/drivers/char/hvc_vio.c
---- linux-2.6.32.39/drivers/char/hvc_vio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_vio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_vio.c linux-2.6.32.40/drivers/char/hvc_vio.c
+--- linux-2.6.32.40/drivers/char/hvc_vio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_vio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
  	return got;
  }
@@ -24942,9 +25851,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_vio.c linux-2.6.32.39/drivers/char/h
  	.get_chars = filtered_get_chars,
  	.put_chars = hvc_put_chars,
  	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.39/drivers/char/hvc_xen.c linux-2.6.32.39/drivers/char/hvc_xen.c
---- linux-2.6.32.39/drivers/char/hvc_xen.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/hvc_xen.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/hvc_xen.c linux-2.6.32.40/drivers/char/hvc_xen.c
+--- linux-2.6.32.40/drivers/char/hvc_xen.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/hvc_xen.c	2011-04-17 15:56:46.000000000 -0400
 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
  	return recv;
  }
@@ -24954,9 +25863,9 @@ diff -urNp linux-2.6.32.39/drivers/char/hvc_xen.c linux-2.6.32.39/drivers/char/h
  	.get_chars = read_console,
  	.put_chars = write_console,
  	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.40/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.32.40/drivers/char/ipmi/ipmi_msghandler.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/ipmi/ipmi_msghandler.c	2011-04-17 15:56:46.000000000 -0400
 @@ -414,7 +414,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -24987,9 +25896,9 @@ diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.39/d
  
  	intf->proc_dir = NULL;
  
-diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.40/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.32.40/drivers/char/ipmi/ipmi_si_intf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/ipmi/ipmi_si_intf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -277,7 +277,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
@@ -25020,9 +25929,9 @@ diff -urNp linux-2.6.32.39/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.39/driv
  
  	new_smi->interrupt_disabled = 0;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.32.39/drivers/char/istallion.c linux-2.6.32.39/drivers/char/istallion.c
---- linux-2.6.32.39/drivers/char/istallion.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/istallion.c	2011-04-22 22:18:05.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/istallion.c linux-2.6.32.40/drivers/char/istallion.c
+--- linux-2.6.32.40/drivers/char/istallion.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/istallion.c	2011-04-22 22:18:05.000000000 -0400
 @@ -187,7 +187,6 @@ static struct ktermios		stli_deftermios 
   *	re-used for each stats call.
   */
@@ -25039,9 +25948,9 @@ diff -urNp linux-2.6.32.39/drivers/char/istallion.c linux-2.6.32.39/drivers/char
  
  	if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
  		return -EFAULT;
-diff -urNp linux-2.6.32.39/drivers/char/Kconfig linux-2.6.32.39/drivers/char/Kconfig
---- linux-2.6.32.39/drivers/char/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/Kconfig	2011-04-18 19:20:15.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/Kconfig linux-2.6.32.40/drivers/char/Kconfig
+--- linux-2.6.32.40/drivers/char/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/Kconfig	2011-04-18 19:20:15.000000000 -0400
 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
  
  config DEVKMEM
@@ -25060,9 +25969,9 @@ diff -urNp linux-2.6.32.39/drivers/char/Kconfig linux-2.6.32.39/drivers/char/Kco
  	default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-2.6.32.39/drivers/char/keyboard.c linux-2.6.32.39/drivers/char/keyboard.c
---- linux-2.6.32.39/drivers/char/keyboard.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/keyboard.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/keyboard.c linux-2.6.32.40/drivers/char/keyboard.c
+--- linux-2.6.32.40/drivers/char/keyboard.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/keyboard.c	2011-04-17 15:56:46.000000000 -0400
 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
  	     kbd->kbdmode == VC_MEDIUMRAW) &&
  	     value != KVAL(K_SAK))
@@ -25089,9 +25998,9 @@ diff -urNp linux-2.6.32.39/drivers/char/keyboard.c linux-2.6.32.39/drivers/char/
  };
  
  MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.32.39/drivers/char/mem.c linux-2.6.32.39/drivers/char/mem.c
---- linux-2.6.32.39/drivers/char/mem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/mem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/mem.c linux-2.6.32.40/drivers/char/mem.c
+--- linux-2.6.32.40/drivers/char/mem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/mem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -25233,9 +26142,9 @@ diff -urNp linux-2.6.32.39/drivers/char/mem.c linux-2.6.32.39/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.40/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.32.40/drivers/char/pcmcia/ipwireless/tty.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/pcmcia/ipwireless/tty.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -25358,9 +26267,9 @@ diff -urNp linux-2.6.32.39/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.39/
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-2.6.32.39/drivers/char/pty.c linux-2.6.32.39/drivers/char/pty.c
---- linux-2.6.32.39/drivers/char/pty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/pty.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/pty.c linux-2.6.32.40/drivers/char/pty.c
+--- linux-2.6.32.40/drivers/char/pty.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/pty.c	2011-04-17 15:56:46.000000000 -0400
 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
  	return ret;
  }
@@ -25391,9 +26300,9 @@ diff -urNp linux-2.6.32.39/drivers/char/pty.c linux-2.6.32.39/drivers/char/pty.c
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
  	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff -urNp linux-2.6.32.39/drivers/char/random.c linux-2.6.32.39/drivers/char/random.c
---- linux-2.6.32.39/drivers/char/random.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/random.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/random.c linux-2.6.32.40/drivers/char/random.c
+--- linux-2.6.32.40/drivers/char/random.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/random.c	2011-04-17 15:56:46.000000000 -0400
 @@ -254,8 +254,13 @@
  /*
   * Configuration information
@@ -25435,9 +26344,9 @@ diff -urNp linux-2.6.32.39/drivers/char/random.c linux-2.6.32.39/drivers/char/ra
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.32.39/drivers/char/sonypi.c linux-2.6.32.39/drivers/char/sonypi.c
---- linux-2.6.32.39/drivers/char/sonypi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/sonypi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/sonypi.c linux-2.6.32.40/drivers/char/sonypi.c
+--- linux-2.6.32.40/drivers/char/sonypi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/sonypi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -25476,9 +26385,9 @@ diff -urNp linux-2.6.32.39/drivers/char/sonypi.c linux-2.6.32.39/drivers/char/so
  	mutex_unlock(&sonypi_device.lock);
  	unlock_kernel();
  	return 0;
-diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm_bios.c linux-2.6.32.39/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.39/drivers/char/tpm/tpm_bios.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/tpm/tpm_bios.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/tpm/tpm_bios.c linux-2.6.32.40/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.32.40/drivers/char/tpm/tpm_bios.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/tpm/tpm_bios.c	2011-04-17 15:56:46.000000000 -0400
 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -25519,9 +26428,9 @@ diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm_bios.c linux-2.6.32.39/drivers/c
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm.c linux-2.6.32.39/drivers/char/tpm/tpm.c
---- linux-2.6.32.39/drivers/char/tpm/tpm.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/tpm/tpm.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/tpm/tpm.c linux-2.6.32.40/drivers/char/tpm/tpm.c
+--- linux-2.6.32.40/drivers/char/tpm/tpm.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/drivers/char/tpm/tpm.c	2011-04-17 17:03:05.000000000 -0400
 @@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c
  		    chip->vendor.req_complete_val)
  			goto out_recv;
@@ -25531,9 +26440,9 @@ diff -urNp linux-2.6.32.39/drivers/char/tpm/tpm.c linux-2.6.32.39/drivers/char/t
  			dev_err(chip->dev, "Operation Canceled\n");
  			rc = -ECANCELED;
  			goto out;
-diff -urNp linux-2.6.32.39/drivers/char/tty_io.c linux-2.6.32.39/drivers/char/tty_io.c
---- linux-2.6.32.39/drivers/char/tty_io.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/tty_io.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/tty_io.c linux-2.6.32.40/drivers/char/tty_io.c
+--- linux-2.6.32.40/drivers/char/tty_io.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/tty_io.c	2011-04-17 15:56:46.000000000 -0400
 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers);			/* linked list
  DEFINE_MUTEX(tty_mutex);
  EXPORT_SYMBOL(tty_mutex);
@@ -25672,9 +26581,9 @@ diff -urNp linux-2.6.32.39/drivers/char/tty_io.c linux-2.6.32.39/drivers/char/tt
  /*
   * Initialize the console device. This is called *early*, so
   * we can't necessarily depend on lots of kernel help here.
-diff -urNp linux-2.6.32.39/drivers/char/tty_ldisc.c linux-2.6.32.39/drivers/char/tty_ldisc.c
---- linux-2.6.32.39/drivers/char/tty_ldisc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/tty_ldisc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/tty_ldisc.c linux-2.6.32.40/drivers/char/tty_ldisc.c
+--- linux-2.6.32.40/drivers/char/tty_ldisc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/tty_ldisc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
@@ -25720,9 +26629,9 @@ diff -urNp linux-2.6.32.39/drivers/char/tty_ldisc.c linux-2.6.32.39/drivers/char
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-2.6.32.39/drivers/char/virtio_console.c linux-2.6.32.39/drivers/char/virtio_console.c
---- linux-2.6.32.39/drivers/char/virtio_console.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/virtio_console.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/virtio_console.c linux-2.6.32.40/drivers/char/virtio_console.c
+--- linux-2.6.32.40/drivers/char/virtio_console.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/virtio_console.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,6 +44,7 @@ static unsigned int in_len;
  static char *in, *inbuf;
  
@@ -25731,9 +26640,9 @@ diff -urNp linux-2.6.32.39/drivers/char/virtio_console.c linux-2.6.32.39/drivers
  static struct hv_ops virtio_cons;
  
  /* The hvc device */
-diff -urNp linux-2.6.32.39/drivers/char/vt.c linux-2.6.32.39/drivers/char/vt.c
---- linux-2.6.32.39/drivers/char/vt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/vt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/vt.c linux-2.6.32.40/drivers/char/vt.c
+--- linux-2.6.32.40/drivers/char/vt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/vt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -25743,9 +26652,9 @@ diff -urNp linux-2.6.32.39/drivers/char/vt.c linux-2.6.32.39/drivers/char/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-2.6.32.39/drivers/char/vt_ioctl.c linux-2.6.32.39/drivers/char/vt_ioctl.c
---- linux-2.6.32.39/drivers/char/vt_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/char/vt_ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/char/vt_ioctl.c linux-2.6.32.40/drivers/char/vt_ioctl.c
+--- linux-2.6.32.40/drivers/char/vt_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/char/vt_ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
@@ -25789,9 +26698,9 @@ diff -urNp linux-2.6.32.39/drivers/char/vt_ioctl.c linux-2.6.32.39/drivers/char/
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-2.6.32.39/drivers/cpufreq/cpufreq.c linux-2.6.32.39/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.39/drivers/cpufreq/cpufreq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/cpufreq/cpufreq.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/cpufreq/cpufreq.c linux-2.6.32.40/drivers/cpufreq/cpufreq.c
+--- linux-2.6.32.40/drivers/cpufreq/cpufreq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/cpufreq/cpufreq.c	2011-04-17 15:56:46.000000000 -0400
 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
  	complete(&policy->kobj_unregister);
  }
@@ -25801,9 +26710,9 @@ diff -urNp linux-2.6.32.39/drivers/cpufreq/cpufreq.c linux-2.6.32.39/drivers/cpu
  	.show	= show,
  	.store	= store,
  };
-diff -urNp linux-2.6.32.39/drivers/cpuidle/sysfs.c linux-2.6.32.39/drivers/cpuidle/sysfs.c
---- linux-2.6.32.39/drivers/cpuidle/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/cpuidle/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/cpuidle/sysfs.c linux-2.6.32.40/drivers/cpuidle/sysfs.c
+--- linux-2.6.32.40/drivers/cpuidle/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/cpuidle/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
  	return ret;
  }
@@ -25831,9 +26740,9 @@ diff -urNp linux-2.6.32.39/drivers/cpuidle/sysfs.c linux-2.6.32.39/drivers/cpuid
  {
  	kobject_put(&device->kobjs[i]->kobj);
  	wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.c linux-2.6.32.39/drivers/dma/ioat/dma.c
---- linux-2.6.32.39/drivers/dma/ioat/dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/dma/ioat/dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/dma/ioat/dma.c linux-2.6.32.40/drivers/dma/ioat/dma.c
+--- linux-2.6.32.40/drivers/dma/ioat/dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/dma/ioat/dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
  	return entry->show(&chan->common, page);
  }
@@ -25843,9 +26752,9 @@ diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.c linux-2.6.32.39/drivers/dma/io
  	.show	= ioat_attr_show,
  };
  
-diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.h linux-2.6.32.39/drivers/dma/ioat/dma.h
---- linux-2.6.32.39/drivers/dma/ioat/dma.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/dma/ioat/dma.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/dma/ioat/dma.h linux-2.6.32.40/drivers/dma/ioat/dma.h
+--- linux-2.6.32.40/drivers/dma/ioat/dma.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/dma/ioat/dma.h	2011-04-17 15:56:46.000000000 -0400
 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
  			   unsigned long *phys_complete);
  void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -25855,9 +26764,9 @@ diff -urNp linux-2.6.32.39/drivers/dma/ioat/dma.h linux-2.6.32.39/drivers/dma/io
  extern struct ioat_sysfs_entry ioat_version_attr;
  extern struct ioat_sysfs_entry ioat_cap_attr;
  #endif /* IOATDMA_H */
-diff -urNp linux-2.6.32.39/drivers/edac/edac_device_sysfs.c linux-2.6.32.39/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.39/drivers/edac/edac_device_sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/edac/edac_device_sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/edac/edac_device_sysfs.c linux-2.6.32.40/drivers/edac/edac_device_sysfs.c
+--- linux-2.6.32.40/drivers/edac/edac_device_sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/edac/edac_device_sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
  }
  
@@ -25885,9 +26794,9 @@ diff -urNp linux-2.6.32.39/drivers/edac/edac_device_sysfs.c linux-2.6.32.39/driv
  	.show = edac_dev_block_show,
  	.store = edac_dev_block_store
  };
-diff -urNp linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/edac/edac_mc_sysfs.c linux-2.6.32.40/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.32.40/drivers/edac/edac_mc_sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/edac/edac_mc_sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
  	return -EIO;
  }
@@ -25906,9 +26815,20 @@ diff -urNp linux-2.6.32.39/drivers/edac/edac_mc_sysfs.c linux-2.6.32.39/drivers/
  	.show = mcidev_show,
  	.store = mcidev_store
  };
-diff -urNp linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/edac/edac_pci_sysfs.c linux-2.6.32.40/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.32.40/drivers/edac/edac_pci_sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/edac/edac_pci_sysfs.c	2011-05-04 17:56:20.000000000 -0400
+@@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1;		/* log 
+ static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
+ static int edac_pci_poll_msec = 1000;	/* one second workq period */
+ 
+-static atomic_t pci_parity_count = ATOMIC_INIT(0);
+-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
++static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
++static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
+ 
+ static struct kobject *edac_pci_top_main_kobj;
+ static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
  }
  
@@ -25927,9 +26847,81 @@ diff -urNp linux-2.6.32.39/drivers/edac/edac_pci_sysfs.c linux-2.6.32.39/drivers
  	.show = edac_pci_dev_show,
  	.store = edac_pci_dev_store
  };
-diff -urNp linux-2.6.32.39/drivers/firewire/core-cdev.c linux-2.6.32.39/drivers/firewire/core-cdev.c
---- linux-2.6.32.39/drivers/firewire/core-cdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/firewire/core-cdev.c	2011-04-17 15:56:46.000000000 -0400
+@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(str
+ 			edac_printk(KERN_CRIT, EDAC_PCI,
+ 				"Signaled System Error on %s\n",
+ 				pci_name(dev));
+-			atomic_inc(&pci_nonparity_count);
++			atomic_inc_unchecked(&pci_nonparity_count);
+ 		}
+ 
+ 		if (status & (PCI_STATUS_PARITY)) {
+@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(str
+ 				"Master Data Parity Error on %s\n",
+ 				pci_name(dev));
+ 
+-			atomic_inc(&pci_parity_count);
++			atomic_inc_unchecked(&pci_parity_count);
+ 		}
+ 
+ 		if (status & (PCI_STATUS_DETECTED_PARITY)) {
+@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(str
+ 				"Detected Parity Error on %s\n",
+ 				pci_name(dev));
+ 
+-			atomic_inc(&pci_parity_count);
++			atomic_inc_unchecked(&pci_parity_count);
+ 		}
+ 	}
+ 
+@@ -616,7 +616,7 @@ static void edac_pci_dev_parity_test(str
+ 				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
+ 					"Signaled System Error on %s\n",
+ 					pci_name(dev));
+-				atomic_inc(&pci_nonparity_count);
++				atomic_inc_unchecked(&pci_nonparity_count);
+ 			}
+ 
+ 			if (status & (PCI_STATUS_PARITY)) {
+@@ -624,7 +624,7 @@ static void edac_pci_dev_parity_test(str
+ 					"Master Data Parity Error on "
+ 					"%s\n", pci_name(dev));
+ 
+-				atomic_inc(&pci_parity_count);
++				atomic_inc_unchecked(&pci_parity_count);
+ 			}
+ 
+ 			if (status & (PCI_STATUS_DETECTED_PARITY)) {
+@@ -632,7 +632,7 @@ static void edac_pci_dev_parity_test(str
+ 					"Detected Parity Error on %s\n",
+ 					pci_name(dev));
+ 
+-				atomic_inc(&pci_parity_count);
++				atomic_inc_unchecked(&pci_parity_count);
+ 			}
+ 		}
+ 	}
+@@ -674,7 +674,7 @@ void edac_pci_do_parity_check(void)
+ 	if (!check_pci_errors)
+ 		return;
+ 
+-	before_count = atomic_read(&pci_parity_count);
++	before_count = atomic_read_unchecked(&pci_parity_count);
+ 
+ 	/* scan all PCI devices looking for a Parity Error on devices and
+ 	 * bridges.
+@@ -686,7 +686,7 @@ void edac_pci_do_parity_check(void)
+ 	/* Only if operator has selected panic on PCI Error */
+ 	if (edac_pci_get_panic_on_pe()) {
+ 		/* If the count is different 'after' from 'before' */
+-		if (before_count != atomic_read(&pci_parity_count))
++		if (before_count != atomic_read_unchecked(&pci_parity_count))
+ 			panic("EDAC: PCI Parity Error");
+ 	}
+ }
+diff -urNp linux-2.6.32.40/drivers/firewire/core-cdev.c linux-2.6.32.40/drivers/firewire/core-cdev.c
+--- linux-2.6.32.40/drivers/firewire/core-cdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/firewire/core-cdev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
@@ -25940,9 +26932,9 @@ diff -urNp linux-2.6.32.39/drivers/firewire/core-cdev.c linux-2.6.32.39/drivers/
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.32.39/drivers/firmware/dmi_scan.c linux-2.6.32.39/drivers/firmware/dmi_scan.c
---- linux-2.6.32.39/drivers/firmware/dmi_scan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/firmware/dmi_scan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/firmware/dmi_scan.c linux-2.6.32.40/drivers/firmware/dmi_scan.c
+--- linux-2.6.32.40/drivers/firmware/dmi_scan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/firmware/dmi_scan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -25955,9 +26947,9 @@ diff -urNp linux-2.6.32.39/drivers/firmware/dmi_scan.c linux-2.6.32.39/drivers/f
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff -urNp linux-2.6.32.39/drivers/firmware/edd.c linux-2.6.32.39/drivers/firmware/edd.c
---- linux-2.6.32.39/drivers/firmware/edd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/firmware/edd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/firmware/edd.c linux-2.6.32.40/drivers/firmware/edd.c
+--- linux-2.6.32.40/drivers/firmware/edd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/firmware/edd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
  	return ret;
  }
@@ -25967,9 +26959,9 @@ diff -urNp linux-2.6.32.39/drivers/firmware/edd.c linux-2.6.32.39/drivers/firmwa
  	.show = edd_attr_show,
  };
  
-diff -urNp linux-2.6.32.39/drivers/firmware/efivars.c linux-2.6.32.39/drivers/firmware/efivars.c
---- linux-2.6.32.39/drivers/firmware/efivars.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/firmware/efivars.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/firmware/efivars.c linux-2.6.32.40/drivers/firmware/efivars.c
+--- linux-2.6.32.40/drivers/firmware/efivars.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/firmware/efivars.c	2011-04-17 15:56:46.000000000 -0400
 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 
  	return ret;
  }
@@ -25979,9 +26971,9 @@ diff -urNp linux-2.6.32.39/drivers/firmware/efivars.c linux-2.6.32.39/drivers/fi
  	.show = efivar_attr_show,
  	.store = efivar_attr_store,
  };
-diff -urNp linux-2.6.32.39/drivers/firmware/iscsi_ibft.c linux-2.6.32.39/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.39/drivers/firmware/iscsi_ibft.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/firmware/iscsi_ibft.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/firmware/iscsi_ibft.c linux-2.6.32.40/drivers/firmware/iscsi_ibft.c
+--- linux-2.6.32.40/drivers/firmware/iscsi_ibft.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/firmware/iscsi_ibft.c	2011-04-17 15:56:46.000000000 -0400
 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
  	return ret;
  }
@@ -25991,9 +26983,9 @@ diff -urNp linux-2.6.32.39/drivers/firmware/iscsi_ibft.c linux-2.6.32.39/drivers
  	.show = ibft_show_attribute,
  };
  
-diff -urNp linux-2.6.32.39/drivers/firmware/memmap.c linux-2.6.32.39/drivers/firmware/memmap.c
---- linux-2.6.32.39/drivers/firmware/memmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/firmware/memmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/firmware/memmap.c linux-2.6.32.40/drivers/firmware/memmap.c
+--- linux-2.6.32.40/drivers/firmware/memmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/firmware/memmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
  	NULL
  };
@@ -26003,9 +26995,21 @@ diff -urNp linux-2.6.32.39/drivers/firmware/memmap.c linux-2.6.32.39/drivers/fir
  	.show = memmap_attr_show,
  };
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpio/vr41xx_giu.c linux-2.6.32.40/drivers/gpio/vr41xx_giu.c
+--- linux-2.6.32.40/drivers/gpio/vr41xx_giu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpio/vr41xx_giu.c	2011-05-04 17:56:28.000000000 -0400
+@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
+ 	printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
+ 	       maskl, pendl, maskh, pendh);
+ 
+-	atomic_inc(&irq_err_count);
++	atomic_inc_unchecked(&irq_err_count);
+ 
+ 	return -EINVAL;
+ }
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.40/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_crtc_helper.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_crtc_helper.c	2011-04-17 15:56:46.000000000 -0400
 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
@@ -26015,9 +27019,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.39/dri
  
  	dev = crtc->dev;
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_drv.c linux-2.6.32.39/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_drv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_drv.c linux-2.6.32.40/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_drv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
  	char *kdata = NULL;
  
@@ -26027,9 +27031,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_drv.c linux-2.6.32.39/drivers/gpu
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_fops.c linux-2.6.32.39/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_fops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_fops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_fops.c linux-2.6.32.40/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_fops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_fops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -26081,9 +27085,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_fops.c linux-2.6.32.39/drivers/gp
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_gem.c linux-2.6.32.39/drivers/gpu/drm/drm_gem.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_gem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_gem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_gem.c linux-2.6.32.40/drivers/gpu/drm/drm_gem.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_gem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_gem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
  	spin_lock_init(&dev->object_name_lock);
  	idr_init(&dev->object_name_idr);
@@ -26117,9 +27121,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_gem.c linux-2.6.32.39/drivers/gpu
  	kfree(obj);
  }
  EXPORT_SYMBOL(drm_gem_object_free);
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_info.c linux-2.6.32.39/drivers/gpu/drm/drm_info.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_info.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_info.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_info.c linux-2.6.32.40/drivers/gpu/drm/drm_info.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_info.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_info.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
  	struct drm_local_map *map;
  	struct drm_map_list *r_list;
@@ -26199,9 +27203,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_info.c linux-2.6.32.39/drivers/gp
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.40/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -26211,9 +27215,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.39/drivers/g
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_lock.c linux-2.6.32.39/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.39/drivers/gpu/drm/drm_lock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/drm_lock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/drm_lock.c linux-2.6.32.40/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.32.40/drivers/gpu/drm/drm_lock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/drm_lock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
  		if (drm_lock_take(&master->lock, lock->context)) {
  			master->lock.file_priv = file_priv;
@@ -26232,9 +27236,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/drm_lock.c linux-2.6.32.39/drivers/gp
  
  	/* kernel_context_switch isn't used by any of the x86 drm
  	 * modules but is required by the Sparc driver.
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.40/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.32.40/drivers/gpu/drm/i810/i810_dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i810/i810_dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
@@ -26257,9 +27261,95 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.39/drive
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.40/drivers/gpu/drm/i810/i810_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/i810/i810_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i810/i810_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
+ 	int page_flipping;
+ 
+ 	wait_queue_head_t irq_queue;
+-	atomic_t irq_received;
+-	atomic_t irq_emitted;
++	atomic_unchecked_t irq_received;
++	atomic_unchecked_t irq_emitted;
+ 
+ 	int front_offset;
+ } drm_i810_private_t;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.40/drivers/gpu/drm/i830/i830_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/i830/i830_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i830/i830_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -115,8 +115,8 @@ typedef struct drm_i830_private {
+ 	int page_flipping;
+ 
+ 	wait_queue_head_t irq_queue;
+-	atomic_t irq_received;
+-	atomic_t irq_emitted;
++	atomic_unchecked_t irq_received;
++	atomic_unchecked_t irq_emitted;
+ 
+ 	int use_mi_batchbuffer_start;
+ 
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.40/drivers/gpu/drm/i830/i830_irq.c
+--- linux-2.6.32.40/drivers/gpu/drm/i830/i830_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i830/i830_irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_
+ 
+ 	I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
+ 
+-	atomic_inc(&dev_priv->irq_received);
++	atomic_inc_unchecked(&dev_priv->irq_received);
+ 	wake_up_interruptible(&dev_priv->irq_queue);
+ 
+ 	return IRQ_HANDLED;
+@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_devi
+ 
+ 	DRM_DEBUG("%s\n", __func__);
+ 
+-	atomic_inc(&dev_priv->irq_emitted);
++	atomic_inc_unchecked(&dev_priv->irq_emitted);
+ 
+ 	BEGIN_LP_RING(2);
+ 	OUT_RING(0);
+ 	OUT_RING(GFX_OP_USER_INTERRUPT);
+ 	ADVANCE_LP_RING();
+ 
+-	return atomic_read(&dev_priv->irq_emitted);
++	return atomic_read_unchecked(&dev_priv->irq_emitted);
+ }
+ 
+ static int i830_wait_irq(struct drm_device * dev, int irq_nr)
+@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_devi
+ 
+ 	DRM_DEBUG("%s\n", __func__);
+ 
+-	if (atomic_read(&dev_priv->irq_received) >= irq_nr)
++	if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
+ 		return 0;
+ 
+ 	dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
+@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_devi
+ 
+ 	for (;;) {
+ 		__set_current_state(TASK_INTERRUPTIBLE);
+-		if (atomic_read(&dev_priv->irq_received) >= irq_nr)
++		if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
+ 			break;
+ 		if ((signed)(end - jiffies) <= 0) {
+ 			DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
+@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct d
+ 	I830_WRITE16(I830REG_HWSTAM, 0xffff);
+ 	I830_WRITE16(I830REG_INT_MASK_R, 0x0);
+ 	I830_WRITE16(I830REG_INT_ENABLE_R, 0x0);
+-	atomic_set(&dev_priv->irq_received, 0);
+-	atomic_set(&dev_priv->irq_emitted, 0);
++	atomic_set_unchecked(&dev_priv->irq_received, 0);
++	atomic_set_unchecked(&dev_priv->irq_emitted, 0);
+ 	init_waitqueue_head(&dev_priv->irq_queue);
+ }
+ 
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-17 15:56:46.000000000 -0400
 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
  	}
  }
@@ -26269,9 +27359,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.39/dri
  	.init = ch7017_init,
  	.detect = ch7017_detect,
  	.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
  	}
  }
@@ -26281,9 +27371,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.39/dri
  	.init = ch7xxx_init,
  	.detect = ch7xxx_detect,
  	.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/dvo.h linux-2.6.32.40/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.32.40/drivers/gpu/drm/i915/dvo.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/dvo.h	2011-04-17 15:56:46.000000000 -0400
 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
  	 *
  	 * \return singly-linked list of modes or NULL if no modes found.
@@ -26316,9 +27406,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo.h linux-2.6.32.39/drivers/gp
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
  	}
  }
@@ -26328,9 +27418,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.39/drive
  	.init = ivch_init,
  	.dpms = ivch_dpms,
  	.save = ivch_save,
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.40/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/dvo_sil164.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/dvo_sil164.c	2011-04-17 15:56:46.000000000 -0400
 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
  	}
  }
@@ -26340,9 +27430,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.39/dri
  	.init = sil164_init,
  	.detect = sil164_detect,
  	.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.40/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/dvo_tfp410.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/dvo_tfp410.c	2011-04-17 15:56:46.000000000 -0400
 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
  	}
  }
@@ -26352,9 +27442,21 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.39/dri
  	.init = tfp410_init,
  	.detect = tfp410_detect,
  	.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.40/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/i915_debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/i915_debugfs.c	2011-05-04 17:56:28.000000000 -0400
+@@ -192,7 +192,7 @@ static int i915_interrupt_info(struct se
+ 			   I915_READ(GTIMR));
+ 	}
+ 	seq_printf(m, "Interrupts received: %d\n",
+-		   atomic_read(&dev_priv->irq_received));
++		   atomic_read_unchecked(&dev_priv->irq_received));
+ 	if (dev_priv->hw_status_page != NULL) {
+ 		seq_printf(m, "Current sequence:    %d\n",
+ 			   i915_get_gem_seqno(dev));
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
  	return i915_resume(dev);
  }
@@ -26364,9 +27466,21 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.39/drive
  	.fault = i915_gem_fault,
  	.open = drm_gem_vm_open,
  	.close = drm_gem_vm_close,
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/i915_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -197,7 +197,7 @@ typedef struct drm_i915_private {
+ 	int page_flipping;
+ 
+ 	wait_queue_head_t irq_queue;
+-	atomic_t irq_received;
++	atomic_unchecked_t irq_received;
+ 	/** Protects user_irq_refcount and irq_mask_reg */
+ 	spinlock_t user_irq_lock;
+ 	/** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.40/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/i915_gem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/i915_gem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
  
  	args->aper_size = dev->gtt_total;
@@ -26449,9 +27563,153 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.39/drive
  	}
  	i915_verify_inactive(dev, __FILE__, __LINE__);
  }
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.40/drivers/gpu/drm/i915/i915_irq.c
+--- linux-2.6.32.40/drivers/gpu/drm/i915/i915_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/i915/i915_irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
+ 	int irq_received;
+ 	int ret = IRQ_NONE;
+ 
+-	atomic_inc(&dev_priv->irq_received);
++	atomic_inc_unchecked(&dev_priv->irq_received);
+ 
+ 	if (IS_IGDNG(dev))
+ 		return igdng_irq_handler(dev);
+@@ -1021,7 +1021,7 @@ void i915_driver_irq_preinstall(struct d
+ {
+ 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ 
+-	atomic_set(&dev_priv->irq_received, 0);
++	atomic_set_unchecked(&dev_priv->irq_received, 0);
+ 
+ 	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
+ 	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.40/drivers/gpu/drm/mga/mga_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/mga/mga_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/mga/mga_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
+ 	u32 clear_cmd;
+ 	u32 maccess;
+ 
+-	atomic_t vbl_received;          /**< Number of vblanks received. */
++	atomic_unchecked_t vbl_received;          /**< Number of vblanks received. */
+ 	wait_queue_head_t fence_queue;
+-	atomic_t last_fence_retired;
++	atomic_unchecked_t last_fence_retired;
+ 	u32 next_fence_to_post;
+ 
+ 	unsigned int fb_cpp;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.40/drivers/gpu/drm/mga/mga_irq.c
+--- linux-2.6.32.40/drivers/gpu/drm/mga/mga_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/mga/mga_irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
+ 	if (crtc != 0)
+ 		return 0;
+ 
+-	return atomic_read(&dev_priv->vbl_received);
++	return atomic_read_unchecked(&dev_priv->vbl_received);
+ }
+ 
+ 
+@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I
+ 	/* VBLANK interrupt */
+ 	if (status & MGA_VLINEPEN) {
+ 		MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
+-		atomic_inc(&dev_priv->vbl_received);
++		atomic_inc_unchecked(&dev_priv->vbl_received);
+ 		drm_handle_vblank(dev, 0);
+ 		handled = 1;
+ 	}
+@@ -80,7 +80,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I
+ 			MGA_WRITE(MGA_PRIMEND, prim_end);
+ 		}
+ 
+-		atomic_inc(&dev_priv->last_fence_retired);
++		atomic_inc_unchecked(&dev_priv->last_fence_retired);
+ 		DRM_WAKEUP(&dev_priv->fence_queue);
+ 		handled = 1;
+ 	}
+@@ -131,7 +131,7 @@ int mga_driver_fence_wait(struct drm_dev
+ 	 * using fences.
+ 	 */
+ 	DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
+-		    (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
++		    (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
+ 		      - *sequence) <= (1 << 23)));
+ 
+ 	*sequence = cur_fence;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.40/drivers/gpu/drm/r128/r128_cce.c
+--- linux-2.6.32.40/drivers/gpu/drm/r128/r128_cce.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/r128/r128_cce.c	2011-05-04 17:56:28.000000000 -0400
+@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
+ 
+ 	/* GH: Simple idle check.
+ 	 */
+-	atomic_set(&dev_priv->idle_count, 0);
++	atomic_set_unchecked(&dev_priv->idle_count, 0);
+ 
+ 	/* We don't support anything other than bus-mastering ring mode,
+ 	 * but the ring can be in either AGP or PCI space for the ring
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.40/drivers/gpu/drm/r128/r128_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/r128/r128_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/r128/r128_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
+ 	int is_pci;
+ 	unsigned long cce_buffers_offset;
+ 
+-	atomic_t idle_count;
++	atomic_unchecked_t idle_count;
+ 
+ 	int page_flipping;
+ 	int current_page;
+ 	u32 crtc_offset;
+ 	u32 crtc_offset_cntl;
+ 
+-	atomic_t vbl_received;
++	atomic_unchecked_t vbl_received;
+ 
+ 	u32 color_fmt;
+ 	unsigned int front_offset;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.40/drivers/gpu/drm/r128/r128_irq.c
+--- linux-2.6.32.40/drivers/gpu/drm/r128/r128_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/r128/r128_irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
+ 	if (crtc != 0)
+ 		return 0;
+ 
+-	return atomic_read(&dev_priv->vbl_received);
++	return atomic_read_unchecked(&dev_priv->vbl_received);
+ }
+ 
+ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_
+ 	/* VBLANK interrupt */
+ 	if (status & R128_CRTC_VBLANK_INT) {
+ 		R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
+-		atomic_inc(&dev_priv->vbl_received);
++		atomic_inc_unchecked(&dev_priv->vbl_received);
+ 		drm_handle_vblank(dev, 0);
+ 		return IRQ_HANDLED;
+ 	}
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.40/drivers/gpu/drm/r128/r128_state.c
+--- linux-2.6.32.40/drivers/gpu/drm/r128/r128_state.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/r128/r128_state.c	2011-05-04 17:56:28.000000000 -0400
+@@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_priv
+ 
+ static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
+ {
+-	if (atomic_read(&dev_priv->idle_count) == 0) {
++	if (atomic_read_unchecked(&dev_priv->idle_count) == 0) {
+ 		r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
+ 	} else {
+-		atomic_set(&dev_priv->idle_count, 0);
++		atomic_set_unchecked(&dev_priv->idle_count, 0);
+ 	}
+ }
+ 
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.40/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/mkregtable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/mkregtable.c	2011-04-17 15:56:46.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
@@ -26469,9 +27727,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.39/d
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_atombios.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_atombios.c	2011-04-17 15:56:46.000000000 -0400
 @@ -520,13 +520,13 @@ static uint16_t atombios_get_connector_o
  	}
  }
@@ -26496,9 +27754,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
  
  	atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_display.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_display.c	2011-04-17 15:56:46.000000000 -0400
 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
  
  					if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -26508,9 +27766,54 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
  					} else
  						error = abs(current_freq - freq);
  					vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-23 13:57:24.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -253,7 +253,7 @@ typedef struct drm_radeon_private {
+ 
+ 	/* SW interrupt */
+ 	wait_queue_head_t swi_queue;
+-	atomic_t swi_emitted;
++	atomic_unchecked_t swi_emitted;
+ 	int vblank_crtc;
+ 	uint32_t irq_enable_reg;
+ 	uint32_t r500_disp_irq_reg;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_fence.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_fence.c	2011-05-04 17:56:28.000000000 -0400
+@@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_devi
+ 		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
+ 		return 0;
+ 	}
+-	fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
++	fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
+ 	if (!rdev->cp.ready) {
+ 		/* FIXME: cp is not running assume everythings is done right
+ 		 * away
+@@ -364,7 +364,7 @@ int radeon_fence_driver_init(struct rade
+ 		return r;
+ 	}
+ 	WREG32(rdev->fence_drv.scratch_reg, 0);
+-	atomic_set(&rdev->fence_drv.seq, 0);
++	atomic_set_unchecked(&rdev->fence_drv.seq, 0);
+ 	INIT_LIST_HEAD(&rdev->fence_drv.created);
+ 	INIT_LIST_HEAD(&rdev->fence_drv.emited);
+ 	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.40/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon.h	2011-05-04 17:56:28.000000000 -0400
+@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device 
+  */
+ struct radeon_fence_driver {
+ 	uint32_t			scratch_reg;
+-	atomic_t			seq;
++	atomic_unchecked_t		seq;
+ 	uint32_t			last_seq;
+ 	unsigned long			count_timeout;
+ 	wait_queue_head_t		queue;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-23 13:57:24.000000000 -0400
 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str
  	request = compat_alloc_user_space(sizeof(*request));
  	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -26520,9 +27823,32 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.39
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
+ 	unsigned int ret;
+ 	RING_LOCALS;
+ 
+-	atomic_inc(&dev_priv->swi_emitted);
+-	ret = atomic_read(&dev_priv->swi_emitted);
++	atomic_inc_unchecked(&dev_priv->swi_emitted);
++	ret = atomic_read_unchecked(&dev_priv->swi_emitted);
+ 
+ 	BEGIN_RING(4);
+ 	OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
+@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct
+ 	drm_radeon_private_t *dev_priv =
+ 	    (drm_radeon_private_t *) dev->dev_private;
+ 
+-	atomic_set(&dev_priv->swi_emitted, 0);
++	atomic_set_unchecked(&dev_priv->swi_emitted, 0);
+ 	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
+ 
+ 	dev->max_vblank_count = 0x001fffff;
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_state.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_state.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -26532,9 +27858,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.39
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ttm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/radeon_ttm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
  	DRM_INFO("radeon: ttm finalized\n");
  }
@@ -26586,9 +27912,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.39/d
  }
  
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c
---- linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.40/drivers/gpu/drm/radeon/rs690.c
+--- linux-2.6.32.40/drivers/gpu/drm/radeon/rs690.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/radeon/rs690.c	2011-04-17 15:56:46.000000000 -0400
 @@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct
  		if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
  			rdev->pm.sideport_bandwidth.full)
@@ -26602,9 +27928,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.39/driver
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo.c	2011-04-23 12:56:11.000000000 -0400
 @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
  	NULL
  };
@@ -26614,9 +27940,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.39/drivers/
  	.show = &ttm_bo_global_show
  };
  
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
  {
  	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -26637,9 +27963,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.39/drive
  	/*
  	 * Work around locking order reversal in fault / nopfn
  	 * between mmap_sem and bo_reserve: Perform a trylock operation
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_global.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_global.c	2011-04-17 15:56:46.000000000 -0400
 @@ -36,7 +36,7 @@
  struct ttm_global_item {
  	struct mutex mutex;
@@ -26697,9 +28023,9 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.39/driv
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_memory.c
+--- linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/ttm/ttm_memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
  	NULL
  };
@@ -26709,9 +28035,124 @@ diff -urNp linux-2.6.32.39/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.39/driv
  	.show = &ttm_mem_zone_show,
  	.store = &ttm_mem_zone_store
  };
-diff -urNp linux-2.6.32.39/drivers/hid/usbhid/hiddev.c linux-2.6.32.39/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.39/drivers/hid/usbhid/hiddev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/hid/usbhid/hiddev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/via/via_drv.h linux-2.6.32.40/drivers/gpu/drm/via/via_drv.h
+--- linux-2.6.32.40/drivers/gpu/drm/via/via_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/via/via_drv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
+ typedef uint32_t maskarray_t[5];
+ 
+ typedef struct drm_via_irq {
+-	atomic_t irq_received;
++	atomic_unchecked_t irq_received;
+ 	uint32_t pending_mask;
+ 	uint32_t enable_mask;
+ 	wait_queue_head_t irq_queue;
+@@ -75,7 +75,7 @@ typedef struct drm_via_private {
+ 	struct timeval last_vblank;
+ 	int last_vblank_valid;
+ 	unsigned usec_per_vblank;
+-	atomic_t vbl_received;
++	atomic_unchecked_t vbl_received;
+ 	drm_via_state_t hc_state;
+ 	char pci_buf[VIA_PCI_BUF_SIZE];
+ 	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
+diff -urNp linux-2.6.32.40/drivers/gpu/drm/via/via_irq.c linux-2.6.32.40/drivers/gpu/drm/via/via_irq.c
+--- linux-2.6.32.40/drivers/gpu/drm/via/via_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/gpu/drm/via/via_irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
+ 	if (crtc != 0)
+ 		return 0;
+ 
+-	return atomic_read(&dev_priv->vbl_received);
++	return atomic_read_unchecked(&dev_priv->vbl_received);
+ }
+ 
+ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_I
+ 
+ 	status = VIA_READ(VIA_REG_INTERRUPT);
+ 	if (status & VIA_IRQ_VBLANK_PENDING) {
+-		atomic_inc(&dev_priv->vbl_received);
+-		if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
++		atomic_inc_unchecked(&dev_priv->vbl_received);
++		if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
+ 			do_gettimeofday(&cur_vblank);
+ 			if (dev_priv->last_vblank_valid) {
+ 				dev_priv->usec_per_vblank =
+@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_I
+ 			dev_priv->last_vblank = cur_vblank;
+ 			dev_priv->last_vblank_valid = 1;
+ 		}
+-		if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
++		if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
+ 			DRM_DEBUG("US per vblank is: %u\n",
+ 				  dev_priv->usec_per_vblank);
+ 		}
+@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_I
+ 
+ 	for (i = 0; i < dev_priv->num_irqs; ++i) {
+ 		if (status & cur_irq->pending_mask) {
+-			atomic_inc(&cur_irq->irq_received);
++			atomic_inc_unchecked(&cur_irq->irq_received);
+ 			DRM_WAKEUP(&cur_irq->irq_queue);
+ 			handled = 1;
+ 			if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) {
+@@ -244,11 +244,11 @@ via_driver_irq_wait(struct drm_device * 
+ 		DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
+ 			    ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
+ 			     masks[irq][4]));
+-		cur_irq_sequence = atomic_read(&cur_irq->irq_received);
++		cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
+ 	} else {
+ 		DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
+ 			    (((cur_irq_sequence =
+-			       atomic_read(&cur_irq->irq_received)) -
++			       atomic_read_unchecked(&cur_irq->irq_received)) -
+ 			      *sequence) <= (1 << 23)));
+ 	}
+ 	*sequence = cur_irq_sequence;
+@@ -286,7 +286,7 @@ void via_driver_irq_preinstall(struct dr
+ 		}
+ 
+ 		for (i = 0; i < dev_priv->num_irqs; ++i) {
+-			atomic_set(&cur_irq->irq_received, 0);
++			atomic_set_unchecked(&cur_irq->irq_received, 0);
+ 			cur_irq->enable_mask = dev_priv->irq_masks[i][0];
+ 			cur_irq->pending_mask = dev_priv->irq_masks[i][1];
+ 			DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
+@@ -368,7 +368,7 @@ int via_wait_irq(struct drm_device *dev,
+ 	switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
+ 	case VIA_IRQ_RELATIVE:
+ 		irqwait->request.sequence +=
+-			atomic_read(&cur_irq->irq_received);
++			atomic_read_unchecked(&cur_irq->irq_received);
+ 		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
+ 	case VIA_IRQ_ABSOLUTE:
+ 		break;
+diff -urNp linux-2.6.32.40/drivers/hid/hid-core.c linux-2.6.32.40/drivers/hid/hid-core.c
+--- linux-2.6.32.40/drivers/hid/hid-core.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/hid/hid-core.c	2011-05-10 22:12:32.000000000 -0400
+@@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device
+ 
+ int hid_add_device(struct hid_device *hdev)
+ {
+-	static atomic_t id = ATOMIC_INIT(0);
++	static atomic_unchecked_t id = ATOMIC_INIT(0);
+ 	int ret;
+ 
+ 	if (WARN_ON(hdev->status & HID_STAT_ADDED))
+@@ -1766,7 +1766,7 @@ int hid_add_device(struct hid_device *hd
+ 	/* XXX hack, any other cleaner solution after the driver core
+ 	 * is converted to allow more than 20 bytes as the device name? */
+ 	dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
+-		     hdev->vendor, hdev->product, atomic_inc_return(&id));
++		     hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
+ 
+ 	ret = device_add(&hdev->dev);
+ 	if (!ret)
+diff -urNp linux-2.6.32.40/drivers/hid/usbhid/hiddev.c linux-2.6.32.40/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.32.40/drivers/hid/usbhid/hiddev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/hid/usbhid/hiddev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
  		return put_user(HID_VERSION, (int __user *)arg);
  
@@ -26721,9 +28162,111 @@ diff -urNp linux-2.6.32.39/drivers/hid/usbhid/hiddev.c linux-2.6.32.39/drivers/h
  			return -EINVAL;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.32.39/drivers/hwmon/w83791d.c linux-2.6.32.39/drivers/hwmon/w83791d.c
---- linux-2.6.32.39/drivers/hwmon/w83791d.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/hwmon/w83791d.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/hwmon/lis3lv02d.c linux-2.6.32.40/drivers/hwmon/lis3lv02d.c
+--- linux-2.6.32.40/drivers/hwmon/lis3lv02d.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/hwmon/lis3lv02d.c	2011-05-04 17:56:28.000000000 -0400
+@@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(in
+ 	 * the lid is closed. This leads to interrupts as soon as a little move
+ 	 * is done.
+ 	 */
+-	atomic_inc(&lis3_dev.count);
++	atomic_inc_unchecked(&lis3_dev.count);
+ 
+ 	wake_up_interruptible(&lis3_dev.misc_wait);
+ 	kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
+@@ -160,7 +160,7 @@ static int lis3lv02d_misc_open(struct in
+ 	if (test_and_set_bit(0, &lis3_dev.misc_opened))
+ 		return -EBUSY; /* already open */
+ 
+-	atomic_set(&lis3_dev.count, 0);
++	atomic_set_unchecked(&lis3_dev.count, 0);
+ 
+ 	/*
+ 	 * The sensor can generate interrupts for free-fall and direction
+@@ -206,7 +206,7 @@ static ssize_t lis3lv02d_misc_read(struc
+ 	add_wait_queue(&lis3_dev.misc_wait, &wait);
+ 	while (true) {
+ 		set_current_state(TASK_INTERRUPTIBLE);
+-		data = atomic_xchg(&lis3_dev.count, 0);
++		data = atomic_xchg_unchecked(&lis3_dev.count, 0);
+ 		if (data)
+ 			break;
+ 
+@@ -244,7 +244,7 @@ out:
+ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
+ {
+ 	poll_wait(file, &lis3_dev.misc_wait, wait);
+-	if (atomic_read(&lis3_dev.count))
++	if (atomic_read_unchecked(&lis3_dev.count))
+ 		return POLLIN | POLLRDNORM;
+ 	return 0;
+ }
+diff -urNp linux-2.6.32.40/drivers/hwmon/lis3lv02d.h linux-2.6.32.40/drivers/hwmon/lis3lv02d.h
+--- linux-2.6.32.40/drivers/hwmon/lis3lv02d.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/hwmon/lis3lv02d.h	2011-05-04 17:56:28.000000000 -0400
+@@ -201,7 +201,7 @@ struct lis3lv02d {
+ 
+ 	struct input_polled_dev	*idev;     /* input device */
+ 	struct platform_device	*pdev;     /* platform device */
+-	atomic_t		count;     /* interrupt count after last read */
++	atomic_unchecked_t	count;     /* interrupt count after last read */
+ 	int			xcalib;    /* calibrated null value for x */
+ 	int			ycalib;    /* calibrated null value for y */
+ 	int			zcalib;    /* calibrated null value for z */
+diff -urNp linux-2.6.32.40/drivers/hwmon/sht15.c linux-2.6.32.40/drivers/hwmon/sht15.c
+--- linux-2.6.32.40/drivers/hwmon/sht15.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/hwmon/sht15.c	2011-05-04 17:56:28.000000000 -0400
+@@ -112,7 +112,7 @@ struct sht15_data {
+ 	int				supply_uV;
+ 	int				supply_uV_valid;
+ 	struct work_struct		update_supply_work;
+-	atomic_t			interrupt_handled;
++	atomic_unchecked_t		interrupt_handled;
+ };
+ 
+ /**
+@@ -245,13 +245,13 @@ static inline int sht15_update_single_va
+ 		return ret;
+ 
+ 	gpio_direction_input(data->pdata->gpio_data);
+-	atomic_set(&data->interrupt_handled, 0);
++	atomic_set_unchecked(&data->interrupt_handled, 0);
+ 
+ 	enable_irq(gpio_to_irq(data->pdata->gpio_data));
+ 	if (gpio_get_value(data->pdata->gpio_data) == 0) {
+ 		disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
+ 		/* Only relevant if the interrupt hasn't occured. */
+-		if (!atomic_read(&data->interrupt_handled))
++		if (!atomic_read_unchecked(&data->interrupt_handled))
+ 			schedule_work(&data->read_work);
+ 	}
+ 	ret = wait_event_timeout(data->wait_queue,
+@@ -398,7 +398,7 @@ static irqreturn_t sht15_interrupt_fired
+ 	struct sht15_data *data = d;
+ 	/* First disable the interrupt */
+ 	disable_irq_nosync(irq);
+-	atomic_inc(&data->interrupt_handled);
++	atomic_inc_unchecked(&data->interrupt_handled);
+ 	/* Then schedule a reading work struct */
+ 	if (data->flag != SHT15_READING_NOTHING)
+ 		schedule_work(&data->read_work);
+@@ -449,11 +449,11 @@ static void sht15_bh_read_data(struct wo
+ 		   here as could have gone low in meantime so verify
+ 		   it hasn't!
+ 		*/
+-		atomic_set(&data->interrupt_handled, 0);
++		atomic_set_unchecked(&data->interrupt_handled, 0);
+ 		enable_irq(gpio_to_irq(data->pdata->gpio_data));
+ 		/* If still not occured or another handler has been scheduled */
+ 		if (gpio_get_value(data->pdata->gpio_data)
+-		    || atomic_read(&data->interrupt_handled))
++		    || atomic_read_unchecked(&data->interrupt_handled))
+ 			return;
+ 	}
+ 	/* Read the data back from the device */
+diff -urNp linux-2.6.32.40/drivers/hwmon/w83791d.c linux-2.6.32.40/drivers/hwmon/w83791d.c
+--- linux-2.6.32.40/drivers/hwmon/w83791d.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/hwmon/w83791d.c	2011-04-17 15:56:46.000000000 -0400
 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
  			  struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
@@ -26735,9 +28278,9 @@ diff -urNp linux-2.6.32.39/drivers/hwmon/w83791d.c linux-2.6.32.39/drivers/hwmon
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.32.39/drivers/ide/ide-cd.c linux-2.6.32.39/drivers/ide/ide-cd.c
---- linux-2.6.32.39/drivers/ide/ide-cd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ide/ide-cd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ide/ide-cd.c linux-2.6.32.40/drivers/ide/ide-cd.c
+--- linux-2.6.32.40/drivers/ide/ide-cd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ide/ide-cd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
@@ -26747,9 +28290,9 @@ diff -urNp linux-2.6.32.39/drivers/ide/ide-cd.c linux-2.6.32.39/drivers/ide/ide-
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-2.6.32.39/drivers/ieee1394/dv1394.c linux-2.6.32.39/drivers/ieee1394/dv1394.c
---- linux-2.6.32.39/drivers/ieee1394/dv1394.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ieee1394/dv1394.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ieee1394/dv1394.c linux-2.6.32.40/drivers/ieee1394/dv1394.c
+--- linux-2.6.32.40/drivers/ieee1394/dv1394.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ieee1394/dv1394.c	2011-04-23 12:56:11.000000000 -0400
 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
  	based upon DIF section and sequence
  */
@@ -26759,9 +28302,9 @@ diff -urNp linux-2.6.32.39/drivers/ieee1394/dv1394.c linux-2.6.32.39/drivers/iee
  frame_put_packet (struct frame *f, struct packet *p)
  {
  	int section_type = p->data[0] >> 5;           /* section type is in bits 5 - 7 */
-diff -urNp linux-2.6.32.39/drivers/ieee1394/hosts.c linux-2.6.32.39/drivers/ieee1394/hosts.c
---- linux-2.6.32.39/drivers/ieee1394/hosts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ieee1394/hosts.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ieee1394/hosts.c linux-2.6.32.40/drivers/ieee1394/hosts.c
+--- linux-2.6.32.40/drivers/ieee1394/hosts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ieee1394/hosts.c	2011-04-17 15:56:46.000000000 -0400
 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 
  }
  
@@ -26770,9 +28313,9 @@ diff -urNp linux-2.6.32.39/drivers/ieee1394/hosts.c linux-2.6.32.39/drivers/ieee
  	.transmit_packet = dummy_transmit_packet,
  	.devctl =	   dummy_devctl,
  	.isoctl =	   dummy_isoctl
-diff -urNp linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c
---- linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.40/drivers/ieee1394/init_ohci1394_dma.c
+--- linux-2.6.32.40/drivers/ieee1394/init_ohci1394_dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ieee1394/init_ohci1394_dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con
  			for (func = 0; func < 8; func++) {
  				u32 class = read_pci_config(num,slot,func,
@@ -26782,9 +28325,9 @@ diff -urNp linux-2.6.32.39/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.39/
  					continue; /* No device at this func */
  
  				if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
-diff -urNp linux-2.6.32.39/drivers/ieee1394/ohci1394.c linux-2.6.32.39/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.39/drivers/ieee1394/ohci1394.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ieee1394/ohci1394.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ieee1394/ohci1394.c linux-2.6.32.40/drivers/ieee1394/ohci1394.c
+--- linux-2.6.32.40/drivers/ieee1394/ohci1394.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ieee1394/ohci1394.c	2011-04-23 12:56:11.000000000 -0400
 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
  printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
  
@@ -26797,9 +28340,9 @@ diff -urNp linux-2.6.32.39/drivers/ieee1394/ohci1394.c linux-2.6.32.39/drivers/i
  
  static void dma_trm_tasklet(unsigned long data);
  static void dma_trm_reset(struct dma_trm_ctx *d);
-diff -urNp linux-2.6.32.39/drivers/ieee1394/sbp2.c linux-2.6.32.39/drivers/ieee1394/sbp2.c
---- linux-2.6.32.39/drivers/ieee1394/sbp2.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/ieee1394/sbp2.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/ieee1394/sbp2.c linux-2.6.32.40/drivers/ieee1394/sbp2.c
+--- linux-2.6.32.40/drivers/ieee1394/sbp2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/ieee1394/sbp2.c	2011-04-23 12:56:11.000000000 -0400
 @@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
  MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
  MODULE_LICENSE("GPL");
@@ -26809,9 +28352,9 @@ diff -urNp linux-2.6.32.39/drivers/ieee1394/sbp2.c linux-2.6.32.39/drivers/ieee1
  {
  	int ret;
  
-diff -urNp linux-2.6.32.39/drivers/infiniband/core/cm.c linux-2.6.32.39/drivers/infiniband/core/cm.c
---- linux-2.6.32.39/drivers/infiniband/core/cm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/infiniband/core/cm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/infiniband/core/cm.c linux-2.6.32.40/drivers/infiniband/core/cm.c
+--- linux-2.6.32.40/drivers/infiniband/core/cm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/core/cm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,7 +112,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -26955,9 +28498,79 @@ diff -urNp linux-2.6.32.39/drivers/infiniband/core/cm.c linux-2.6.32.39/drivers/
  	.show = cm_show_counter
  };
  
-diff -urNp linux-2.6.32.39/drivers/infiniband/core/sysfs.c linux-2.6.32.39/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.39/drivers/infiniband/core/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/infiniband/core/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/infiniband/core/fmr_pool.c linux-2.6.32.40/drivers/infiniband/core/fmr_pool.c
+--- linux-2.6.32.40/drivers/infiniband/core/fmr_pool.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/core/fmr_pool.c	2011-05-04 17:56:28.000000000 -0400
+@@ -97,8 +97,8 @@ struct ib_fmr_pool {
+ 
+ 	struct task_struct       *thread;
+ 
+-	atomic_t                  req_ser;
+-	atomic_t                  flush_ser;
++	atomic_unchecked_t        req_ser;
++	atomic_unchecked_t        flush_ser;
+ 
+ 	wait_queue_head_t         force_wait;
+ };
+@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *p
+ 	struct ib_fmr_pool *pool = pool_ptr;
+ 
+ 	do {
+-		if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
++		if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
+ 			ib_fmr_batch_release(pool);
+ 
+-			atomic_inc(&pool->flush_ser);
++			atomic_inc_unchecked(&pool->flush_ser);
+ 			wake_up_interruptible(&pool->force_wait);
+ 
+ 			if (pool->flush_function)
+@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *p
+ 		}
+ 
+ 		set_current_state(TASK_INTERRUPTIBLE);
+-		if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
++		if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
+ 		    !kthread_should_stop())
+ 			schedule();
+ 		__set_current_state(TASK_RUNNING);
+@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(s
+ 	pool->dirty_watermark = params->dirty_watermark;
+ 	pool->dirty_len       = 0;
+ 	spin_lock_init(&pool->pool_lock);
+-	atomic_set(&pool->req_ser,   0);
+-	atomic_set(&pool->flush_ser, 0);
++	atomic_set_unchecked(&pool->req_ser,   0);
++	atomic_set_unchecked(&pool->flush_ser, 0);
+ 	init_waitqueue_head(&pool->force_wait);
+ 
+ 	pool->thread = kthread_run(ib_fmr_cleanup_thread,
+@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool
+ 	}
+ 	spin_unlock_irq(&pool->pool_lock);
+ 
+-	serial = atomic_inc_return(&pool->req_ser);
++	serial = atomic_inc_return_unchecked(&pool->req_ser);
+ 	wake_up_process(pool->thread);
+ 
+ 	if (wait_event_interruptible(pool->force_wait,
+-				     atomic_read(&pool->flush_ser) - serial >= 0))
++				     atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
+ 		return -EINTR;
+ 
+ 	return 0;
+@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr
+ 		} else {
+ 			list_add_tail(&fmr->list, &pool->dirty_list);
+ 			if (++pool->dirty_len >= pool->dirty_watermark) {
+-				atomic_inc(&pool->req_ser);
++				atomic_inc_unchecked(&pool->req_ser);
+ 				wake_up_process(pool->thread);
+ 			}
+ 		}
+diff -urNp linux-2.6.32.40/drivers/infiniband/core/sysfs.c linux-2.6.32.40/drivers/infiniband/core/sysfs.c
+--- linux-2.6.32.40/drivers/infiniband/core/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/core/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
  	return port_attr->show(p, port_attr, buf);
  }
@@ -26967,9 +28580,9 @@ diff -urNp linux-2.6.32.39/drivers/infiniband/core/sysfs.c linux-2.6.32.39/drive
  	.show = port_attr_show
  };
  
-diff -urNp linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c
---- linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.40/drivers/infiniband/core/uverbs_marshall.c
+--- linux-2.6.32.40/drivers/infiniband/core/uverbs_marshall.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/core/uverbs_marshall.c	2011-04-17 15:56:46.000000000 -0400
 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
  	dst->grh.sgid_index        = src->grh.sgid_index;
  	dst->grh.hop_limit         = src->grh.hop_limit;
@@ -27000,9 +28613,420 @@ diff -urNp linux-2.6.32.39/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
  }
  EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
  
-diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/common.c linux-2.6.32.39/drivers/isdn/gigaset/common.c
---- linux-2.6.32.39/drivers/isdn/gigaset/common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/gigaset/common.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/infiniband/hw/nes/nes.c linux-2.6.32.40/drivers/infiniband/hw/nes/nes.c
+--- linux-2.6.32.40/drivers/infiniband/hw/nes/nes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/hw/nes/nes.c	2011-05-04 17:56:28.000000000 -0400
+@@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
+ LIST_HEAD(nes_adapter_list);
+ static LIST_HEAD(nes_dev_list);
+ 
+-atomic_t qps_destroyed;
++atomic_unchecked_t qps_destroyed;
+ 
+ static unsigned int ee_flsh_adapter;
+ static unsigned int sysfs_nonidx_addr;
+@@ -259,7 +259,7 @@ static void nes_cqp_rem_ref_callback(str
+ 	struct nes_adapter *nesadapter = nesdev->nesadapter;
+ 	u32 qp_id;
+ 
+-	atomic_inc(&qps_destroyed);
++	atomic_inc_unchecked(&qps_destroyed);
+ 
+ 	/* Free the control structures */
+ 
+diff -urNp linux-2.6.32.40/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.40/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-2.6.32.40/drivers/infiniband/hw/nes/nes_cm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/hw/nes/nes_cm.c	2011-05-04 17:56:28.000000000 -0400
+@@ -69,11 +69,11 @@ u32 cm_packets_received;
+ u32 cm_listens_created;
+ u32 cm_listens_destroyed;
+ u32 cm_backlog_drops;
+-atomic_t cm_loopbacks;
+-atomic_t cm_nodes_created;
+-atomic_t cm_nodes_destroyed;
+-atomic_t cm_accel_dropped_pkts;
+-atomic_t cm_resets_recvd;
++atomic_unchecked_t cm_loopbacks;
++atomic_unchecked_t cm_nodes_created;
++atomic_unchecked_t cm_nodes_destroyed;
++atomic_unchecked_t cm_accel_dropped_pkts;
++atomic_unchecked_t cm_resets_recvd;
+ 
+ static inline int mini_cm_accelerated(struct nes_cm_core *,
+ 	struct nes_cm_node *);
+@@ -149,13 +149,13 @@ static struct nes_cm_ops nes_cm_api = {
+ 
+ static struct nes_cm_core *g_cm_core;
+ 
+-atomic_t cm_connects;
+-atomic_t cm_accepts;
+-atomic_t cm_disconnects;
+-atomic_t cm_closes;
+-atomic_t cm_connecteds;
+-atomic_t cm_connect_reqs;
+-atomic_t cm_rejects;
++atomic_unchecked_t cm_connects;
++atomic_unchecked_t cm_accepts;
++atomic_unchecked_t cm_disconnects;
++atomic_unchecked_t cm_closes;
++atomic_unchecked_t cm_connecteds;
++atomic_unchecked_t cm_connect_reqs;
++atomic_unchecked_t cm_rejects;
+ 
+ 
+ /**
+@@ -1195,7 +1195,7 @@ static struct nes_cm_node *make_cm_node(
+ 		  cm_node->rem_mac);
+ 
+ 	add_hte_node(cm_core, cm_node);
+-	atomic_inc(&cm_nodes_created);
++	atomic_inc_unchecked(&cm_nodes_created);
+ 
+ 	return cm_node;
+ }
+@@ -1253,7 +1253,7 @@ static int rem_ref_cm_node(struct nes_cm
+ 	}
+ 
+ 	atomic_dec(&cm_core->node_cnt);
+-	atomic_inc(&cm_nodes_destroyed);
++	atomic_inc_unchecked(&cm_nodes_destroyed);
+ 	nesqp = cm_node->nesqp;
+ 	if (nesqp) {
+ 		nesqp->cm_node = NULL;
+@@ -1320,7 +1320,7 @@ static int process_options(struct nes_cm
+ 
+ static void drop_packet(struct sk_buff *skb)
+ {
+-	atomic_inc(&cm_accel_dropped_pkts);
++	atomic_inc_unchecked(&cm_accel_dropped_pkts);
+ 	dev_kfree_skb_any(skb);
+ }
+ 
+@@ -1377,7 +1377,7 @@ static void handle_rst_pkt(struct nes_cm
+ 
+ 	int	reset = 0;	/* whether to send reset in case of err.. */
+ 	int	passive_state;
+-	atomic_inc(&cm_resets_recvd);
++	atomic_inc_unchecked(&cm_resets_recvd);
+ 	nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
+ 			" refcnt=%d\n", cm_node, cm_node->state,
+ 			atomic_read(&cm_node->ref_count));
+@@ -2000,7 +2000,7 @@ static struct nes_cm_node *mini_cm_conne
+ 				rem_ref_cm_node(cm_node->cm_core, cm_node);
+ 				return NULL;
+ 			}
+-			atomic_inc(&cm_loopbacks);
++			atomic_inc_unchecked(&cm_loopbacks);
+ 			loopbackremotenode->loopbackpartner = cm_node;
+ 			loopbackremotenode->tcp_cntxt.rcv_wscale =
+ 				NES_CM_DEFAULT_RCV_WND_SCALE;
+@@ -2262,7 +2262,7 @@ static int mini_cm_recv_pkt(struct nes_c
+ 			add_ref_cm_node(cm_node);
+ 		} else if (cm_node->state == NES_CM_STATE_TSA) {
+ 			rem_ref_cm_node(cm_core, cm_node);
+-			atomic_inc(&cm_accel_dropped_pkts);
++			atomic_inc_unchecked(&cm_accel_dropped_pkts);
+ 			dev_kfree_skb_any(skb);
+ 			break;
+ 		}
+@@ -2568,7 +2568,7 @@ static int nes_cm_disconn_true(struct ne
+ 
+ 	if ((cm_id) && (cm_id->event_handler)) {
+ 		if (issue_disconn) {
+-			atomic_inc(&cm_disconnects);
++			atomic_inc_unchecked(&cm_disconnects);
+ 			cm_event.event = IW_CM_EVENT_DISCONNECT;
+ 			cm_event.status = disconn_status;
+ 			cm_event.local_addr = cm_id->local_addr;
+@@ -2590,7 +2590,7 @@ static int nes_cm_disconn_true(struct ne
+ 		}
+ 
+ 		if (issue_close) {
+-			atomic_inc(&cm_closes);
++			atomic_inc_unchecked(&cm_closes);
+ 			nes_disconnect(nesqp, 1);
+ 
+ 			cm_id->provider_data = nesqp;
+@@ -2710,7 +2710,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
+ 
+ 	nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
+ 		nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
+-	atomic_inc(&cm_accepts);
++	atomic_inc_unchecked(&cm_accepts);
+ 
+ 	nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
+ 			atomic_read(&nesvnic->netdev->refcnt));
+@@ -2919,7 +2919,7 @@ int nes_reject(struct iw_cm_id *cm_id, c
+ 
+ 	struct nes_cm_core *cm_core;
+ 
+-	atomic_inc(&cm_rejects);
++	atomic_inc_unchecked(&cm_rejects);
+ 	cm_node = (struct nes_cm_node *) cm_id->provider_data;
+ 	loopback = cm_node->loopbackpartner;
+ 	cm_core = cm_node->cm_core;
+@@ -2982,7 +2982,7 @@ int nes_connect(struct iw_cm_id *cm_id, 
+ 		ntohl(cm_id->local_addr.sin_addr.s_addr),
+ 		ntohs(cm_id->local_addr.sin_port));
+ 
+-	atomic_inc(&cm_connects);
++	atomic_inc_unchecked(&cm_connects);
+ 	nesqp->active_conn = 1;
+ 
+ 	/* cache the cm_id in the qp */
+@@ -3195,7 +3195,7 @@ static void cm_event_connected(struct ne
+ 	if (nesqp->destroyed) {
+ 		return;
+ 	}
+-	atomic_inc(&cm_connecteds);
++	atomic_inc_unchecked(&cm_connecteds);
+ 	nes_debug(NES_DBG_CM, "QP%u attempting to connect to  0x%08X:0x%04X on"
+ 			" local port 0x%04X. jiffies = %lu.\n",
+ 			nesqp->hwqp.qp_id,
+@@ -3403,7 +3403,7 @@ static void cm_event_reset(struct nes_cm
+ 
+ 	ret = cm_id->event_handler(cm_id, &cm_event);
+ 	cm_id->add_ref(cm_id);
+-	atomic_inc(&cm_closes);
++	atomic_inc_unchecked(&cm_closes);
+ 	cm_event.event = IW_CM_EVENT_CLOSE;
+ 	cm_event.status = IW_CM_EVENT_STATUS_OK;
+ 	cm_event.provider_data = cm_id->provider_data;
+@@ -3439,7 +3439,7 @@ static void cm_event_mpa_req(struct nes_
+ 		return;
+ 	cm_id = cm_node->cm_id;
+ 
+-	atomic_inc(&cm_connect_reqs);
++	atomic_inc_unchecked(&cm_connect_reqs);
+ 	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
+ 			cm_node, cm_id, jiffies);
+ 
+@@ -3477,7 +3477,7 @@ static void cm_event_mpa_reject(struct n
+ 		return;
+ 	cm_id = cm_node->cm_id;
+ 
+-	atomic_inc(&cm_connect_reqs);
++	atomic_inc_unchecked(&cm_connect_reqs);
+ 	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
+ 			cm_node, cm_id, jiffies);
+ 
+diff -urNp linux-2.6.32.40/drivers/infiniband/hw/nes/nes.h linux-2.6.32.40/drivers/infiniband/hw/nes/nes.h
+--- linux-2.6.32.40/drivers/infiniband/hw/nes/nes.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/hw/nes/nes.h	2011-05-04 17:56:28.000000000 -0400
+@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
+ extern unsigned int wqm_quanta;
+ extern struct list_head nes_adapter_list;
+ 
+-extern atomic_t cm_connects;
+-extern atomic_t cm_accepts;
+-extern atomic_t cm_disconnects;
+-extern atomic_t cm_closes;
+-extern atomic_t cm_connecteds;
+-extern atomic_t cm_connect_reqs;
+-extern atomic_t cm_rejects;
+-extern atomic_t mod_qp_timouts;
+-extern atomic_t qps_created;
+-extern atomic_t qps_destroyed;
+-extern atomic_t sw_qps_destroyed;
++extern atomic_unchecked_t cm_connects;
++extern atomic_unchecked_t cm_accepts;
++extern atomic_unchecked_t cm_disconnects;
++extern atomic_unchecked_t cm_closes;
++extern atomic_unchecked_t cm_connecteds;
++extern atomic_unchecked_t cm_connect_reqs;
++extern atomic_unchecked_t cm_rejects;
++extern atomic_unchecked_t mod_qp_timouts;
++extern atomic_unchecked_t qps_created;
++extern atomic_unchecked_t qps_destroyed;
++extern atomic_unchecked_t sw_qps_destroyed;
+ extern u32 mh_detected;
+ extern u32 mh_pauses_sent;
+ extern u32 cm_packets_sent;
+@@ -196,11 +196,11 @@ extern u32 cm_packets_retrans;
+ extern u32 cm_listens_created;
+ extern u32 cm_listens_destroyed;
+ extern u32 cm_backlog_drops;
+-extern atomic_t cm_loopbacks;
+-extern atomic_t cm_nodes_created;
+-extern atomic_t cm_nodes_destroyed;
+-extern atomic_t cm_accel_dropped_pkts;
+-extern atomic_t cm_resets_recvd;
++extern atomic_unchecked_t cm_loopbacks;
++extern atomic_unchecked_t cm_nodes_created;
++extern atomic_unchecked_t cm_nodes_destroyed;
++extern atomic_unchecked_t cm_accel_dropped_pkts;
++extern atomic_unchecked_t cm_resets_recvd;
+ 
+ extern u32 int_mod_timer_init;
+ extern u32 int_mod_cq_depth_256;
+diff -urNp linux-2.6.32.40/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.40/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-2.6.32.40/drivers/infiniband/hw/nes/nes_nic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/hw/nes/nes_nic.c	2011-05-04 17:56:28.000000000 -0400
+@@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats
+ 	target_stat_values[++index] = mh_detected;
+ 	target_stat_values[++index] = mh_pauses_sent;
+ 	target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
+-	target_stat_values[++index] = atomic_read(&cm_connects);
+-	target_stat_values[++index] = atomic_read(&cm_accepts);
+-	target_stat_values[++index] = atomic_read(&cm_disconnects);
+-	target_stat_values[++index] = atomic_read(&cm_connecteds);
+-	target_stat_values[++index] = atomic_read(&cm_connect_reqs);
+-	target_stat_values[++index] = atomic_read(&cm_rejects);
+-	target_stat_values[++index] = atomic_read(&mod_qp_timouts);
+-	target_stat_values[++index] = atomic_read(&qps_created);
+-	target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
+-	target_stat_values[++index] = atomic_read(&qps_destroyed);
+-	target_stat_values[++index] = atomic_read(&cm_closes);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
++	target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
++	target_stat_values[++index] = atomic_read_unchecked(&qps_created);
++	target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
++	target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
+ 	target_stat_values[++index] = cm_packets_sent;
+ 	target_stat_values[++index] = cm_packets_bounced;
+ 	target_stat_values[++index] = cm_packets_created;
+@@ -1230,11 +1230,11 @@ static void nes_netdev_get_ethtool_stats
+ 	target_stat_values[++index] = cm_listens_created;
+ 	target_stat_values[++index] = cm_listens_destroyed;
+ 	target_stat_values[++index] = cm_backlog_drops;
+-	target_stat_values[++index] = atomic_read(&cm_loopbacks);
+-	target_stat_values[++index] = atomic_read(&cm_nodes_created);
+-	target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
+-	target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
+-	target_stat_values[++index] = atomic_read(&cm_resets_recvd);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
++	target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
+ 	target_stat_values[++index] = int_mod_timer_init;
+ 	target_stat_values[++index] = int_mod_cq_depth_1;
+ 	target_stat_values[++index] = int_mod_cq_depth_4;
+diff -urNp linux-2.6.32.40/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.40/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-2.6.32.40/drivers/infiniband/hw/nes/nes_verbs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/infiniband/hw/nes/nes_verbs.c	2011-05-04 17:56:28.000000000 -0400
+@@ -45,9 +45,9 @@
+ 
+ #include <rdma/ib_umem.h>
+ 
+-atomic_t mod_qp_timouts;
+-atomic_t qps_created;
+-atomic_t sw_qps_destroyed;
++atomic_unchecked_t mod_qp_timouts;
++atomic_unchecked_t qps_created;
++atomic_unchecked_t sw_qps_destroyed;
+ 
+ static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
+ 
+@@ -1240,7 +1240,7 @@ static struct ib_qp *nes_create_qp(struc
+ 	if (init_attr->create_flags)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	atomic_inc(&qps_created);
++	atomic_inc_unchecked(&qps_created);
+ 	switch (init_attr->qp_type) {
+ 		case IB_QPT_RC:
+ 			if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
+@@ -1568,7 +1568,7 @@ static int nes_destroy_qp(struct ib_qp *
+ 	struct iw_cm_event cm_event;
+ 	int ret;
+ 
+-	atomic_inc(&sw_qps_destroyed);
++	atomic_inc_unchecked(&sw_qps_destroyed);
+ 	nesqp->destroyed = 1;
+ 
+ 	/* Blow away the connection if it exists. */
+diff -urNp linux-2.6.32.40/drivers/input/gameport/gameport.c linux-2.6.32.40/drivers/input/gameport/gameport.c
+--- linux-2.6.32.40/drivers/input/gameport/gameport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/input/gameport/gameport.c	2011-05-04 17:56:28.000000000 -0400
+@@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys);
+  */
+ static void gameport_init_port(struct gameport *gameport)
+ {
+-	static atomic_t gameport_no = ATOMIC_INIT(0);
++	static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
+ 
+ 	__module_get(THIS_MODULE);
+ 
+ 	mutex_init(&gameport->drv_mutex);
+ 	device_initialize(&gameport->dev);
+-	dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);
++	dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
+ 	gameport->dev.bus = &gameport_bus;
+ 	gameport->dev.release = gameport_release_port;
+ 	if (gameport->parent)
+diff -urNp linux-2.6.32.40/drivers/input/input.c linux-2.6.32.40/drivers/input/input.c
+--- linux-2.6.32.40/drivers/input/input.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/input/input.c	2011-05-04 17:56:28.000000000 -0400
+@@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability);
+  */
+ int input_register_device(struct input_dev *dev)
+ {
+-	static atomic_t input_no = ATOMIC_INIT(0);
++	static atomic_unchecked_t input_no = ATOMIC_INIT(0);
+ 	struct input_handler *handler;
+ 	const char *path;
+ 	int error;
+@@ -1585,7 +1585,7 @@ int input_register_device(struct input_d
+ 		dev->setkeycode = input_default_setkeycode;
+ 
+ 	dev_set_name(&dev->dev, "input%ld",
+-		     (unsigned long) atomic_inc_return(&input_no) - 1);
++		     (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
+ 
+ 	error = device_add(&dev->dev);
+ 	if (error)
+diff -urNp linux-2.6.32.40/drivers/input/joystick/xpad.c linux-2.6.32.40/drivers/input/joystick/xpad.c
+--- linux-2.6.32.40/drivers/input/joystick/xpad.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/input/joystick/xpad.c	2011-05-04 17:56:28.000000000 -0400
+@@ -621,7 +621,7 @@ static void xpad_led_set(struct led_clas
+ 
+ static int xpad_led_probe(struct usb_xpad *xpad)
+ {
+-	static atomic_t led_seq	= ATOMIC_INIT(0);
++	static atomic_unchecked_t led_seq	= ATOMIC_INIT(0);
+ 	long led_no;
+ 	struct xpad_led *led;
+ 	struct led_classdev *led_cdev;
+@@ -634,7 +634,7 @@ static int xpad_led_probe(struct usb_xpa
+ 	if (!led)
+ 		return -ENOMEM;
+ 
+-	led_no = (long)atomic_inc_return(&led_seq) - 1;
++	led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
+ 
+ 	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
+ 	led->xpad = xpad;
+diff -urNp linux-2.6.32.40/drivers/input/serio/serio.c linux-2.6.32.40/drivers/input/serio/serio.c
+--- linux-2.6.32.40/drivers/input/serio/serio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/input/serio/serio.c	2011-05-04 17:56:28.000000000 -0400
+@@ -527,7 +527,7 @@ static void serio_release_port(struct de
+  */
+ static void serio_init_port(struct serio *serio)
+ {
+-	static atomic_t serio_no = ATOMIC_INIT(0);
++	static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
+ 
+ 	__module_get(THIS_MODULE);
+ 
+@@ -536,7 +536,7 @@ static void serio_init_port(struct serio
+ 	mutex_init(&serio->drv_mutex);
+ 	device_initialize(&serio->dev);
+ 	dev_set_name(&serio->dev, "serio%ld",
+-			(long)atomic_inc_return(&serio_no) - 1);
++			(long)atomic_inc_return_unchecked(&serio_no) - 1);
+ 	serio->dev.bus = &serio_bus;
+ 	serio->dev.release = serio_release_port;
+ 	if (serio->parent) {
+diff -urNp linux-2.6.32.40/drivers/isdn/gigaset/common.c linux-2.6.32.40/drivers/isdn/gigaset/common.c
+--- linux-2.6.32.40/drivers/isdn/gigaset/common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/gigaset/common.c	2011-04-17 15:56:46.000000000 -0400
 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
@@ -27012,9 +29036,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/common.c linux-2.6.32.39/drivers
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/isdn/gigaset/gigaset.h linux-2.6.32.40/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.32.40/drivers/isdn/gigaset/gigaset.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/gigaset/gigaset.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -27032,9 +29056,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/gigaset.h linux-2.6.32.39/driver
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/interface.c linux-2.6.32.39/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.39/drivers/isdn/gigaset/interface.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/gigaset/interface.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/isdn/gigaset/interface.c linux-2.6.32.40/drivers/isdn/gigaset/interface.c
+--- linux-2.6.32.40/drivers/isdn/gigaset/interface.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/gigaset/interface.c	2011-04-17 15:56:46.000000000 -0400
 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
  		return -ERESTARTSYS; // FIXME -EINTR?
  	tty->driver_data = cs;
@@ -27122,9 +29146,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/gigaset/interface.c linux-2.6.32.39/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/isdn/hardware/avm/b1.c linux-2.6.32.40/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.32.40/drivers/isdn/hardware/avm/b1.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/hardware/avm/b1.c	2011-04-17 15:56:46.000000000 -0400
 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
@@ -27143,9 +29167,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/hardware/avm/b1.c linux-2.6.32.39/driver
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-2.6.32.39/drivers/isdn/icn/icn.c linux-2.6.32.39/drivers/isdn/icn/icn.c
---- linux-2.6.32.39/drivers/isdn/icn/icn.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/icn/icn.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/isdn/icn/icn.c linux-2.6.32.40/drivers/isdn/icn/icn.c
+--- linux-2.6.32.40/drivers/isdn/icn/icn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/icn/icn.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
@@ -27155,9 +29179,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/icn/icn.c linux-2.6.32.39/drivers/isdn/i
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-2.6.32.39/drivers/isdn/mISDN/socket.c linux-2.6.32.39/drivers/isdn/mISDN/socket.c
---- linux-2.6.32.39/drivers/isdn/mISDN/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/mISDN/socket.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/isdn/mISDN/socket.c linux-2.6.32.40/drivers/isdn/mISDN/socket.c
+--- linux-2.6.32.40/drivers/isdn/mISDN/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/mISDN/socket.c	2011-04-17 15:56:46.000000000 -0400
 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
  		if (dev) {
  			struct mISDN_devinfo di;
@@ -27174,9 +29198,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/mISDN/socket.c linux-2.6.32.39/drivers/i
  			di.id = dev->id;
  			di.Dprotocols = dev->Dprotocols;
  			di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
-diff -urNp linux-2.6.32.39/drivers/isdn/sc/interrupt.c linux-2.6.32.39/drivers/isdn/sc/interrupt.c
---- linux-2.6.32.39/drivers/isdn/sc/interrupt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/isdn/sc/interrupt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/isdn/sc/interrupt.c linux-2.6.32.40/drivers/isdn/sc/interrupt.c
+--- linux-2.6.32.40/drivers/isdn/sc/interrupt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/isdn/sc/interrupt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
  			}
  			else if(callid>=0x0000 && callid<=0x7FFF)
@@ -27211,9 +29235,9 @@ diff -urNp linux-2.6.32.39/drivers/isdn/sc/interrupt.c linux-2.6.32.39/drivers/i
  			continue;
  		}
  			
-diff -urNp linux-2.6.32.39/drivers/lguest/core.c linux-2.6.32.39/drivers/lguest/core.c
---- linux-2.6.32.39/drivers/lguest/core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/lguest/core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/lguest/core.c linux-2.6.32.40/drivers/lguest/core.c
+--- linux-2.6.32.40/drivers/lguest/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/lguest/core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -91,9 +91,17 @@ static __init int map_switcher(void)
  	 * it's worked so far.  The end address needs +1 because __get_vm_area
  	 * allocates an extra guard page, so we need space for that.
@@ -27241,9 +29265,9 @@ diff -urNp linux-2.6.32.39/drivers/lguest/core.c linux-2.6.32.39/drivers/lguest/
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.32.39/drivers/lguest/x86/core.c linux-2.6.32.39/drivers/lguest/x86/core.c
---- linux-2.6.32.39/drivers/lguest/x86/core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/lguest/x86/core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/lguest/x86/core.c linux-2.6.32.40/drivers/lguest/x86/core.c
+--- linux-2.6.32.40/drivers/lguest/x86/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/lguest/x86/core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -59,7 +59,7 @@ static struct {
  /* Offset from where switcher.S was compiled to where we've copied it */
  static unsigned long switcher_offset(void)
@@ -27285,9 +29309,9 @@ diff -urNp linux-2.6.32.39/drivers/lguest/x86/core.c linux-2.6.32.39/drivers/lgu
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-2.6.32.39/drivers/lguest/x86/switcher_32.S linux-2.6.32.39/drivers/lguest/x86/switcher_32.S
---- linux-2.6.32.39/drivers/lguest/x86/switcher_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/lguest/x86/switcher_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/lguest/x86/switcher_32.S linux-2.6.32.40/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.32.40/drivers/lguest/x86/switcher_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/lguest/x86/switcher_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -27346,9 +29370,9 @@ diff -urNp linux-2.6.32.39/drivers/lguest/x86/switcher_32.S linux-2.6.32.39/driv
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.40/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.32.40/drivers/macintosh/via-pmu-backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/macintosh/via-pmu-backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,7 @@
  
  #define MAX_PMU_LEVEL 0xFF
@@ -27367,9 +29391,9 @@ diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.39
  	.get_brightness	= pmu_backlight_get_brightness,
  	.update_status	= pmu_backlight_update_status,
  
-diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu.c linux-2.6.32.39/drivers/macintosh/via-pmu.c
---- linux-2.6.32.39/drivers/macintosh/via-pmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/macintosh/via-pmu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/macintosh/via-pmu.c linux-2.6.32.40/drivers/macintosh/via-pmu.c
+--- linux-2.6.32.40/drivers/macintosh/via-pmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/macintosh/via-pmu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
  		&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
  }
@@ -27379,9 +29403,66 @@ diff -urNp linux-2.6.32.39/drivers/macintosh/via-pmu.c linux-2.6.32.39/drivers/m
  	.enter = powerbook_sleep,
  	.valid = pmu_sleep_valid,
  };
-diff -urNp linux-2.6.32.39/drivers/md/dm-ioctl.c linux-2.6.32.39/drivers/md/dm-ioctl.c
---- linux-2.6.32.39/drivers/md/dm-ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/md/dm-ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/md/dm.c linux-2.6.32.40/drivers/md/dm.c
+--- linux-2.6.32.40/drivers/md/dm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/dm.c	2011-05-04 17:56:28.000000000 -0400
+@@ -163,9 +163,9 @@ struct mapped_device {
+ 	/*
+ 	 * Event handling.
+ 	 */
+-	atomic_t event_nr;
++	atomic_unchecked_t event_nr;
+ 	wait_queue_head_t eventq;
+-	atomic_t uevent_seq;
++	atomic_unchecked_t uevent_seq;
+ 	struct list_head uevent_list;
+ 	spinlock_t uevent_lock; /* Protect access to uevent_list */
+ 
+@@ -1770,8 +1770,8 @@ static struct mapped_device *alloc_dev(i
+ 	rwlock_init(&md->map_lock);
+ 	atomic_set(&md->holders, 1);
+ 	atomic_set(&md->open_count, 0);
+-	atomic_set(&md->event_nr, 0);
+-	atomic_set(&md->uevent_seq, 0);
++	atomic_set_unchecked(&md->event_nr, 0);
++	atomic_set_unchecked(&md->uevent_seq, 0);
+ 	INIT_LIST_HEAD(&md->uevent_list);
+ 	spin_lock_init(&md->uevent_lock);
+ 
+@@ -1921,7 +1921,7 @@ static void event_callback(void *context
+ 
+ 	dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
+ 
+-	atomic_inc(&md->event_nr);
++	atomic_inc_unchecked(&md->event_nr);
+ 	wake_up(&md->eventq);
+ }
+ 
+@@ -2556,18 +2556,18 @@ void dm_kobject_uevent(struct mapped_dev
+ 
+ uint32_t dm_next_uevent_seq(struct mapped_device *md)
+ {
+-	return atomic_add_return(1, &md->uevent_seq);
++	return atomic_add_return_unchecked(1, &md->uevent_seq);
+ }
+ 
+ uint32_t dm_get_event_nr(struct mapped_device *md)
+ {
+-	return atomic_read(&md->event_nr);
++	return atomic_read_unchecked(&md->event_nr);
+ }
+ 
+ int dm_wait_event(struct mapped_device *md, int event_nr)
+ {
+ 	return wait_event_interruptible(md->eventq,
+-			(event_nr != atomic_read(&md->event_nr)));
++			(event_nr != atomic_read_unchecked(&md->event_nr)));
+ }
+ 
+ void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
+diff -urNp linux-2.6.32.40/drivers/md/dm-ioctl.c linux-2.6.32.40/drivers/md/dm-ioctl.c
+--- linux-2.6.32.40/drivers/md/dm-ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/dm-ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
@@ -27391,9 +29472,125 @@ diff -urNp linux-2.6.32.39/drivers/md/dm-ioctl.c linux-2.6.32.39/drivers/md/dm-i
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-2.6.32.39/drivers/md/dm-sysfs.c linux-2.6.32.39/drivers/md/dm-sysfs.c
---- linux-2.6.32.39/drivers/md/dm-sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/md/dm-sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/md/dm-raid1.c linux-2.6.32.40/drivers/md/dm-raid1.c
+--- linux-2.6.32.40/drivers/md/dm-raid1.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/dm-raid1.c	2011-05-04 17:56:28.000000000 -0400
+@@ -41,7 +41,7 @@ enum dm_raid1_error {
+ 
+ struct mirror {
+ 	struct mirror_set *ms;
+-	atomic_t error_count;
++	atomic_unchecked_t error_count;
+ 	unsigned long error_type;
+ 	struct dm_dev *dev;
+ 	sector_t offset;
+@@ -203,7 +203,7 @@ static void fail_mirror(struct mirror *m
+ 	 * simple way to tell if a device has encountered
+ 	 * errors.
+ 	 */
+-	atomic_inc(&m->error_count);
++	atomic_inc_unchecked(&m->error_count);
+ 
+ 	if (test_and_set_bit(error_type, &m->error_type))
+ 		return;
+@@ -225,7 +225,7 @@ static void fail_mirror(struct mirror *m
+ 	}
+ 
+ 	for (new = ms->mirror; new < ms->mirror + ms->nr_mirrors; new++)
+-		if (!atomic_read(&new->error_count)) {
++		if (!atomic_read_unchecked(&new->error_count)) {
+ 			set_default_mirror(new);
+ 			break;
+ 		}
+@@ -363,7 +363,7 @@ static struct mirror *choose_mirror(stru
+ 	struct mirror *m = get_default_mirror(ms);
+ 
+ 	do {
+-		if (likely(!atomic_read(&m->error_count)))
++		if (likely(!atomic_read_unchecked(&m->error_count)))
+ 			return m;
+ 
+ 		if (m-- == ms->mirror)
+@@ -377,7 +377,7 @@ static int default_ok(struct mirror *m)
+ {
+ 	struct mirror *default_mirror = get_default_mirror(m->ms);
+ 
+-	return !atomic_read(&default_mirror->error_count);
++	return !atomic_read_unchecked(&default_mirror->error_count);
+ }
+ 
+ static int mirror_available(struct mirror_set *ms, struct bio *bio)
+@@ -484,7 +484,7 @@ static void do_reads(struct mirror_set *
+ 		 */
+ 		if (likely(region_in_sync(ms, region, 1)))
+ 			m = choose_mirror(ms, bio->bi_sector);
+-		else if (m && atomic_read(&m->error_count))
++		else if (m && atomic_read_unchecked(&m->error_count))
+ 			m = NULL;
+ 
+ 		if (likely(m))
+@@ -855,7 +855,7 @@ static int get_mirror(struct mirror_set 
+ 	}
+ 
+ 	ms->mirror[mirror].ms = ms;
+-	atomic_set(&(ms->mirror[mirror].error_count), 0);
++	atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
+ 	ms->mirror[mirror].error_type = 0;
+ 	ms->mirror[mirror].offset = offset;
+ 
+@@ -1241,7 +1241,7 @@ static void mirror_resume(struct dm_targ
+  */
+ static char device_status_char(struct mirror *m)
+ {
+-	if (!atomic_read(&(m->error_count)))
++	if (!atomic_read_unchecked(&(m->error_count)))
+ 		return 'A';
+ 
+ 	return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
+diff -urNp linux-2.6.32.40/drivers/md/dm-stripe.c linux-2.6.32.40/drivers/md/dm-stripe.c
+--- linux-2.6.32.40/drivers/md/dm-stripe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/dm-stripe.c	2011-05-04 17:56:28.000000000 -0400
+@@ -20,7 +20,7 @@ struct stripe {
+ 	struct dm_dev *dev;
+ 	sector_t physical_start;
+ 
+-	atomic_t error_count;
++	atomic_unchecked_t error_count;
+ };
+ 
+ struct stripe_c {
+@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *
+ 			kfree(sc);
+ 			return r;
+ 		}
+-		atomic_set(&(sc->stripe[i].error_count), 0);
++		atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
+ 	}
+ 
+ 	ti->private = sc;
+@@ -257,7 +257,7 @@ static int stripe_status(struct dm_targe
+ 		DMEMIT("%d ", sc->stripes);
+ 		for (i = 0; i < sc->stripes; i++)  {
+ 			DMEMIT("%s ", sc->stripe[i].dev->name);
+-			buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
++			buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
+ 				'D' : 'A';
+ 		}
+ 		buffer[i] = '\0';
+@@ -304,8 +304,8 @@ static int stripe_end_io(struct dm_targe
+ 	 */
+ 	for (i = 0; i < sc->stripes; i++)
+ 		if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
+-			atomic_inc(&(sc->stripe[i].error_count));
+-			if (atomic_read(&(sc->stripe[i].error_count)) <
++			atomic_inc_unchecked(&(sc->stripe[i].error_count));
++			if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
+ 			    DM_IO_ERROR_THRESHOLD)
+ 				queue_work(kstriped, &sc->kstriped_ws);
+ 		}
+diff -urNp linux-2.6.32.40/drivers/md/dm-sysfs.c linux-2.6.32.40/drivers/md/dm-sysfs.c
+--- linux-2.6.32.40/drivers/md/dm-sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/dm-sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
  	NULL,
  };
@@ -27403,9 +29600,9 @@ diff -urNp linux-2.6.32.39/drivers/md/dm-sysfs.c linux-2.6.32.39/drivers/md/dm-s
  	.show	= dm_attr_show,
  };
  
-diff -urNp linux-2.6.32.39/drivers/md/dm-table.c linux-2.6.32.39/drivers/md/dm-table.c
---- linux-2.6.32.39/drivers/md/dm-table.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/md/dm-table.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/md/dm-table.c linux-2.6.32.40/drivers/md/dm-table.c
+--- linux-2.6.32.40/drivers/md/dm-table.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/dm-table.c	2011-04-17 15:56:46.000000000 -0400
 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
@@ -27415,9 +29612,67 @@ diff -urNp linux-2.6.32.39/drivers/md/dm-table.c linux-2.6.32.39/drivers/md/dm-t
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md.c
---- linux-2.6.32.39/drivers/md/md.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/md/md.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/md/md.c linux-2.6.32.40/drivers/md/md.c
+--- linux-2.6.32.40/drivers/md/md.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/md.c	2011-05-04 17:56:20.000000000 -0400
+@@ -153,10 +153,10 @@ static int start_readonly;
+  *  start build, activate spare
+  */
+ static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
+-static atomic_t md_event_count;
++static atomic_unchecked_t md_event_count;
+ void md_new_event(mddev_t *mddev)
+ {
+-	atomic_inc(&md_event_count);
++	atomic_inc_unchecked(&md_event_count);
+ 	wake_up(&md_event_waiters);
+ }
+ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+  */
+ static void md_new_event_inintr(mddev_t *mddev)
+ {
+-	atomic_inc(&md_event_count);
++	atomic_inc_unchecked(&md_event_count);
+ 	wake_up(&md_event_waiters);
+ }
+ 
+@@ -1218,7 +1218,7 @@ static int super_1_load(mdk_rdev_t *rdev
+ 
+ 	rdev->preferred_minor = 0xffff;
+ 	rdev->data_offset = le64_to_cpu(sb->data_offset);
+-	atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
++	atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
+ 
+ 	rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
+ 	bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
+@@ -1392,7 +1392,7 @@ static void super_1_sync(mddev_t *mddev,
+ 	else
+ 		sb->resync_offset = cpu_to_le64(0);
+ 
+-	sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
++	sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
+ 
+ 	sb->raid_disks = cpu_to_le32(mddev->raid_disks);
+ 	sb->size = cpu_to_le64(mddev->dev_sectors);
+@@ -2214,7 +2214,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
+ static ssize_t
+ errors_show(mdk_rdev_t *rdev, char *page)
+ {
+-	return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
++	return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
+ }
+ 
+ static ssize_t
+@@ -2223,7 +2223,7 @@ errors_store(mdk_rdev_t *rdev, const cha
+ 	char *e;
+ 	unsigned long n = simple_strtoul(buf, &e, 10);
+ 	if (*buf && (*e == 0 || *e == '\n')) {
+-		atomic_set(&rdev->corrected_errors, n);
++		atomic_set_unchecked(&rdev->corrected_errors, n);
+ 		return len;
+ 	}
+ 	return -EINVAL;
 @@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko
  	mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
  	kfree(rdev);
@@ -27427,6 +29682,17 @@ diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md.c
  	.show		= rdev_attr_show,
  	.store		= rdev_attr_store,
  };
+@@ -2566,8 +2566,8 @@ static mdk_rdev_t *md_import_device(dev_
+ 	rdev->data_offset = 0;
+ 	rdev->sb_events = 0;
+ 	atomic_set(&rdev->nr_pending, 0);
+-	atomic_set(&rdev->read_errors, 0);
+-	atomic_set(&rdev->corrected_errors, 0);
++	atomic_set_unchecked(&rdev->read_errors, 0);
++	atomic_set_unchecked(&rdev->corrected_errors, 0);
+ 
+ 	size = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
+ 	if (!size) {
 @@ -3887,7 +3887,7 @@ static void md_free(struct kobject *ko)
  	kfree(mddev);
  }
@@ -27446,6 +29712,15 @@ diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md.c
  	return err;
  }
  
+@@ -5954,7 +5955,7 @@ static int md_seq_show(struct seq_file *
+ 
+ 		spin_unlock(&pers_lock);
+ 		seq_printf(seq, "\n");
+-		mi->event = atomic_read(&md_event_count);
++		mi->event = atomic_read_unchecked(&md_event_count);
+ 		return 0;
+ 	}
+ 	if (v == (void*)2) {
 @@ -6043,7 +6044,7 @@ static int md_seq_show(struct seq_file *
  				chunk_kb ? "KB" : "B");
  			if (bitmap->file) {
@@ -27455,6 +29730,24 @@ diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md.c
  			}
  
  			seq_printf(seq, "\n");
+@@ -6077,7 +6078,7 @@ static int md_seq_open(struct inode *ino
+ 	else {
+ 		struct seq_file *p = file->private_data;
+ 		p->private = mi;
+-		mi->event = atomic_read(&md_event_count);
++		mi->event = atomic_read_unchecked(&md_event_count);
+ 	}
+ 	return error;
+ }
+@@ -6093,7 +6094,7 @@ static unsigned int mdstat_poll(struct f
+ 	/* always allow read */
+ 	mask = POLLIN | POLLRDNORM;
+ 
+-	if (mi->event != atomic_read(&md_event_count))
++	if (mi->event != atomic_read_unchecked(&md_event_count))
+ 		mask |= POLLERR | POLLPRI;
+ 	return mask;
+ }
 @@ -6137,7 +6138,7 @@ static int is_mddev_idle(mddev_t *mddev,
  		struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
  		curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
@@ -27464,9 +29757,22 @@ diff -urNp linux-2.6.32.39/drivers/md/md.c linux-2.6.32.39/drivers/md/md.c
  		/* sync IO will cause sync_io to increase before the disk_stats
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
-diff -urNp linux-2.6.32.39/drivers/md/md.h linux-2.6.32.39/drivers/md/md.h
---- linux-2.6.32.39/drivers/md/md.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/md/md.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/md/md.h linux-2.6.32.40/drivers/md/md.h
+--- linux-2.6.32.40/drivers/md/md.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/md.h	2011-05-04 17:56:20.000000000 -0400
+@@ -94,10 +94,10 @@ struct mdk_rdev_s
+ 					 * only maintained for arrays that
+ 					 * support hot removal
+ 					 */
+-	atomic_t	read_errors;	/* number of consecutive read errors that
++	atomic_unchecked_t	read_errors;	/* number of consecutive read errors that
+ 					 * we have tried to ignore.
+ 					 */
+-	atomic_t	corrected_errors; /* number of corrected read errors,
++	atomic_unchecked_t	corrected_errors; /* number of corrected read errors,
+ 					   * for reporting to userspace and storing
+ 					   * in superblock.
+ 					   */
 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -27476,9 +29782,91 @@ diff -urNp linux-2.6.32.39/drivers/md/md.h linux-2.6.32.39/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/md/raid10.c linux-2.6.32.40/drivers/md/raid10.c
+--- linux-2.6.32.40/drivers/md/raid10.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/raid10.c	2011-05-04 17:56:28.000000000 -0400
+@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi
+ 	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
+ 		set_bit(R10BIO_Uptodate, &r10_bio->state);
+ 	else {
+-		atomic_add(r10_bio->sectors,
++		atomic_add_unchecked(r10_bio->sectors,
+ 			   &conf->mirrors[d].rdev->corrected_errors);
+ 		if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
+ 			md_error(r10_bio->mddev,
+@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf,
+ 			    test_bit(In_sync, &rdev->flags)) {
+ 				atomic_inc(&rdev->nr_pending);
+ 				rcu_read_unlock();
+-				atomic_add(s, &rdev->corrected_errors);
++				atomic_add_unchecked(s, &rdev->corrected_errors);
+ 				if (sync_page_io(rdev->bdev,
+ 						 r10_bio->devs[sl].addr +
+ 						 sect + rdev->data_offset,
+diff -urNp linux-2.6.32.40/drivers/md/raid1.c linux-2.6.32.40/drivers/md/raid1.c
+--- linux-2.6.32.40/drivers/md/raid1.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/raid1.c	2011-05-04 17:56:28.000000000 -0400
+@@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t *
+ 					if (r1_bio->bios[d]->bi_end_io != end_sync_read)
+ 						continue;
+ 					rdev = conf->mirrors[d].rdev;
+-					atomic_add(s, &rdev->corrected_errors);
++					atomic_add_unchecked(s, &rdev->corrected_errors);
+ 					if (sync_page_io(rdev->bdev,
+ 							 sect + rdev->data_offset,
+ 							 s<<9,
+@@ -1564,7 +1564,7 @@ static void fix_read_error(conf_t *conf,
+ 					/* Well, this device is dead */
+ 					md_error(mddev, rdev);
+ 				else {
+-					atomic_add(s, &rdev->corrected_errors);
++					atomic_add_unchecked(s, &rdev->corrected_errors);
+ 					printk(KERN_INFO
+ 					       "raid1:%s: read error corrected "
+ 					       "(%d sectors at %llu on %s)\n",
+diff -urNp linux-2.6.32.40/drivers/md/raid5.c linux-2.6.32.40/drivers/md/raid5.c
+--- linux-2.6.32.40/drivers/md/raid5.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/md/raid5.c	2011-05-04 17:56:28.000000000 -0400
+@@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_hea
+ 			bi->bi_next = NULL;
+ 			if (rw == WRITE &&
+ 			    test_bit(R5_ReWrite, &sh->dev[i].flags))
+-				atomic_add(STRIPE_SECTORS,
++				atomic_add_unchecked(STRIPE_SECTORS,
+ 					&rdev->corrected_errors);
+ 			generic_make_request(bi);
+ 		} else {
+@@ -1517,15 +1517,15 @@ static void raid5_end_read_request(struc
+ 			clear_bit(R5_ReadError, &sh->dev[i].flags);
+ 			clear_bit(R5_ReWrite, &sh->dev[i].flags);
+ 		}
+-		if (atomic_read(&conf->disks[i].rdev->read_errors))
+-			atomic_set(&conf->disks[i].rdev->read_errors, 0);
++		if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
++			atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
+ 	} else {
+ 		const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
+ 		int retry = 0;
+ 		rdev = conf->disks[i].rdev;
+ 
+ 		clear_bit(R5_UPTODATE, &sh->dev[i].flags);
+-		atomic_inc(&rdev->read_errors);
++		atomic_inc_unchecked(&rdev->read_errors);
+ 		if (conf->mddev->degraded >= conf->max_degraded)
+ 			printk_rl(KERN_WARNING
+ 				  "raid5:%s: read error not correctable "
+@@ -1543,7 +1543,7 @@ static void raid5_end_read_request(struc
+ 				  (unsigned long long)(sh->sector
+ 						       + rdev->data_offset),
+ 				  bdn);
+-		else if (atomic_read(&rdev->read_errors)
++		else if (atomic_read_unchecked(&rdev->read_errors)
+ 			 > conf->max_nr_stripes)
+ 			printk(KERN_WARNING
+ 			       "raid5:%s: Too many read errors, failing device %s.\n",
+diff -urNp linux-2.6.32.40/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.40/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.32.40/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/dvb/dvb-core/dvbdev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
  			const struct dvb_device *template, void *priv, int type)
  {
@@ -27487,9 +29875,9 @@ diff -urNp linux-2.6.32.39/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.39/d
  	struct file_operations *dvbdevfops;
  	struct device *clsdev;
  	int minor;
-diff -urNp linux-2.6.32.39/drivers/media/radio/radio-cadet.c linux-2.6.32.39/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.39/drivers/media/radio/radio-cadet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/media/radio/radio-cadet.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/media/radio/radio-cadet.c linux-2.6.32.40/drivers/media/radio/radio-cadet.c
+--- linux-2.6.32.40/drivers/media/radio/radio-cadet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/radio/radio-cadet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
  	while (i < count && dev->rdsin != dev->rdsout)
  		readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -27499,9 +29887,66 @@ diff -urNp linux-2.6.32.39/drivers/media/radio/radio-cadet.c linux-2.6.32.39/dri
  		return -EFAULT;
  	return i;
  }
-diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.40/drivers/media/video/cx18/cx18-driver.c
+--- linux-2.6.32.40/drivers/media/video/cx18/cx18-driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/cx18/cx18-driver.c	2011-05-04 17:56:28.000000000 -0400
+@@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl
+ 
+ MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
+ 
+-static atomic_t cx18_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t cx18_instance = ATOMIC_INIT(0);
+ 
+ /* Parameter declarations */
+ static int cardtype[CX18_MAX_CARDS];
+@@ -800,7 +800,7 @@ static int __devinit cx18_probe(struct p
+ 	struct cx18 *cx;
+ 
+ 	/* FIXME - module parameter arrays constrain max instances */
+-	i = atomic_inc_return(&cx18_instance) - 1;
++	i = atomic_inc_return_unchecked(&cx18_instance) - 1;
+ 	if (i >= CX18_MAX_CARDS) {
+ 		printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
+ 		       "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
+diff -urNp linux-2.6.32.40/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.40/drivers/media/video/ivtv/ivtv-driver.c
+--- linux-2.6.32.40/drivers/media/video/ivtv/ivtv-driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/ivtv/ivtv-driver.c	2011-05-04 17:56:28.000000000 -0400
+@@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl
+ MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
+ 
+ /* ivtv instance counter */
+-static atomic_t ivtv_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
+ 
+ /* Parameter declarations */
+ static int cardtype[IVTV_MAX_CARDS];
+diff -urNp linux-2.6.32.40/drivers/media/video/omap24xxcam.c linux-2.6.32.40/drivers/media/video/omap24xxcam.c
+--- linux-2.6.32.40/drivers/media/video/omap24xxcam.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/omap24xxcam.c	2011-05-04 17:56:28.000000000 -0400
+@@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(str
+ 	spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
+ 
+ 	do_gettimeofday(&vb->ts);
+-	vb->field_count = atomic_add_return(2, &fh->field_count);
++	vb->field_count = atomic_add_return_unchecked(2, &fh->field_count);
+ 	if (csr & csr_error) {
+ 		vb->state = VIDEOBUF_ERROR;
+ 		if (!atomic_read(&fh->cam->in_reset)) {
+diff -urNp linux-2.6.32.40/drivers/media/video/omap24xxcam.h linux-2.6.32.40/drivers/media/video/omap24xxcam.h
+--- linux-2.6.32.40/drivers/media/video/omap24xxcam.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/omap24xxcam.h	2011-05-04 17:56:28.000000000 -0400
+@@ -533,7 +533,7 @@ struct omap24xxcam_fh {
+ 	spinlock_t vbq_lock; /* spinlock for the videobuf queue */
+ 	struct videobuf_queue vbq;
+ 	struct v4l2_pix_format pix; /* serialise pix by vbq->lock */
+-	atomic_t field_count; /* field counter for videobuf_buffer */
++	atomic_unchecked_t field_count; /* field counter for videobuf_buffer */
+ 	/* accessing cam here doesn't need serialisation: it's constant */
+ 	struct omap24xxcam_device *cam;
+ };
+diff -urNp linux-2.6.32.40/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.40/drivers/media/video/usbvideo/konicawc.c
+--- linux-2.6.32.40/drivers/media/video/usbvideo/konicawc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/usbvideo/konicawc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru
  	int error;
  
@@ -27511,9 +29956,9 @@ diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
  
  	cam->input = input_dev = input_allocate_device();
  	if (!input_dev) {
-diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.40/drivers/media/video/usbvideo/quickcam_messenger.c
+--- linux-2.6.32.40/drivers/media/video/usbvideo/quickcam_messenger.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/usbvideo/quickcam_messenger.c	2011-04-17 15:56:46.000000000 -0400
 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
  	int error;
  
@@ -27523,9 +29968,24 @@ diff -urNp linux-2.6.32.39/drivers/media/video/usbvideo/quickcam_messenger.c lin
  
  	cam->input = input_dev = input_allocate_device();
  	if (!input_dev) {
-diff -urNp linux-2.6.32.39/drivers/message/fusion/mptbase.c linux-2.6.32.39/drivers/message/fusion/mptbase.c
---- linux-2.6.32.39/drivers/message/fusion/mptbase.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/message/fusion/mptbase.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/media/video/v4l2-device.c linux-2.6.32.40/drivers/media/video/v4l2-device.c
+--- linux-2.6.32.40/drivers/media/video/v4l2-device.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/media/video/v4l2-device.c	2011-05-04 17:56:28.000000000 -0400
+@@ -50,9 +50,9 @@ int v4l2_device_register(struct device *
+ EXPORT_SYMBOL_GPL(v4l2_device_register);
+ 
+ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
+-						atomic_t *instance)
++						atomic_unchecked_t *instance)
+ {
+-	int num = atomic_inc_return(instance) - 1;
++	int num = atomic_inc_return_unchecked(instance) - 1;
+ 	int len = strlen(basename);
+ 
+ 	if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
+diff -urNp linux-2.6.32.40/drivers/message/fusion/mptbase.c linux-2.6.32.40/drivers/message/fusion/mptbase.c
+--- linux-2.6.32.40/drivers/message/fusion/mptbase.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/message/fusion/mptbase.c	2011-04-17 15:56:46.000000000 -0400
 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
  	len += sprintf(buf+len, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
  	len += sprintf(buf+len, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -27541,9 +30001,9 @@ diff -urNp linux-2.6.32.39/drivers/message/fusion/mptbase.c linux-2.6.32.39/driv
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-2.6.32.39/drivers/message/fusion/mptsas.c linux-2.6.32.39/drivers/message/fusion/mptsas.c
---- linux-2.6.32.39/drivers/message/fusion/mptsas.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/message/fusion/mptsas.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/message/fusion/mptsas.c linux-2.6.32.40/drivers/message/fusion/mptsas.c
+--- linux-2.6.32.40/drivers/message/fusion/mptsas.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/message/fusion/mptsas.c	2011-04-17 15:56:46.000000000 -0400
 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
@@ -27592,9 +30052,9 @@ diff -urNp linux-2.6.32.39/drivers/message/fusion/mptsas.c linux-2.6.32.39/drive
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-2.6.32.39/drivers/message/fusion/mptscsih.c linux-2.6.32.39/drivers/message/fusion/mptscsih.c
---- linux-2.6.32.39/drivers/message/fusion/mptscsih.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/message/fusion/mptscsih.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/message/fusion/mptscsih.c linux-2.6.32.40/drivers/message/fusion/mptscsih.c
+--- linux-2.6.32.40/drivers/message/fusion/mptscsih.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/message/fusion/mptscsih.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -27620,9 +30080,9 @@ diff -urNp linux-2.6.32.39/drivers/message/fusion/mptscsih.c linux-2.6.32.39/dri
  
  	return h->info_kbuf;
  }
-diff -urNp linux-2.6.32.39/drivers/message/i2o/i2o_proc.c linux-2.6.32.39/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.39/drivers/message/i2o/i2o_proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/message/i2o/i2o_proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/message/i2o/i2o_proc.c linux-2.6.32.40/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.32.40/drivers/message/i2o/i2o_proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/message/i2o/i2o_proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -259,13 +259,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -27709,9 +30169,35 @@ diff -urNp linux-2.6.32.39/drivers/message/i2o/i2o_proc.c linux-2.6.32.39/driver
  
  	return 0;
  }
-diff -urNp linux-2.6.32.39/drivers/misc/kgdbts.c linux-2.6.32.39/drivers/misc/kgdbts.c
---- linux-2.6.32.39/drivers/misc/kgdbts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/misc/kgdbts.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/message/i2o/iop.c linux-2.6.32.40/drivers/message/i2o/iop.c
+--- linux-2.6.32.40/drivers/message/i2o/iop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/message/i2o/iop.c	2011-05-04 17:56:28.000000000 -0400
+@@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
+ 
+ 	spin_lock_irqsave(&c->context_list_lock, flags);
+ 
+-	if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
+-		atomic_inc(&c->context_list_counter);
++	if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
++		atomic_inc_unchecked(&c->context_list_counter);
+ 
+-	entry->context = atomic_read(&c->context_list_counter);
++	entry->context = atomic_read_unchecked(&c->context_list_counter);
+ 
+ 	list_add(&entry->list, &c->context_list);
+ 
+@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(voi
+ 
+ #if BITS_PER_LONG == 64
+ 	spin_lock_init(&c->context_list_lock);
+-	atomic_set(&c->context_list_counter, 0);
++	atomic_set_unchecked(&c->context_list_counter, 0);
+ 	INIT_LIST_HEAD(&c->context_list);
+ #endif
+ 
+diff -urNp linux-2.6.32.40/drivers/misc/kgdbts.c linux-2.6.32.40/drivers/misc/kgdbts.c
+--- linux-2.6.32.40/drivers/misc/kgdbts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/misc/kgdbts.c	2011-04-17 15:56:46.000000000 -0400
 @@ -118,7 +118,7 @@
  	} while (0)
  #define MAX_CONFIG_LEN		40
@@ -27730,9 +30216,9 @@ diff -urNp linux-2.6.32.39/drivers/misc/kgdbts.c linux-2.6.32.39/drivers/misc/kg
  	.name			= "kgdbts",
  	.read_char		= kgdbts_get_char,
  	.write_char		= kgdbts_put_char,
-diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.40/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.32.40/drivers/misc/sgi-gru/gruhandles.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/misc/sgi-gru/gruhandles.c	2011-04-17 15:56:46.000000000 -0400
 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
  
  static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -27744,9 +30230,9 @@ diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.39/dri
  	if (mcs_op_statistics[op].max < clks)
  		mcs_op_statistics[op].max = clks;
  }
-diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.40/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.32.40/drivers/misc/sgi-gru/gruprocfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/misc/sgi-gru/gruprocfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -27770,9 +30256,9 @@ diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.39/driv
  		max = mcs_op_statistics[op].max;
  		seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
  			   count ? total / count : 0, max);
-diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/misc/sgi-gru/grutables.h linux-2.6.32.40/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.32.40/drivers/misc/sgi-gru/grutables.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/misc/sgi-gru/grutables.h	2011-04-17 15:56:46.000000000 -0400
 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -27956,9 +30442,9 @@ diff -urNp linux-2.6.32.39/drivers/misc/sgi-gru/grutables.h linux-2.6.32.39/driv
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2000.c linux-2.6.32.39/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.39/drivers/mtd/devices/doc2000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/mtd/devices/doc2000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/mtd/devices/doc2000.c linux-2.6.32.40/drivers/mtd/devices/doc2000.c
+--- linux-2.6.32.40/drivers/mtd/devices/doc2000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/mtd/devices/doc2000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
@@ -27968,9 +30454,9 @@ diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2000.c linux-2.6.32.39/drivers
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2001.c linux-2.6.32.39/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.39/drivers/mtd/devices/doc2001.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/mtd/devices/doc2001.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/mtd/devices/doc2001.c linux-2.6.32.40/drivers/mtd/devices/doc2001.c
+--- linux-2.6.32.40/drivers/mtd/devices/doc2001.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/mtd/devices/doc2001.c	2011-04-17 15:56:46.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -27980,9 +30466,9 @@ diff -urNp linux-2.6.32.39/drivers/mtd/devices/doc2001.c linux-2.6.32.39/drivers
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.32.39/drivers/mtd/ubi/build.c linux-2.6.32.39/drivers/mtd/ubi/build.c
---- linux-2.6.32.39/drivers/mtd/ubi/build.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/mtd/ubi/build.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/mtd/ubi/build.c linux-2.6.32.40/drivers/mtd/ubi/build.c
+--- linux-2.6.32.40/drivers/mtd/ubi/build.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/mtd/ubi/build.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
@@ -28022,9 +30508,9 @@ diff -urNp linux-2.6.32.39/drivers/mtd/ubi/build.c linux-2.6.32.39/drivers/mtd/u
  }
  
  /**
-diff -urNp linux-2.6.32.39/drivers/net/e1000e/82571.c linux-2.6.32.39/drivers/net/e1000e/82571.c
---- linux-2.6.32.39/drivers/net/e1000e/82571.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/e1000e/82571.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/e1000e/82571.c linux-2.6.32.40/drivers/net/e1000e/82571.c
+--- linux-2.6.32.40/drivers/net/e1000e/82571.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/e1000e/82571.c	2011-04-17 15:56:46.000000000 -0400
 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -28078,9 +30564,9 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/82571.c linux-2.6.32.39/drivers/ne
  	.acquire_nvm		= e1000_acquire_nvm_82571,
  	.read_nvm		= e1000e_read_nvm_eerd,
  	.release_nvm		= e1000_release_nvm_82571,
-diff -urNp linux-2.6.32.39/drivers/net/e1000e/e1000.h linux-2.6.32.39/drivers/net/e1000e/e1000.h
---- linux-2.6.32.39/drivers/net/e1000e/e1000.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/e1000e/e1000.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/e1000e/e1000.h linux-2.6.32.40/drivers/net/e1000e/e1000.h
+--- linux-2.6.32.40/drivers/net/e1000e/e1000.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/e1000e/e1000.h	2011-04-17 15:56:46.000000000 -0400
 @@ -375,9 +375,9 @@ struct e1000_info {
  	u32			pba;
  	u32			max_hw_frame_size;
@@ -28094,9 +30580,9 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/e1000.h linux-2.6.32.39/drivers/ne
  };
  
  /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.32.39/drivers/net/e1000e/es2lan.c linux-2.6.32.39/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.39/drivers/net/e1000e/es2lan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/e1000e/es2lan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/e1000e/es2lan.c linux-2.6.32.40/drivers/net/e1000e/es2lan.c
+--- linux-2.6.32.40/drivers/net/e1000e/es2lan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/e1000e/es2lan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -28132,9 +30618,9 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/es2lan.c linux-2.6.32.39/drivers/n
  	.acquire_nvm		= e1000_acquire_nvm_80003es2lan,
  	.read_nvm		= e1000e_read_nvm_eerd,
  	.release_nvm		= e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.32.39/drivers/net/e1000e/hw.h linux-2.6.32.39/drivers/net/e1000e/hw.h
---- linux-2.6.32.39/drivers/net/e1000e/hw.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/e1000e/hw.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/e1000e/hw.h linux-2.6.32.40/drivers/net/e1000e/hw.h
+--- linux-2.6.32.40/drivers/net/e1000e/hw.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/e1000e/hw.h	2011-04-17 15:56:46.000000000 -0400
 @@ -756,34 +756,34 @@ struct e1000_mac_operations {
  
  /* Function pointers for the PHY. */
@@ -28194,10 +30680,10 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/hw.h linux-2.6.32.39/drivers/net/e
  };
  
  struct e1000_mac_info {
-diff -urNp linux-2.6.32.39/drivers/net/e1000e/ich8lan.c linux-2.6.32.39/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.39/drivers/net/e1000e/ich8lan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/e1000e/ich8lan.c	2011-04-17 15:56:46.000000000 -0400
-@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
+diff -urNp linux-2.6.32.40/drivers/net/e1000e/ich8lan.c linux-2.6.32.40/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.32.40/drivers/net/e1000e/ich8lan.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/net/e1000e/ich8lan.c	2011-05-10 22:12:32.000000000 -0400
+@@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan
  	}
  }
  
@@ -28206,7 +30692,7 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/ich8lan.c linux-2.6.32.39/drivers/
  	.id_led_init		= e1000e_id_led_init,
  	.check_mng_mode		= e1000_check_mng_mode_ich8lan,
  	.check_for_link		= e1000_check_for_copper_link_ich8lan,
-@@ -3470,7 +3470,7 @@ static struct e1000_mac_operations ich8_
+@@ -3481,7 +3481,7 @@ static struct e1000_mac_operations ich8_
  	/* id_led_init dependent on mac type */
  };
  
@@ -28215,7 +30701,7 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/ich8lan.c linux-2.6.32.39/drivers/
  	.acquire_phy		= e1000_acquire_swflag_ich8lan,
  	.check_reset_block	= e1000_check_reset_block_ich8lan,
  	.commit_phy		= NULL,
-@@ -3486,7 +3486,7 @@ static struct e1000_phy_operations ich8_
+@@ -3497,7 +3497,7 @@ static struct e1000_phy_operations ich8_
  	.write_phy_reg		= e1000e_write_phy_reg_igp,
  };
  
@@ -28224,9 +30710,9 @@ diff -urNp linux-2.6.32.39/drivers/net/e1000e/ich8lan.c linux-2.6.32.39/drivers/
  	.acquire_nvm		= e1000_acquire_nvm_ich8lan,
  	.read_nvm	 	= e1000_read_nvm_ich8lan,
  	.release_nvm		= e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.32.39/drivers/net/ibmveth.c linux-2.6.32.39/drivers/net/ibmveth.c
---- linux-2.6.32.39/drivers/net/ibmveth.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/ibmveth.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/ibmveth.c linux-2.6.32.40/drivers/net/ibmveth.c
+--- linux-2.6.32.40/drivers/net/ibmveth.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/ibmveth.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
  	NULL,
  };
@@ -28236,9 +30722,9 @@ diff -urNp linux-2.6.32.39/drivers/net/ibmveth.c linux-2.6.32.39/drivers/net/ibm
  	.show   = veth_pool_show,
  	.store  = veth_pool_store,
  };
-diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_82575.c linux-2.6.32.39/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.39/drivers/net/igb/e1000_82575.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/igb/e1000_82575.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/igb/e1000_82575.c linux-2.6.32.40/drivers/net/igb/e1000_82575.c
+--- linux-2.6.32.40/drivers/net/igb/e1000_82575.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/igb/e1000_82575.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct 
  	wr32(E1000_VT_CTL, vt_ctl);
  }
@@ -28264,9 +30750,9 @@ diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_82575.c linux-2.6.32.39/drivers
  	.acquire              = igb_acquire_nvm_82575,
  	.read                 = igb_read_nvm_eerd,
  	.release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_hw.h linux-2.6.32.39/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.39/drivers/net/igb/e1000_hw.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/igb/e1000_hw.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/igb/e1000_hw.h linux-2.6.32.40/drivers/net/igb/e1000_hw.h
+--- linux-2.6.32.40/drivers/net/igb/e1000_hw.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/igb/e1000_hw.h	2011-04-17 15:56:46.000000000 -0400
 @@ -305,17 +305,17 @@ struct e1000_phy_operations {
  };
  
@@ -28292,9 +30778,9 @@ diff -urNp linux-2.6.32.39/drivers/net/igb/e1000_hw.h linux-2.6.32.39/drivers/ne
  };
  
  extern const struct e1000_info e1000_82575_info;
-diff -urNp linux-2.6.32.39/drivers/net/iseries_veth.c linux-2.6.32.39/drivers/net/iseries_veth.c
---- linux-2.6.32.39/drivers/net/iseries_veth.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/iseries_veth.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/iseries_veth.c linux-2.6.32.40/drivers/net/iseries_veth.c
+--- linux-2.6.32.40/drivers/net/iseries_veth.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/iseries_veth.c	2011-04-17 15:56:46.000000000 -0400
 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
  	NULL
  };
@@ -28313,9 +30799,9 @@ diff -urNp linux-2.6.32.39/drivers/net/iseries_veth.c linux-2.6.32.39/drivers/ne
  	.show = veth_port_attribute_show
  };
  
-diff -urNp linux-2.6.32.39/drivers/net/pcnet32.c linux-2.6.32.39/drivers/net/pcnet32.c
---- linux-2.6.32.39/drivers/net/pcnet32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/pcnet32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/pcnet32.c linux-2.6.32.40/drivers/net/pcnet32.c
+--- linux-2.6.32.40/drivers/net/pcnet32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/pcnet32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -28325,9 +30811,9 @@ diff -urNp linux-2.6.32.39/drivers/net/pcnet32.c linux-2.6.32.39/drivers/net/pcn
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
  static int pcnet32_debug = 0;
-diff -urNp linux-2.6.32.39/drivers/net/tg3.h linux-2.6.32.39/drivers/net/tg3.h
---- linux-2.6.32.39/drivers/net/tg3.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/tg3.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/tg3.h linux-2.6.32.40/drivers/net/tg3.h
+--- linux-2.6.32.40/drivers/net/tg3.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/tg3.h	2011-04-17 15:56:46.000000000 -0400
 @@ -95,6 +95,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
@@ -28336,9 +30822,9 @@ diff -urNp linux-2.6.32.39/drivers/net/tg3.h linux-2.6.32.39/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff -urNp linux-2.6.32.39/drivers/net/tulip/de4x5.c linux-2.6.32.39/drivers/net/tulip/de4x5.c
---- linux-2.6.32.39/drivers/net/tulip/de4x5.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/tulip/de4x5.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/tulip/de4x5.c linux-2.6.32.40/drivers/net/tulip/de4x5.c
+--- linux-2.6.32.40/drivers/net/tulip/de4x5.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/tulip/de4x5.c	2011-04-17 15:56:46.000000000 -0400
 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
@@ -28357,9 +30843,9 @@ diff -urNp linux-2.6.32.39/drivers/net/tulip/de4x5.c linux-2.6.32.39/drivers/net
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-2.6.32.39/drivers/net/usb/hso.c linux-2.6.32.39/drivers/net/usb/hso.c
---- linux-2.6.32.39/drivers/net/usb/hso.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/usb/hso.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/usb/hso.c linux-2.6.32.40/drivers/net/usb/hso.c
+--- linux-2.6.32.40/drivers/net/usb/hso.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/usb/hso.c	2011-04-17 15:56:46.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -28447,9 +30933,9 @@ diff -urNp linux-2.6.32.39/drivers/net/usb/hso.c linux-2.6.32.39/drivers/net/usb
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/b43/debugfs.c linux-2.6.32.40/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.32.40/drivers/net/wireless/b43/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/b43/debugfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
  struct b43_debugfs_fops {
  	ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -28459,9 +30945,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/b43/debugfs.c linux-2.6.32.39/dr
  	/* Offset of struct b43_dfs_file in struct b43_dfsentry */
  	size_t file_struct_offset;
  };
-diff -urNp linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.40/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.32.40/drivers/net/wireless/b43legacy/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/b43legacy/debugfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
  struct b43legacy_debugfs_fops {
  	ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -28471,9 +30957,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
  	/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
  	size_t file_struct_offset;
  	/* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-1000.c
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 
  	 },
  };
@@ -28483,9 +30969,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl1000_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-3945.c
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
  	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
  };
@@ -28495,9 +30981,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
  	.ucode = &iwl3945_ucode,
  	.lib = &iwl3945_lib,
  	.hcmd = &iwl3945_hcmd,
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-4965.c
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = 
  	},
  };
@@ -28507,9 +30993,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
  	.ucode = &iwl4965_ucode,
  	.lib = &iwl4965_lib,
  	.hcmd = &iwl4965_hcmd,
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-5000.c
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-05-10 22:12:32.000000000 -0400
 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = 
  	 },
  };
@@ -28527,9 +31013,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl5150_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-6000.c
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
  	.calc_rssi = iwl5000_calc_rssi,
  };
@@ -28539,9 +31025,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl6000_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-17 15:56:46.000000000 -0400
 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
  #endif
  
@@ -28553,9 +31039,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      void *p, u32 len)
  {}
-diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-dev.h
+--- linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-04-17 15:56:46.000000000 -0400
 @@ -68,7 +68,7 @@ struct iwl_tx_queue;
  
  /* shared structures from iwl-5000.c */
@@ -28565,9 +31051,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.3
  extern struct iwl_ucode_ops iwl5000_ucode;
  extern struct iwl_lib_ops iwl5000_lib;
  extern struct iwl_hcmd_ops iwl5000_hcmd;
-diff -urNp linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.40/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.32.40/drivers/net/wireless/libertas/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/libertas/debugfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -708,7 +708,7 @@ out_unlock:
  struct lbs_debugfs_files {
  	const char *name;
@@ -28577,9 +31063,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
  };
  
  static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/net/wireless/rndis_wlan.c linux-2.6.32.40/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.32.40/drivers/net/wireless/rndis_wlan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/net/wireless/rndis_wlan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
  
  	devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -28589,9 +31075,9 @@ diff -urNp linux-2.6.32.39/drivers/net/wireless/rndis_wlan.c linux-2.6.32.39/dri
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.32.39/drivers/oprofile/buffer_sync.c linux-2.6.32.39/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.39/drivers/oprofile/buffer_sync.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/oprofile/buffer_sync.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/oprofile/buffer_sync.c linux-2.6.32.40/drivers/oprofile/buffer_sync.c
+--- linux-2.6.32.40/drivers/oprofile/buffer_sync.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/oprofile/buffer_sync.c	2011-04-17 15:56:46.000000000 -0400
 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
@@ -28627,9 +31113,9 @@ diff -urNp linux-2.6.32.39/drivers/oprofile/buffer_sync.c linux-2.6.32.39/driver
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-2.6.32.39/drivers/oprofile/event_buffer.c linux-2.6.32.39/drivers/oprofile/event_buffer.c
---- linux-2.6.32.39/drivers/oprofile/event_buffer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/oprofile/event_buffer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/oprofile/event_buffer.c linux-2.6.32.40/drivers/oprofile/event_buffer.c
+--- linux-2.6.32.40/drivers/oprofile/event_buffer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/oprofile/event_buffer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -28639,9 +31125,9 @@ diff -urNp linux-2.6.32.39/drivers/oprofile/event_buffer.c linux-2.6.32.39/drive
  		return;
  	}
  
-diff -urNp linux-2.6.32.39/drivers/oprofile/oprof.c linux-2.6.32.39/drivers/oprofile/oprof.c
---- linux-2.6.32.39/drivers/oprofile/oprof.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/oprofile/oprof.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/oprofile/oprof.c linux-2.6.32.40/drivers/oprofile/oprof.c
+--- linux-2.6.32.40/drivers/oprofile/oprof.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/oprofile/oprof.c	2011-04-17 15:56:46.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
@@ -28651,9 +31137,9 @@ diff -urNp linux-2.6.32.39/drivers/oprofile/oprof.c linux-2.6.32.39/drivers/opro
  	start_switch_worker();
  }
  
-diff -urNp linux-2.6.32.39/drivers/oprofile/oprofilefs.c linux-2.6.32.39/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.39/drivers/oprofile/oprofilefs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/oprofile/oprofilefs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/oprofile/oprofilefs.c linux-2.6.32.40/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.40/drivers/oprofile/oprofilefs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/oprofile/oprofilefs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -187,7 +187,7 @@ static const struct file_operations atom
  
  
@@ -28663,9 +31149,9 @@ diff -urNp linux-2.6.32.39/drivers/oprofile/oprofilefs.c linux-2.6.32.39/drivers
  {
  	struct dentry *d = __oprofilefs_create_file(sb, root, name,
  						     &atomic_ro_fops, 0444);
-diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.c linux-2.6.32.39/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.39/drivers/oprofile/oprofile_stats.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/oprofile/oprofile_stats.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/oprofile/oprofile_stats.c linux-2.6.32.40/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.32.40/drivers/oprofile/oprofile_stats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/oprofile/oprofile_stats.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -28683,9 +31169,9 @@ diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.c linux-2.6.32.39/dri
  }
  
  
-diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.h linux-2.6.32.39/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.39/drivers/oprofile/oprofile_stats.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/oprofile/oprofile_stats.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/oprofile/oprofile_stats.h linux-2.6.32.40/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.32.40/drivers/oprofile/oprofile_stats.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/oprofile/oprofile_stats.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -28703,9 +31189,9 @@ diff -urNp linux-2.6.32.39/drivers/oprofile/oprofile_stats.h linux-2.6.32.39/dri
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.32.39/drivers/parisc/pdc_stable.c linux-2.6.32.39/drivers/parisc/pdc_stable.c
---- linux-2.6.32.39/drivers/parisc/pdc_stable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/parisc/pdc_stable.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/parisc/pdc_stable.c linux-2.6.32.40/drivers/parisc/pdc_stable.c
+--- linux-2.6.32.40/drivers/parisc/pdc_stable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/parisc/pdc_stable.c	2011-04-17 15:56:46.000000000 -0400
 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
  	return ret;
  }
@@ -28715,9 +31201,9 @@ diff -urNp linux-2.6.32.39/drivers/parisc/pdc_stable.c linux-2.6.32.39/drivers/p
  	.show = pdcspath_attr_show,
  	.store = pdcspath_attr_store,
  };
-diff -urNp linux-2.6.32.39/drivers/parport/procfs.c linux-2.6.32.39/drivers/parport/procfs.c
---- linux-2.6.32.39/drivers/parport/procfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/parport/procfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/parport/procfs.c linux-2.6.32.40/drivers/parport/procfs.c
+--- linux-2.6.32.40/drivers/parport/procfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/parport/procfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
@@ -28736,9 +31222,9 @@ diff -urNp linux-2.6.32.39/drivers/parport/procfs.c linux-2.6.32.39/drivers/parp
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.40/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.32.40/drivers/pci/hotplug/acpiphp_glue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/hotplug/acpiphp_glue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
  }
  
@@ -28748,9 +31234,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.39/dr
  	.handler = handle_hotplug_event_func,
  };
  
-diff -urNp linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.40/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.32.40/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-17 15:56:46.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -28765,9 +31251,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.39/dr
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-2.6.32.39/drivers/pci/hotplug/fakephp.c linux-2.6.32.39/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.39/drivers/pci/hotplug/fakephp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/hotplug/fakephp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/hotplug/fakephp.c linux-2.6.32.40/drivers/pci/hotplug/fakephp.c
+--- linux-2.6.32.40/drivers/pci/hotplug/fakephp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/hotplug/fakephp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
  }
  
@@ -28777,9 +31263,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/hotplug/fakephp.c linux-2.6.32.39/drivers
  		.store = legacy_store, .show = legacy_show
  	},
  	.release = &legacy_release,
-diff -urNp linux-2.6.32.39/drivers/pci/intel-iommu.c linux-2.6.32.39/drivers/pci/intel-iommu.c
---- linux-2.6.32.39/drivers/pci/intel-iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/intel-iommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/intel-iommu.c linux-2.6.32.40/drivers/pci/intel-iommu.c
+--- linux-2.6.32.40/drivers/pci/intel-iommu.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/intel-iommu.c	2011-05-10 22:12:33.000000000 -0400
 @@ -2643,7 +2643,7 @@ error:
  	return 0;
  }
@@ -28849,9 +31335,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/intel-iommu.c linux-2.6.32.39/drivers/pci
  	.alloc_coherent = intel_alloc_coherent,
  	.free_coherent = intel_free_coherent,
  	.map_sg = intel_map_sg,
-diff -urNp linux-2.6.32.39/drivers/pci/pcie/aspm.c linux-2.6.32.39/drivers/pci/pcie/aspm.c
---- linux-2.6.32.39/drivers/pci/pcie/aspm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/pcie/aspm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/pcie/aspm.c linux-2.6.32.40/drivers/pci/pcie/aspm.c
+--- linux-2.6.32.40/drivers/pci/pcie/aspm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/pcie/aspm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -28865,9 +31351,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/pcie/aspm.c linux-2.6.32.39/drivers/pci/p
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-2.6.32.39/drivers/pci/probe.c linux-2.6.32.39/drivers/pci/probe.c
---- linux-2.6.32.39/drivers/pci/probe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/probe.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/probe.c linux-2.6.32.40/drivers/pci/probe.c
+--- linux-2.6.32.40/drivers/pci/probe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/probe.c	2011-04-17 15:56:46.000000000 -0400
 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
  	return ret;
  }
@@ -28885,9 +31371,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/probe.c linux-2.6.32.39/drivers/pci/probe
  					struct device_attribute *attr,
  					char *buf)
  {
-diff -urNp linux-2.6.32.39/drivers/pci/proc.c linux-2.6.32.39/drivers/pci/proc.c
---- linux-2.6.32.39/drivers/pci/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/proc.c linux-2.6.32.40/drivers/pci/proc.c
+--- linux-2.6.32.40/drivers/pci/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -480,7 +480,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -28905,9 +31391,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/proc.c linux-2.6.32.39/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-2.6.32.39/drivers/pci/slot.c linux-2.6.32.39/drivers/pci/slot.c
---- linux-2.6.32.39/drivers/pci/slot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pci/slot.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pci/slot.c linux-2.6.32.40/drivers/pci/slot.c
+--- linux-2.6.32.40/drivers/pci/slot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pci/slot.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
  	return attribute->store ? attribute->store(slot, buf, len) : -EIO;
  }
@@ -28917,9 +31403,9 @@ diff -urNp linux-2.6.32.39/drivers/pci/slot.c linux-2.6.32.39/drivers/pci/slot.c
  	.show = pci_slot_attr_show,
  	.store = pci_slot_attr_store,
  };
-diff -urNp linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.40/drivers/pcmcia/pcmcia_ioctl.c
+--- linux-2.6.32.40/drivers/pcmcia/pcmcia_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pcmcia/pcmcia_ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
  	    return -EFAULT;
  	}
@@ -28929,9 +31415,9 @@ diff -urNp linux-2.6.32.39/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.39/drivers
      if (!buf)
  	return -ENOMEM;
  
-diff -urNp linux-2.6.32.39/drivers/platform/x86/acer-wmi.c linux-2.6.32.39/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.39/drivers/platform/x86/acer-wmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/acer-wmi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/acer-wmi.c linux-2.6.32.40/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.32.40/drivers/platform/x86/acer-wmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/acer-wmi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl
  	return 0;
  }
@@ -28941,9 +31427,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/acer-wmi.c linux-2.6.32.39/drive
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/asus_acpi.c linux-2.6.32.39/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.39/drivers/platform/x86/asus_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/asus_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/asus_acpi.c linux-2.6.32.40/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.40/drivers/platform/x86/asus_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/asus_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
  	return 0;
  }
@@ -28953,9 +31439,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/asus_acpi.c linux-2.6.32.39/driv
  	.get_brightness = read_brightness,
  	.update_status  = set_brightness_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/asus-laptop.c linux-2.6.32.39/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/asus-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/asus-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/asus-laptop.c linux-2.6.32.40/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/asus-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/asus-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
   */
  static int read_brightness(struct backlight_device *bd);
@@ -28965,9 +31451,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/asus-laptop.c linux-2.6.32.39/dr
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/compal-laptop.c linux-2.6.32.39/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/compal-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/compal-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/compal-laptop.c linux-2.6.32.40/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/compal-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/compal-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl
  	return set_lcd_level(b->props.brightness);
  }
@@ -28977,10 +31463,10 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/compal-laptop.c linux-2.6.32.39/
  	.get_brightness = bl_get_brightness,
  	.update_status	= bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/dell-laptop.c linux-2.6.32.39/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/dell-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/dell-laptop.c	2011-04-17 15:56:46.000000000 -0400
-@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
+diff -urNp linux-2.6.32.40/drivers/platform/x86/dell-laptop.c linux-2.6.32.40/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/dell-laptop.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/dell-laptop.c	2011-05-10 22:12:33.000000000 -0400
+@@ -318,7 +318,7 @@ static int dell_get_intensity(struct bac
  	return buffer.output[1];
  }
  
@@ -28989,9 +31475,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/dell-laptop.c linux-2.6.32.39/dr
  	.get_brightness = dell_get_intensity,
  	.update_status  = dell_send_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.40/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/eeepc-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/eeepc-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
   */
  static int read_brightness(struct backlight_device *bd);
@@ -29001,9 +31487,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.39/d
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.40/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/fujitsu-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/fujitsu-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl
  	return ret;
  }
@@ -29013,9 +31499,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.39
  	.get_brightness = bl_get_brightness,
  	.update_status = bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/msi-laptop.c linux-2.6.32.39/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/msi-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/msi-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/msi-laptop.c linux-2.6.32.40/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/msi-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/msi-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl
  	return set_lcd_level(b->props.brightness);
  }
@@ -29025,9 +31511,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/msi-laptop.c linux-2.6.32.39/dri
  	.get_brightness = bl_get_brightness,
  	.update_status  = bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.40/drivers/platform/x86/panasonic-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/panasonic-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/panasonic-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
  	return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
  }
@@ -29037,9 +31523,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
  	.get_brightness	= bl_get,
  	.update_status	= bl_set_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/sony-laptop.c linux-2.6.32.39/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.39/drivers/platform/x86/sony-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/sony-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/sony-laptop.c linux-2.6.32.40/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.32.40/drivers/platform/x86/sony-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/sony-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
  }
  
@@ -29049,9 +31535,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/sony-laptop.c linux-2.6.32.39/dr
  	.update_status = sony_backlight_update_status,
  	.get_brightness = sony_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.40/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.32.40/drivers/platform/x86/thinkpad_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/thinkpad_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
  			       BACKLIGHT_UPDATE_HOTKEY);
  }
@@ -29061,9 +31547,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.39/
  	.get_brightness = brightness_get,
  	.update_status  = brightness_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.40/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.32.40/drivers/platform/x86/toshiba_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/platform/x86/toshiba_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -671,7 +671,7 @@ static acpi_status remove_device(void)
  	return AE_OK;
  }
@@ -29073,9 +31559,9 @@ diff -urNp linux-2.6.32.39/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.39/d
          .get_brightness = get_lcd,
          .update_status  = set_lcd_status,
  };
-diff -urNp linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.40/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.32.40/drivers/pnp/pnpbios/bioscalls.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pnp/pnpbios/bioscalls.c	2011-04-17 15:56:46.000000000 -0400
 @@ -60,7 +60,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -29132,9 +31618,9 @@ diff -urNp linux-2.6.32.39/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.39/drive
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-2.6.32.39/drivers/pnp/resource.c linux-2.6.32.39/drivers/pnp/resource.c
---- linux-2.6.32.39/drivers/pnp/resource.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/pnp/resource.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/pnp/resource.c linux-2.6.32.40/drivers/pnp/resource.c
+--- linux-2.6.32.40/drivers/pnp/resource.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/pnp/resource.c	2011-04-17 15:56:46.000000000 -0400
 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
@@ -29153,9 +31639,9 @@ diff -urNp linux-2.6.32.39/drivers/pnp/resource.c linux-2.6.32.39/drivers/pnp/re
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-2.6.32.39/drivers/rtc/rtc-dev.c linux-2.6.32.39/drivers/rtc/rtc-dev.c
---- linux-2.6.32.39/drivers/rtc/rtc-dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/rtc/rtc-dev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/rtc/rtc-dev.c linux-2.6.32.40/drivers/rtc/rtc-dev.c
+--- linux-2.6.32.40/drivers/rtc/rtc-dev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/rtc/rtc-dev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -29173,9 +31659,9 @@ diff -urNp linux-2.6.32.39/drivers/rtc/rtc-dev.c linux-2.6.32.39/drivers/rtc/rtc
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.c linux-2.6.32.39/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.39/drivers/s390/cio/qdio_perf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/s390/cio/qdio_perf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/s390/cio/qdio_perf.c linux-2.6.32.40/drivers/s390/cio/qdio_perf.c
+--- linux-2.6.32.40/drivers/s390/cio/qdio_perf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/s390/cio/qdio_perf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
  static int qdio_perf_proc_show(struct seq_file *m, void *v)
  {
@@ -29251,9 +31737,9 @@ diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.c linux-2.6.32.39/drivers/
  	seq_printf(m, "\n");
  	return 0;
  }
-diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.h linux-2.6.32.39/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.39/drivers/s390/cio/qdio_perf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/s390/cio/qdio_perf.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/s390/cio/qdio_perf.h linux-2.6.32.40/drivers/s390/cio/qdio_perf.h
+--- linux-2.6.32.40/drivers/s390/cio/qdio_perf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/s390/cio/qdio_perf.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,46 +13,46 @@
  
  struct qdio_perf_stats {
@@ -29326,9 +31812,9 @@ diff -urNp linux-2.6.32.39/drivers/s390/cio/qdio_perf.h linux-2.6.32.39/drivers/
  }
  
  int qdio_setup_perf_stats(void);
-diff -urNp linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.40/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.32.40/drivers/scsi/aic94xx/aic94xx_init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/aic94xx/aic94xx_init.c	2011-04-17 15:56:46.000000000 -0400
 @@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru
  			flash_error_table[i].reason);
  }
@@ -29338,9 +31824,30 @@ diff -urNp linux-2.6.32.39/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.39/d
  	asd_show_update_bios, asd_store_update_bios);
  
  static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.32.39/drivers/scsi/ipr.c linux-2.6.32.39/drivers/scsi/ipr.c
---- linux-2.6.32.39/drivers/scsi/ipr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/scsi/ipr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/scsi/hosts.c linux-2.6.32.40/drivers/scsi/hosts.c
+--- linux-2.6.32.40/drivers/scsi/hosts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/hosts.c	2011-05-04 17:56:28.000000000 -0400
+@@ -40,7 +40,7 @@
+ #include "scsi_logging.h"
+ 
+ 
+-static atomic_t scsi_host_next_hn;	/* host_no for next new host */
++static atomic_unchecked_t scsi_host_next_hn;	/* host_no for next new host */
+ 
+ 
+ static void scsi_host_cls_release(struct device *dev)
+@@ -344,7 +344,7 @@ struct Scsi_Host *scsi_host_alloc(struct
+ 	 * subtract one because we increment first then return, but we need to
+ 	 * know what the next host number was before increment
+ 	 */
+-	shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
++	shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
+ 	shost->dma_channel = 0xff;
+ 
+ 	/* These three are default values which can be overridden */
+diff -urNp linux-2.6.32.40/drivers/scsi/ipr.c linux-2.6.32.40/drivers/scsi/ipr.c
+--- linux-2.6.32.40/drivers/scsi/ipr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/ipr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
  	return true;
  }
@@ -29350,9 +31857,9 @@ diff -urNp linux-2.6.32.39/drivers/scsi/ipr.c linux-2.6.32.39/drivers/scsi/ipr.c
  	.phy_reset = ipr_ata_phy_reset,
  	.hardreset = ipr_sata_reset,
  	.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/scsi/libfc/fc_exch.c linux-2.6.32.40/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.32.40/drivers/scsi/libfc/fc_exch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/libfc/fc_exch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -86,12 +86,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -29474,9 +31981,9 @@ diff -urNp linux-2.6.32.39/drivers/scsi/libfc/fc_exch.c linux-2.6.32.39/drivers/
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/scsi/libsas/sas_ata.c linux-2.6.32.40/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.32.40/drivers/scsi/libsas/sas_ata.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/libsas/sas_ata.c	2011-04-23 12:56:11.000000000 -0400
 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
  	}
  }
@@ -29486,9 +31993,443 @@ diff -urNp linux-2.6.32.39/drivers/scsi/libsas/sas_ata.c linux-2.6.32.39/drivers
  	.phy_reset		= sas_ata_phy_reset,
  	.post_internal_cmd	= sas_ata_post_internal,
  	.qc_defer               = ata_std_qc_defer,
-diff -urNp linux-2.6.32.39/drivers/scsi/sg.c linux-2.6.32.39/drivers/scsi/sg.c
---- linux-2.6.32.39/drivers/scsi/sg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/scsi/sg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.40/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-2.6.32.40/drivers/scsi/lpfc/lpfc_debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-04 17:56:28.000000000 -0400
+@@ -124,7 +124,7 @@ struct lpfc_debug {
+ 	int  len;
+ };
+ 
+-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
++static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
+ static unsigned long lpfc_debugfs_start_time = 0L;
+ 
+ /**
+@@ -158,7 +158,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
+ 	lpfc_debugfs_enable = 0;
+ 
+ 	len = 0;
+-	index = (atomic_read(&vport->disc_trc_cnt) + 1) &
++	index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
+ 		(lpfc_debugfs_max_disc_trc - 1);
+ 	for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
+ 		dtp = vport->disc_trc + i;
+@@ -219,7 +219,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
+ 	lpfc_debugfs_enable = 0;
+ 
+ 	len = 0;
+-	index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
++	index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
+ 		(lpfc_debugfs_max_slow_ring_trc - 1);
+ 	for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
+ 		dtp = phba->slow_ring_trc + i;
+@@ -634,14 +634,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport 
+ 		!vport || !vport->disc_trc)
+ 		return;
+ 
+-	index = atomic_inc_return(&vport->disc_trc_cnt) &
++	index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
+ 		(lpfc_debugfs_max_disc_trc - 1);
+ 	dtp = vport->disc_trc + index;
+ 	dtp->fmt = fmt;
+ 	dtp->data1 = data1;
+ 	dtp->data2 = data2;
+ 	dtp->data3 = data3;
+-	dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
++	dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
+ 	dtp->jif = jiffies;
+ #endif
+ 	return;
+@@ -672,14 +672,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
+ 		!phba || !phba->slow_ring_trc)
+ 		return;
+ 
+-	index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
++	index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
+ 		(lpfc_debugfs_max_slow_ring_trc - 1);
+ 	dtp = phba->slow_ring_trc + index;
+ 	dtp->fmt = fmt;
+ 	dtp->data1 = data1;
+ 	dtp->data2 = data2;
+ 	dtp->data3 = data3;
+-	dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
++	dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
+ 	dtp->jif = jiffies;
+ #endif
+ 	return;
+@@ -1364,7 +1364,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+ 						 "slow_ring buffer\n");
+ 				goto debug_failed;
+ 			}
+-			atomic_set(&phba->slow_ring_trc_cnt, 0);
++			atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
+ 			memset(phba->slow_ring_trc, 0,
+ 				(sizeof(struct lpfc_debugfs_trc) *
+ 				lpfc_debugfs_max_slow_ring_trc));
+@@ -1410,7 +1410,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
+ 				 "buffer\n");
+ 		goto debug_failed;
+ 	}
+-	atomic_set(&vport->disc_trc_cnt, 0);
++	atomic_set_unchecked(&vport->disc_trc_cnt, 0);
+ 
+ 	snprintf(name, sizeof(name), "discovery_trace");
+ 	vport->debug_disc_trc =
+diff -urNp linux-2.6.32.40/drivers/scsi/lpfc/lpfc.h linux-2.6.32.40/drivers/scsi/lpfc/lpfc.h
+--- linux-2.6.32.40/drivers/scsi/lpfc/lpfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/lpfc/lpfc.h	2011-05-04 17:56:28.000000000 -0400
+@@ -400,7 +400,7 @@ struct lpfc_vport {
+ 	struct dentry *debug_nodelist;
+ 	struct dentry *vport_debugfs_root;
+ 	struct lpfc_debugfs_trc *disc_trc;
+-	atomic_t disc_trc_cnt;
++	atomic_unchecked_t disc_trc_cnt;
+ #endif
+ 	uint8_t stat_data_enabled;
+ 	uint8_t stat_data_blocked;
+@@ -725,8 +725,8 @@ struct lpfc_hba {
+ 	struct timer_list fabric_block_timer;
+ 	unsigned long bit_flags;
+ #define	FABRIC_COMANDS_BLOCKED	0
+-	atomic_t num_rsrc_err;
+-	atomic_t num_cmd_success;
++	atomic_unchecked_t num_rsrc_err;
++	atomic_unchecked_t num_cmd_success;
+ 	unsigned long last_rsrc_error_time;
+ 	unsigned long last_ramp_down_time;
+ 	unsigned long last_ramp_up_time;
+@@ -740,7 +740,7 @@ struct lpfc_hba {
+ 	struct dentry *debug_dumpDif;    /* BlockGuard BPL*/
+ 	struct dentry *debug_slow_ring_trc;
+ 	struct lpfc_debugfs_trc *slow_ring_trc;
+-	atomic_t slow_ring_trc_cnt;
++	atomic_unchecked_t slow_ring_trc_cnt;
+ #endif
+ 
+ 	/* Used for deferred freeing of ELS data buffers */
+diff -urNp linux-2.6.32.40/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.40/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-2.6.32.40/drivers/scsi/lpfc/lpfc_scsi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-04 17:56:28.000000000 -0400
+@@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
+ 	uint32_t evt_posted;
+ 
+ 	spin_lock_irqsave(&phba->hbalock, flags);
+-	atomic_inc(&phba->num_rsrc_err);
++	atomic_inc_unchecked(&phba->num_rsrc_err);
+ 	phba->last_rsrc_error_time = jiffies;
+ 
+ 	if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
+@@ -300,7 +300,7 @@ lpfc_rampup_queue_depth(struct lpfc_vpor
+ 	unsigned long flags;
+ 	struct lpfc_hba *phba = vport->phba;
+ 	uint32_t evt_posted;
+-	atomic_inc(&phba->num_cmd_success);
++	atomic_inc_unchecked(&phba->num_cmd_success);
+ 
+ 	if (vport->cfg_lun_queue_depth <= queue_depth)
+ 		return;
+@@ -343,8 +343,8 @@ lpfc_ramp_down_queue_handler(struct lpfc
+ 	int i;
+ 	struct lpfc_rport_data *rdata;
+ 
+-	num_rsrc_err = atomic_read(&phba->num_rsrc_err);
+-	num_cmd_success = atomic_read(&phba->num_cmd_success);
++	num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
++	num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
+ 
+ 	vports = lpfc_create_vport_work_array(phba);
+ 	if (vports != NULL)
+@@ -378,8 +378,8 @@ lpfc_ramp_down_queue_handler(struct lpfc
+ 			}
+ 		}
+ 	lpfc_destroy_vport_work_array(phba, vports);
+-	atomic_set(&phba->num_rsrc_err, 0);
+-	atomic_set(&phba->num_cmd_success, 0);
++	atomic_set_unchecked(&phba->num_rsrc_err, 0);
++	atomic_set_unchecked(&phba->num_cmd_success, 0);
+ }
+ 
+ /**
+@@ -427,8 +427,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_h
+ 			}
+ 		}
+ 	lpfc_destroy_vport_work_array(phba, vports);
+-	atomic_set(&phba->num_rsrc_err, 0);
+-	atomic_set(&phba->num_cmd_success, 0);
++	atomic_set_unchecked(&phba->num_rsrc_err, 0);
++	atomic_set_unchecked(&phba->num_cmd_success, 0);
+ }
+ 
+ /**
+diff -urNp linux-2.6.32.40/drivers/scsi/pmcraid.c linux-2.6.32.40/drivers/scsi/pmcraid.c
+--- linux-2.6.32.40/drivers/scsi/pmcraid.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/pmcraid.c	2011-05-10 22:12:33.000000000 -0400
+@@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct sc
+ 		res->scsi_dev = scsi_dev;
+ 		scsi_dev->hostdata = res;
+ 		res->change_detected = 0;
+-		atomic_set(&res->read_failures, 0);
+-		atomic_set(&res->write_failures, 0);
++		atomic_set_unchecked(&res->read_failures, 0);
++		atomic_set_unchecked(&res->write_failures, 0);
+ 		rc = 0;
+ 	}
+ 	spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
+@@ -2396,9 +2396,9 @@ static int pmcraid_error_handler(struct 
+ 
+ 	/* If this was a SCSI read/write command keep count of errors */
+ 	if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
+-		atomic_inc(&res->read_failures);
++		atomic_inc_unchecked(&res->read_failures);
+ 	else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
+-		atomic_inc(&res->write_failures);
++		atomic_inc_unchecked(&res->write_failures);
+ 
+ 	if (!RES_IS_GSCSI(res->cfg_entry) &&
+ 		masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
+@@ -4113,7 +4113,7 @@ static void pmcraid_worker_function(stru
+ 
+ 	pinstance = container_of(workp, struct pmcraid_instance, worker_q);
+ 	/* add resources only after host is added into system */
+-	if (!atomic_read(&pinstance->expose_resources))
++	if (!atomic_read_unchecked(&pinstance->expose_resources))
+ 		return;
+ 
+ 	spin_lock_irqsave(&pinstance->resource_lock, lock_flags);
+@@ -4847,7 +4847,7 @@ static int __devinit pmcraid_init_instan
+ 	init_waitqueue_head(&pinstance->reset_wait_q);
+ 
+ 	atomic_set(&pinstance->outstanding_cmds, 0);
+-	atomic_set(&pinstance->expose_resources, 0);
++	atomic_set_unchecked(&pinstance->expose_resources, 0);
+ 
+ 	INIT_LIST_HEAD(&pinstance->free_res_q);
+ 	INIT_LIST_HEAD(&pinstance->used_res_q);
+@@ -5499,7 +5499,7 @@ static int __devinit pmcraid_probe(
+ 	/* Schedule worker thread to handle CCN and take care of adding and
+ 	 * removing devices to OS
+ 	 */
+-	atomic_set(&pinstance->expose_resources, 1);
++	atomic_set_unchecked(&pinstance->expose_resources, 1);
+ 	schedule_work(&pinstance->worker_q);
+ 	return rc;
+ 
+diff -urNp linux-2.6.32.40/drivers/scsi/pmcraid.h linux-2.6.32.40/drivers/scsi/pmcraid.h
+--- linux-2.6.32.40/drivers/scsi/pmcraid.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/pmcraid.h	2011-05-04 17:56:28.000000000 -0400
+@@ -690,7 +690,7 @@ struct pmcraid_instance {
+ 	atomic_t outstanding_cmds;
+ 
+ 	/* should add/delete resources to mid-layer now ?*/
+-	atomic_t expose_resources;
++	atomic_unchecked_t expose_resources;
+ 
+ 	/* Tasklet to handle deferred processing */
+ 	struct tasklet_struct isr_tasklet[PMCRAID_NUM_MSIX_VECTORS];
+@@ -727,8 +727,8 @@ struct pmcraid_resource_entry {
+ 	struct list_head queue;	/* link to "to be exposed" resources */
+ 	struct pmcraid_config_table_entry cfg_entry;
+ 	struct scsi_device *scsi_dev;	/* Link scsi_device structure */
+-	atomic_t read_failures;		/* count of failed READ commands */
+-	atomic_t write_failures;	/* count of failed WRITE commands */
++	atomic_unchecked_t read_failures;		/* count of failed READ commands */
++	atomic_unchecked_t write_failures;	/* count of failed WRITE commands */
+ 
+ 	/* To indicate add/delete/modify during CCN */
+ 	u8 change_detected;
+diff -urNp linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_def.h	2011-05-04 17:56:28.000000000 -0400
+@@ -240,7 +240,7 @@ struct ddb_entry {
+ 	atomic_t retry_relogin_timer; /* Min Time between relogins
+ 				       * (4000 only) */
+ 	atomic_t relogin_timer;	/* Max Time to wait for relogin to complete */
+-	atomic_t relogin_retry_count; /* Num of times relogin has been
++	atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
+ 				       * retried */
+ 
+ 	uint16_t port;
+diff -urNp linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_init.c	2011-05-04 17:56:28.000000000 -0400
+@@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_
+ 	atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count);
+ 	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
+ 	atomic_set(&ddb_entry->relogin_timer, 0);
+-	atomic_set(&ddb_entry->relogin_retry_count, 0);
++	atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
+ 	atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
+ 	list_add_tail(&ddb_entry->list, &ha->ddb_list);
+ 	ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry;
+@@ -1308,7 +1308,7 @@ int qla4xxx_process_ddb_changed(struct s
+ 		atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
+ 		atomic_set(&ddb_entry->port_down_timer,
+ 			   ha->port_down_retry_count);
+-		atomic_set(&ddb_entry->relogin_retry_count, 0);
++		atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
+ 		atomic_set(&ddb_entry->relogin_timer, 0);
+ 		clear_bit(DF_RELOGIN, &ddb_entry->flags);
+ 		clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
+diff -urNp linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_os.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/qla4xxx/ql4_os.c	2011-05-04 17:56:28.000000000 -0400
+@@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_ql
+ 			    ddb_entry->fw_ddb_device_state ==
+ 			    DDB_DS_SESSION_FAILED) {
+ 				/* Reset retry relogin timer */
+-				atomic_inc(&ddb_entry->relogin_retry_count);
++				atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
+ 				DEBUG2(printk("scsi%ld: index[%d] relogin"
+ 					      " timed out-retrying"
+ 					      " relogin (%d)\n",
+ 					      ha->host_no,
+ 					      ddb_entry->fw_ddb_index,
+-					      atomic_read(&ddb_entry->
++					      atomic_read_unchecked(&ddb_entry->
+ 							  relogin_retry_count))
+ 					);
+ 				start_dpc++;
+diff -urNp linux-2.6.32.40/drivers/scsi/scsi.c linux-2.6.32.40/drivers/scsi/scsi.c
+--- linux-2.6.32.40/drivers/scsi/scsi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/scsi.c	2011-05-04 17:56:28.000000000 -0400
+@@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
+ 	unsigned long timeout;
+ 	int rtn = 0;
+ 
+-	atomic_inc(&cmd->device->iorequest_cnt);
++	atomic_inc_unchecked(&cmd->device->iorequest_cnt);
+ 
+ 	/* check if the device is still usable */
+ 	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
+diff -urNp linux-2.6.32.40/drivers/scsi/scsi_lib.c linux-2.6.32.40/drivers/scsi/scsi_lib.c
+--- linux-2.6.32.40/drivers/scsi/scsi_lib.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/scsi_lib.c	2011-05-10 22:12:33.000000000 -0400
+@@ -1384,7 +1384,7 @@ static void scsi_kill_request(struct req
+ 
+ 	scsi_init_cmd_errh(cmd);
+ 	cmd->result = DID_NO_CONNECT << 16;
+-	atomic_inc(&cmd->device->iorequest_cnt);
++	atomic_inc_unchecked(&cmd->device->iorequest_cnt);
+ 
+ 	/*
+ 	 * SCSI request completion path will do scsi_device_unbusy(),
+@@ -1415,9 +1415,9 @@ static void scsi_softirq_done(struct req
+ 	 */
+ 	cmd->serial_number = 0;
+ 
+-	atomic_inc(&cmd->device->iodone_cnt);
++	atomic_inc_unchecked(&cmd->device->iodone_cnt);
+ 	if (cmd->result)
+-		atomic_inc(&cmd->device->ioerr_cnt);
++		atomic_inc_unchecked(&cmd->device->ioerr_cnt);
+ 
+ 	disposition = scsi_decide_disposition(cmd);
+ 	if (disposition != SUCCESS &&
+diff -urNp linux-2.6.32.40/drivers/scsi/scsi_sysfs.c linux-2.6.32.40/drivers/scsi/scsi_sysfs.c
+--- linux-2.6.32.40/drivers/scsi/scsi_sysfs.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/scsi_sysfs.c	2011-05-10 22:12:33.000000000 -0400
+@@ -661,7 +661,7 @@ show_iostat_##field(struct device *dev, 
+ 		    char *buf)						\
+ {									\
+ 	struct scsi_device *sdev = to_scsi_device(dev);			\
+-	unsigned long long count = atomic_read(&sdev->field);		\
++	unsigned long long count = atomic_read_unchecked(&sdev->field);	\
+ 	return snprintf(buf, 20, "0x%llx\n", count);			\
+ }									\
+ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
+diff -urNp linux-2.6.32.40/drivers/scsi/scsi_transport_fc.c linux-2.6.32.40/drivers/scsi/scsi_transport_fc.c
+--- linux-2.6.32.40/drivers/scsi/scsi_transport_fc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/scsi_transport_fc.c	2011-05-04 17:56:28.000000000 -0400
+@@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo,
+  * Netlink Infrastructure
+  */
+ 
+-static atomic_t fc_event_seq;
++static atomic_unchecked_t fc_event_seq;
+ 
+ /**
+  * fc_get_event_number - Obtain the next sequential FC event number
+@@ -493,7 +493,7 @@ static atomic_t fc_event_seq;
+ u32
+ fc_get_event_number(void)
+ {
+-	return atomic_add_return(1, &fc_event_seq);
++	return atomic_add_return_unchecked(1, &fc_event_seq);
+ }
+ EXPORT_SYMBOL(fc_get_event_number);
+ 
+@@ -641,7 +641,7 @@ static __init int fc_transport_init(void
+ {
+ 	int error;
+ 
+-	atomic_set(&fc_event_seq, 0);
++	atomic_set_unchecked(&fc_event_seq, 0);
+ 
+ 	error = transport_class_register(&fc_host_class);
+ 	if (error)
+diff -urNp linux-2.6.32.40/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.40/drivers/scsi/scsi_transport_iscsi.c
+--- linux-2.6.32.40/drivers/scsi/scsi_transport_iscsi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/scsi_transport_iscsi.c	2011-05-04 17:56:28.000000000 -0400
+@@ -81,7 +81,7 @@ struct iscsi_internal {
+ 	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
+ };
+ 
+-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
++static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
+ static struct workqueue_struct *iscsi_eh_timer_workq;
+ 
+ /*
+@@ -728,7 +728,7 @@ int iscsi_add_session(struct iscsi_cls_s
+ 	int err;
+ 
+ 	ihost = shost->shost_data;
+-	session->sid = atomic_add_return(1, &iscsi_session_nr);
++	session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
+ 
+ 	if (id == ISCSI_MAX_TARGET) {
+ 		for (id = 0; id < ISCSI_MAX_TARGET; id++) {
+@@ -2060,7 +2060,7 @@ static __init int iscsi_transport_init(v
+ 	printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
+ 		ISCSI_TRANSPORT_VERSION);
+ 
+-	atomic_set(&iscsi_session_nr, 0);
++	atomic_set_unchecked(&iscsi_session_nr, 0);
+ 
+ 	err = class_register(&iscsi_transport_class);
+ 	if (err)
+diff -urNp linux-2.6.32.40/drivers/scsi/scsi_transport_srp.c linux-2.6.32.40/drivers/scsi/scsi_transport_srp.c
+--- linux-2.6.32.40/drivers/scsi/scsi_transport_srp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/scsi_transport_srp.c	2011-05-04 17:56:28.000000000 -0400
+@@ -33,7 +33,7 @@
+ #include "scsi_transport_srp_internal.h"
+ 
+ struct srp_host_attrs {
+-	atomic_t next_port_id;
++	atomic_unchecked_t next_port_id;
+ };
+ #define to_srp_host_attrs(host)	((struct srp_host_attrs *)(host)->shost_data)
+ 
+@@ -62,7 +62,7 @@ static int srp_host_setup(struct transpo
+ 	struct Scsi_Host *shost = dev_to_shost(dev);
+ 	struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
+ 
+-	atomic_set(&srp_host->next_port_id, 0);
++	atomic_set_unchecked(&srp_host->next_port_id, 0);
+ 	return 0;
+ }
+ 
+@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct S
+ 	memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
+ 	rport->roles = ids->roles;
+ 
+-	id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
++	id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
+ 	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
+ 
+ 	transport_setup_device(&rport->dev);
+diff -urNp linux-2.6.32.40/drivers/scsi/sg.c linux-2.6.32.40/drivers/scsi/sg.c
+--- linux-2.6.32.40/drivers/scsi/sg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/scsi/sg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
@@ -29507,9 +32448,9 @@ diff -urNp linux-2.6.32.39/drivers/scsi/sg.c linux-2.6.32.39/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-2.6.32.39/drivers/serial/kgdboc.c linux-2.6.32.39/drivers/serial/kgdboc.c
---- linux-2.6.32.39/drivers/serial/kgdboc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/serial/kgdboc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/serial/kgdboc.c linux-2.6.32.40/drivers/serial/kgdboc.c
+--- linux-2.6.32.40/drivers/serial/kgdboc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/serial/kgdboc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,7 @@
  
  #define MAX_CONFIG_LEN		40
@@ -29528,9 +32469,21 @@ diff -urNp linux-2.6.32.39/drivers/serial/kgdboc.c linux-2.6.32.39/drivers/seria
  	.name			= "kgdboc",
  	.read_char		= kgdboc_get_char,
  	.write_char		= kgdboc_put_char,
-diff -urNp linux-2.6.32.39/drivers/staging/android/binder.c linux-2.6.32.39/drivers/staging/android/binder.c
---- linux-2.6.32.39/drivers/staging/android/binder.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/android/binder.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/spi/spi.c linux-2.6.32.40/drivers/spi/spi.c
+--- linux-2.6.32.40/drivers/spi/spi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/spi/spi.c	2011-05-04 17:56:28.000000000 -0400
+@@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, str
+ EXPORT_SYMBOL_GPL(spi_sync);
+ 
+ /* portable code must never pass more than 32 bytes */
+-#define	SPI_BUFSIZ	max(32,SMP_CACHE_BYTES)
++#define	SPI_BUFSIZ	max(32U,SMP_CACHE_BYTES)
+ 
+ static u8	*buf;
+ 
+diff -urNp linux-2.6.32.40/drivers/staging/android/binder.c linux-2.6.32.40/drivers/staging/android/binder.c
+--- linux-2.6.32.40/drivers/staging/android/binder.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/android/binder.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
  	binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
  }
@@ -29540,9 +32493,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/android/binder.c linux-2.6.32.39/driv
  	.open = binder_vma_open,
  	.close = binder_vma_close,
  };
-diff -urNp linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.40/drivers/staging/b3dfg/b3dfg.c
+--- linux-2.6.32.40/drivers/staging/b3dfg/b3dfg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/b3dfg/b3dfg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
  	return VM_FAULT_NOPAGE;
  }
@@ -29561,9 +32514,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.39/drivers
  	.owner = THIS_MODULE,
  	.open = b3dfg_open,
  	.release = b3dfg_release,
-diff -urNp linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/comedi/comedi_fops.c linux-2.6.32.40/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.32.40/drivers/staging/comedi/comedi_fops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/comedi/comedi_fops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 
  	mutex_unlock(&dev->mutex);
  }
@@ -29573,9 +32526,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/comedi/comedi_fops.c linux-2.6.32.39/
  	.close = comedi_unmap,
  };
  
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.40/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/adsp_driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/adsp_driver.c	2011-04-17 15:56:46.000000000 -0400
 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
  static dev_t adsp_devno;
  static struct class *adsp_class;
@@ -29585,9 +32538,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = adsp_open,
  	.unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_aac.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_aac.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1022,7 +1022,7 @@ done:
  	return rc;
  }
@@ -29597,9 +32550,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
  	.owner = THIS_MODULE,
  	.open = audio_open,
  	.release = audio_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -833,7 +833,7 @@ done:
  	return rc;
  }
@@ -29609,9 +32562,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = audamrnb_open,
  	.release = audamrnb_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_evrc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_evrc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -805,7 +805,7 @@ dma_fail:
  	return rc;
  }
@@ -29621,9 +32574,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
  	.owner = THIS_MODULE,
  	.open = audevrc_open,
  	.release = audevrc_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_in.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_in.c	2011-04-17 15:56:46.000000000 -0400
 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
  	return 0;
  }
@@ -29642,9 +32595,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.3
  	.owner          = THIS_MODULE,
  	.open           = audpre_open,
  	.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_mp3.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_mp3.c	2011-04-17 15:56:46.000000000 -0400
 @@ -941,7 +941,7 @@ done:
  	return rc;
  }
@@ -29654,9 +32607,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audio_open,
  	.release	= audio_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_out.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_out.c	2011-04-17 15:56:46.000000000 -0400
 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
  	return 0;
  }
@@ -29675,9 +32628,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audpp_open,
  	.unlocked_ioctl	= audpp_ioctl,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -816,7 +816,7 @@ err:
  	return rc;
  }
@@ -29687,9 +32640,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = audqcelp_open,
  	.release = audqcelp_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.40/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.32.40/drivers/staging/dream/qdsp5/snd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/qdsp5/snd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -242,7 +242,7 @@ err:
  	return rc;
  }
@@ -29699,9 +32652,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.39/dri
  	.owner		= THIS_MODULE,
  	.open		= snd_open,
  	.release	= snd_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.40/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.32.40/drivers/staging/dream/smd/smd_qmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/smd/smd_qmi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
  	return 0;
  }
@@ -29711,9 +32664,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.39/d
  	.owner = THIS_MODULE,
  	.read = qmi_read,
  	.write = qmi_write,
-diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.40/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.32.40/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-04-17 15:56:46.000000000 -0400
 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 
  	return rc;
  }
@@ -29732,9 +32685,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
  	.owner	 = THIS_MODULE,
  	.open	 = rpcrouter_open,
  	.release = rpcrouter_release,
-diff -urNp linux-2.6.32.39/drivers/staging/dst/dcore.c linux-2.6.32.39/drivers/staging/dst/dcore.c
---- linux-2.6.32.39/drivers/staging/dst/dcore.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dst/dcore.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dst/dcore.c linux-2.6.32.40/drivers/staging/dst/dcore.c
+--- linux-2.6.32.40/drivers/staging/dst/dcore.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dst/dcore.c	2011-04-17 15:56:46.000000000 -0400
 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
  	return 0;
  }
@@ -29753,9 +32706,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/dst/dcore.c linux-2.6.32.39/drivers/s
  	snprintf(n->name, sizeof(n->name), "%s", ctl->name);
  
  	err = dst_node_sysfs_init(n);
-diff -urNp linux-2.6.32.39/drivers/staging/dst/trans.c linux-2.6.32.39/drivers/staging/dst/trans.c
---- linux-2.6.32.39/drivers/staging/dst/trans.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/dst/trans.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/dst/trans.c linux-2.6.32.40/drivers/staging/dst/trans.c
+--- linux-2.6.32.40/drivers/staging/dst/trans.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/dst/trans.c	2011-04-17 15:56:46.000000000 -0400
 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 
  	t->error = 0;
  	t->retries = 0;
@@ -29765,9 +32718,45 @@ diff -urNp linux-2.6.32.39/drivers/staging/dst/trans.c linux-2.6.32.39/drivers/s
  
  	t->enc = bio_data_dir(bio);
  	dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
-diff -urNp linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/et131x/et1310_tx.c linux-2.6.32.40/drivers/staging/et131x/et1310_tx.c
+--- linux-2.6.32.40/drivers/staging/et131x/et1310_tx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/et131x/et1310_tx.c	2011-05-04 17:56:28.000000000 -0400
+@@ -710,11 +710,11 @@ inline void et131x_free_send_packet(stru
+ 	struct net_device_stats *stats = &etdev->net_stats;
+ 
+ 	if (pMpTcb->Flags & fMP_DEST_BROAD)
+-		atomic_inc(&etdev->Stats.brdcstxmt);
++		atomic_inc_unchecked(&etdev->Stats.brdcstxmt);
+ 	else if (pMpTcb->Flags & fMP_DEST_MULTI)
+-		atomic_inc(&etdev->Stats.multixmt);
++		atomic_inc_unchecked(&etdev->Stats.multixmt);
+ 	else
+-		atomic_inc(&etdev->Stats.unixmt);
++		atomic_inc_unchecked(&etdev->Stats.unixmt);
+ 
+ 	if (pMpTcb->Packet) {
+ 		stats->tx_bytes += pMpTcb->Packet->len;
+diff -urNp linux-2.6.32.40/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.40/drivers/staging/et131x/et131x_adapter.h
+--- linux-2.6.32.40/drivers/staging/et131x/et131x_adapter.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/et131x/et131x_adapter.h	2011-05-04 17:56:28.000000000 -0400
+@@ -145,11 +145,11 @@ typedef struct _ce_stats_t {
+ 	 * operations
+ 	 */
+ 	u32 unircv;	/* # multicast packets received */
+-	atomic_t unixmt;	/* # multicast packets for Tx */
++	atomic_unchecked_t unixmt;	/* # multicast packets for Tx */
+ 	u32 multircv;	/* # multicast packets received */
+-	atomic_t multixmt;	/* # multicast packets for Tx */
++	atomic_unchecked_t multixmt;	/* # multicast packets for Tx */
+ 	u32 brdcstrcv;	/* # broadcast packets received */
+-	atomic_t brdcstxmt;	/* # broadcast packets for Tx */
++	atomic_unchecked_t brdcstxmt;	/* # broadcast packets for Tx */
+ 	u32 norcvbuf;	/* # Rx packets discarded */
+ 	u32 noxmtbuf;	/* # Tx packets discarded */
+ 
+diff -urNp linux-2.6.32.40/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.40/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.32.40/drivers/staging/go7007/go7007-v4l2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/go7007/go7007-v4l2.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
  	return 0;
  }
@@ -29777,9 +32766,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.39/
  	.open	= go7007_vm_open,
  	.close	= go7007_vm_close,
  	.fault	= go7007_vm_fault,
-diff -urNp linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.40/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.40/drivers/staging/hv/blkvsc_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/hv/blkvsc_drv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
  /* The one and only one */
  static struct blkvsc_driver_context g_blkvsc_drv;
@@ -29789,9 +32778,23 @@ diff -urNp linux-2.6.32.39/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.39/drive
  	.owner = THIS_MODULE,
  	.open = blkvsc_open,
  	.release = blkvsc_release,
-diff -urNp linux-2.6.32.39/drivers/staging/hv/Hv.c linux-2.6.32.39/drivers/staging/hv/Hv.c
---- linux-2.6.32.39/drivers/staging/hv/Hv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/hv/Hv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/hv/Channel.c linux-2.6.32.40/drivers/staging/hv/Channel.c
+--- linux-2.6.32.40/drivers/staging/hv/Channel.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/hv/Channel.c	2011-05-04 17:56:28.000000000 -0400
+@@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vm
+ 
+ 	DPRINT_ENTER(VMBUS);
+ 
+-	nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);
+-	atomic_inc(&gVmbusConnection.NextGpadlHandle);
++	nextGpadlHandle = atomic_read_unchecked(&gVmbusConnection.NextGpadlHandle);
++	atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle);
+ 
+ 	VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount);
+ 	ASSERT(msgInfo != NULL);
+diff -urNp linux-2.6.32.40/drivers/staging/hv/Hv.c linux-2.6.32.40/drivers/staging/hv/Hv.c
+--- linux-2.6.32.40/drivers/staging/hv/Hv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/hv/Hv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
  	u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
  	u32 outputAddressHi = outputAddress >> 32;
@@ -29801,9 +32804,92 @@ diff -urNp linux-2.6.32.39/drivers/staging/hv/Hv.c linux-2.6.32.39/drivers/stagi
  
  	DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
  		   Control, Input, Output);
-diff -urNp linux-2.6.32.39/drivers/staging/panel/panel.c linux-2.6.32.39/drivers/staging/panel/panel.c
---- linux-2.6.32.39/drivers/staging/panel/panel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/panel/panel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/hv/vmbus_drv.c linux-2.6.32.40/drivers/staging/hv/vmbus_drv.c
+--- linux-2.6.32.40/drivers/staging/hv/vmbus_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/hv/vmbus_drv.c	2011-05-04 17:56:28.000000000 -0400
+@@ -532,7 +532,7 @@ static int vmbus_child_device_register(s
+ 				to_device_context(root_device_obj);
+ 	struct device_context *child_device_ctx =
+ 				to_device_context(child_device_obj);
+-	static atomic_t device_num = ATOMIC_INIT(0);
++	static atomic_unchecked_t device_num = ATOMIC_INIT(0);
+ 
+ 	DPRINT_ENTER(VMBUS_DRV);
+ 
+@@ -541,7 +541,7 @@ static int vmbus_child_device_register(s
+ 
+ 	/* Set the device name. Otherwise, device_register() will fail. */
+ 	dev_set_name(&child_device_ctx->device, "vmbus_0_%d",
+-		     atomic_inc_return(&device_num));
++		     atomic_inc_return_unchecked(&device_num));
+ 
+ 	/* The new device belongs to this bus */
+ 	child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
+diff -urNp linux-2.6.32.40/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.40/drivers/staging/hv/VmbusPrivate.h
+--- linux-2.6.32.40/drivers/staging/hv/VmbusPrivate.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/hv/VmbusPrivate.h	2011-05-04 17:56:28.000000000 -0400
+@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
+ struct VMBUS_CONNECTION {
+ 	enum VMBUS_CONNECT_STATE ConnectState;
+ 
+-	atomic_t NextGpadlHandle;
++	atomic_unchecked_t NextGpadlHandle;
+ 
+ 	/*
+ 	 * Represents channel interrupts. Each bit position represents a
+diff -urNp linux-2.6.32.40/drivers/staging/octeon/ethernet.c linux-2.6.32.40/drivers/staging/octeon/ethernet.c
+--- linux-2.6.32.40/drivers/staging/octeon/ethernet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/octeon/ethernet.c	2011-05-04 17:56:28.000000000 -0400
+@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_
+ 		 * since the RX tasklet also increments it.
+ 		 */
+ #ifdef CONFIG_64BIT
+-		atomic64_add(rx_status.dropped_packets,
+-			     (atomic64_t *)&priv->stats.rx_dropped);
++		atomic64_add_unchecked(rx_status.dropped_packets,
++			     (atomic64_unchecked_t *)&priv->stats.rx_dropped);
+ #else
+-		atomic_add(rx_status.dropped_packets,
+-			     (atomic_t *)&priv->stats.rx_dropped);
++		atomic_add_unchecked(rx_status.dropped_packets,
++			     (atomic_unchecked_t *)&priv->stats.rx_dropped);
+ #endif
+ 	}
+ 
+diff -urNp linux-2.6.32.40/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.40/drivers/staging/octeon/ethernet-rx.c
+--- linux-2.6.32.40/drivers/staging/octeon/ethernet-rx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/octeon/ethernet-rx.c	2011-05-04 17:56:28.000000000 -0400
+@@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long un
+ 				/* Increment RX stats for virtual ports */
+ 				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
+ #ifdef CONFIG_64BIT
+-					atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
+-					atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
++					atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
++					atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
+ #else
+-					atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
+-					atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
++					atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
++					atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
+ #endif
+ 				}
+ 				netif_receive_skb(skb);
+@@ -424,9 +424,9 @@ void cvm_oct_tasklet_rx(unsigned long un
+ 				   dev->name);
+ 				 */
+ #ifdef CONFIG_64BIT
+-				atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
++				atomic64_add_unchecked(1, (atomic64_t *)&priv->stats.rx_dropped);
+ #else
+-				atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
++				atomic_add_unchecked(1, (atomic_t *)&priv->stats.rx_dropped);
+ #endif
+ 				dev_kfree_skb_irq(skb);
+ 			}
+diff -urNp linux-2.6.32.40/drivers/staging/panel/panel.c linux-2.6.32.40/drivers/staging/panel/panel.c
+--- linux-2.6.32.40/drivers/staging/panel/panel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/panel/panel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
  	return 0;
  }
@@ -29822,9 +32908,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/panel/panel.c linux-2.6.32.39/drivers
  	.read    = keypad_read,		/* read */
  	.open    = keypad_open,		/* open */
  	.release = keypad_release,	/* close */
-diff -urNp linux-2.6.32.39/drivers/staging/phison/phison.c linux-2.6.32.39/drivers/staging/phison/phison.c
---- linux-2.6.32.39/drivers/staging/phison/phison.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/phison/phison.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/phison/phison.c linux-2.6.32.40/drivers/staging/phison/phison.c
+--- linux-2.6.32.40/drivers/staging/phison/phison.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/phison/phison.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -29834,9 +32920,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/phison/phison.c linux-2.6.32.39/drive
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= phison_pre_reset,
  };
-diff -urNp linux-2.6.32.39/drivers/staging/poch/poch.c linux-2.6.32.39/drivers/staging/poch/poch.c
---- linux-2.6.32.39/drivers/staging/poch/poch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/poch/poch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/poch/poch.c linux-2.6.32.40/drivers/staging/poch/poch.c
+--- linux-2.6.32.40/drivers/staging/poch/poch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/poch/poch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
  	return 0;
  }
@@ -29846,9 +32932,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/poch/poch.c linux-2.6.32.39/drivers/s
  	.owner = THIS_MODULE,
  	.open = poch_open,
  	.release = poch_release,
-diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/inode.c linux-2.6.32.39/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.39/drivers/staging/pohmelfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/pohmelfs/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/pohmelfs/inode.c linux-2.6.32.40/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.32.40/drivers/staging/pohmelfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/pohmelfs/inode.c	2011-05-04 17:56:20.000000000 -0400
 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
@@ -29858,9 +32944,18 @@ diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/inode.c linux-2.6.32.39/driv
  
  	psb->trans_max_pages = 100;
  
-diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c	2011-04-17 15:56:46.000000000 -0400
+@@ -1865,7 +1865,7 @@ static int pohmelfs_fill_super(struct su
+ 	INIT_LIST_HEAD(&psb->crypto_ready_list);
+ 	INIT_LIST_HEAD(&psb->crypto_active_list);
+ 
+-	atomic_set(&psb->trans_gen, 1);
++	atomic_set_unchecked(&psb->trans_gen, 1);
+ 	atomic_long_set(&psb->total_inodes, 0);
+ 
+ 	mutex_init(&psb->state_lock);
+diff -urNp linux-2.6.32.40/drivers/staging/pohmelfs/mcache.c linux-2.6.32.40/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.32.40/drivers/staging/pohmelfs/mcache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/pohmelfs/mcache.c	2011-04-17 15:56:46.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
@@ -29870,10 +32965,10 @@ diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/mcache.c linux-2.6.32.39/dri
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h	2011-04-17 15:56:46.000000000 -0400
-@@ -570,7 +570,7 @@ struct pohmelfs_config;
+diff -urNp linux-2.6.32.40/drivers/staging/pohmelfs/netfs.h linux-2.6.32.40/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.32.40/drivers/staging/pohmelfs/netfs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/pohmelfs/netfs.h	2011-05-04 17:56:20.000000000 -0400
+@@ -570,14 +570,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
  	struct mutex		mcache_lock;
@@ -29882,9 +32977,29 @@ diff -urNp linux-2.6.32.39/drivers/staging/pohmelfs/netfs.h linux-2.6.32.39/driv
  	unsigned long		mcache_timeout;
  
  	unsigned int		idx;
-diff -urNp linux-2.6.32.39/drivers/staging/sep/sep_driver.c linux-2.6.32.39/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.39/drivers/staging/sep/sep_driver.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/sep/sep_driver.c	2011-04-17 15:56:46.000000000 -0400
+ 
+ 	unsigned int		trans_retries;
+ 
+-	atomic_t		trans_gen;
++	atomic_unchecked_t	trans_gen;
+ 
+ 	unsigned int		crypto_attached_size;
+ 	unsigned int		crypto_align_size;
+diff -urNp linux-2.6.32.40/drivers/staging/pohmelfs/trans.c linux-2.6.32.40/drivers/staging/pohmelfs/trans.c
+--- linux-2.6.32.40/drivers/staging/pohmelfs/trans.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/pohmelfs/trans.c	2011-05-04 17:56:28.000000000 -0400
+@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
+ 	int err;
+ 	struct netfs_cmd *cmd = t->iovec.iov_base;
+ 
+-	t->gen = atomic_inc_return(&psb->trans_gen);
++	t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
+ 
+ 	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
+ 		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
+diff -urNp linux-2.6.32.40/drivers/staging/sep/sep_driver.c linux-2.6.32.40/drivers/staging/sep/sep_driver.c
+--- linux-2.6.32.40/drivers/staging/sep/sep_driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/sep/sep_driver.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 
  static dev_t sep_devno;
  
@@ -29894,9 +33009,63 @@ diff -urNp linux-2.6.32.39/drivers/staging/sep/sep_driver.c linux-2.6.32.39/driv
  	.owner = THIS_MODULE,
  	.ioctl = sep_ioctl,
  	.poll = sep_poll,
-diff -urNp linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/staging/usbip/vhci.h linux-2.6.32.40/drivers/staging/usbip/vhci.h
+--- linux-2.6.32.40/drivers/staging/usbip/vhci.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/usbip/vhci.h	2011-05-04 17:56:28.000000000 -0400
+@@ -92,7 +92,7 @@ struct vhci_hcd {
+ 	unsigned	resuming:1;
+ 	unsigned long	re_timeout;
+ 
+-	atomic_t seqnum;
++	atomic_unchecked_t seqnum;
+ 
+ 	/*
+ 	 * NOTE:
+diff -urNp linux-2.6.32.40/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.40/drivers/staging/usbip/vhci_hcd.c
+--- linux-2.6.32.40/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:12:33.000000000 -0400
+@@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb)
+ 		return;
+ 	}
+ 
+-	priv->seqnum = atomic_inc_return(&the_controller->seqnum);
++	priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
+ 	if (priv->seqnum == 0xffff)
+ 		usbip_uinfo("seqnum max\n");
+ 
+@@ -793,7 +793,7 @@ static int vhci_urb_dequeue(struct usb_h
+ 			return -ENOMEM;
+ 		}
+ 
+-		unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
++		unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
+ 		if (unlink->seqnum == 0xffff)
+ 			usbip_uinfo("seqnum max\n");
+ 
+@@ -988,7 +988,7 @@ static int vhci_start(struct usb_hcd *hc
+ 		vdev->rhport = rhport;
+ 	}
+ 
+-	atomic_set(&vhci->seqnum, 0);
++	atomic_set_unchecked(&vhci->seqnum, 0);
+ 	spin_lock_init(&vhci->lock);
+ 
+ 
+diff -urNp linux-2.6.32.40/drivers/staging/usbip/vhci_rx.c linux-2.6.32.40/drivers/staging/usbip/vhci_rx.c
+--- linux-2.6.32.40/drivers/staging/usbip/vhci_rx.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/usbip/vhci_rx.c	2011-05-04 17:56:28.000000000 -0400
+@@ -78,7 +78,7 @@ static void vhci_recv_ret_submit(struct 
+ 		usbip_uerr("cannot find a urb of seqnum %u\n",
+ 							pdu->base.seqnum);
+ 		usbip_uinfo("max seqnum %d\n",
+-					atomic_read(&the_controller->seqnum));
++					atomic_read_unchecked(&the_controller->seqnum));
+ 		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
+ 		return;
+ 	}
+diff -urNp linux-2.6.32.40/drivers/staging/vme/devices/vme_user.c linux-2.6.32.40/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.32.40/drivers/staging/vme/devices/vme_user.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/staging/vme/devices/vme_user.c	2011-04-17 15:56:46.000000000 -0400
 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
  static int __init vme_user_probe(struct device *, int, int);
  static int __exit vme_user_remove(struct device *, int, int);
@@ -29906,9 +33075,9 @@ diff -urNp linux-2.6.32.39/drivers/staging/vme/devices/vme_user.c linux-2.6.32.3
          .open = vme_user_open,
          .release = vme_user_release,
          .read = vme_user_read,
-diff -urNp linux-2.6.32.39/drivers/uio/uio.c linux-2.6.32.39/drivers/uio/uio.c
---- linux-2.6.32.39/drivers/uio/uio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/uio/uio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/uio/uio.c linux-2.6.32.40/drivers/uio/uio.c
+--- linux-2.6.32.40/drivers/uio/uio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/uio/uio.c	2011-05-04 17:56:20.000000000 -0400
 @@ -23,6 +23,7 @@
  #include <linux/string.h>
  #include <linux/kobject.h>
@@ -29917,8 +33086,12 @@ diff -urNp linux-2.6.32.39/drivers/uio/uio.c linux-2.6.32.39/drivers/uio/uio.c
  
  #define UIO_MAX_DEVICES 255
  
-@@ -33,7 +34,7 @@ struct uio_device {
- 	atomic_t		event;
+@@ -30,10 +31,10 @@ struct uio_device {
+ 	struct module		*owner;
+ 	struct device		*dev;
+ 	int			minor;
+-	atomic_t		event;
++	atomic_unchecked_t	event;
  	struct fasync_struct	*async_queue;
  	wait_queue_head_t	wait;
 -	int			vma_count;
@@ -29944,6 +33117,51 @@ diff -urNp linux-2.6.32.39/drivers/uio/uio.c linux-2.6.32.39/drivers/uio/uio.c
  	.show = portio_type_show,
  };
  
+@@ -255,7 +256,7 @@ static ssize_t show_event(struct device 
+ 	struct uio_device *idev = dev_get_drvdata(dev);
+ 	if (idev)
+ 		return sprintf(buf, "%u\n",
+-				(unsigned int)atomic_read(&idev->event));
++				(unsigned int)atomic_read_unchecked(&idev->event));
+ 	else
+ 		return -ENODEV;
+ }
+@@ -424,7 +425,7 @@ void uio_event_notify(struct uio_info *i
+ {
+ 	struct uio_device *idev = info->uio_dev;
+ 
+-	atomic_inc(&idev->event);
++	atomic_inc_unchecked(&idev->event);
+ 	wake_up_interruptible(&idev->wait);
+ 	kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
+ }
+@@ -477,7 +478,7 @@ static int uio_open(struct inode *inode,
+ 	}
+ 
+ 	listener->dev = idev;
+-	listener->event_count = atomic_read(&idev->event);
++	listener->event_count = atomic_read_unchecked(&idev->event);
+ 	filep->private_data = listener;
+ 
+ 	if (idev->info->open) {
+@@ -528,7 +529,7 @@ static unsigned int uio_poll(struct file
+ 		return -EIO;
+ 
+ 	poll_wait(filep, &idev->wait, wait);
+-	if (listener->event_count != atomic_read(&idev->event))
++	if (listener->event_count != atomic_read_unchecked(&idev->event))
+ 		return POLLIN | POLLRDNORM;
+ 	return 0;
+ }
+@@ -553,7 +554,7 @@ static ssize_t uio_read(struct file *fil
+ 	do {
+ 		set_current_state(TASK_INTERRUPTIBLE);
+ 
+-		event_count = atomic_read(&idev->event);
++		event_count = atomic_read_unchecked(&idev->event);
+ 		if (event_count != listener->event_count) {
+ 			if (copy_to_user(buf, &event_count, count))
+ 				retval = -EFAULT;
 @@ -624,13 +625,13 @@ static int uio_find_mem_index(struct vm_
  static void uio_vma_open(struct vm_area_struct *vma)
  {
@@ -29960,9 +33178,18 @@ diff -urNp linux-2.6.32.39/drivers/uio/uio.c linux-2.6.32.39/drivers/uio/uio.c
  }
  
  static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-diff -urNp linux-2.6.32.39/drivers/usb/atm/usbatm.c linux-2.6.32.39/drivers/usb/atm/usbatm.c
---- linux-2.6.32.39/drivers/usb/atm/usbatm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/atm/usbatm.c	2011-04-17 15:56:46.000000000 -0400
+@@ -840,7 +841,7 @@ int __uio_register_device(struct module 
+ 	idev->owner = owner;
+ 	idev->info = info;
+ 	init_waitqueue_head(&idev->wait);
+-	atomic_set(&idev->event, 0);
++	atomic_set_unchecked(&idev->event, 0);
+ 
+ 	ret = uio_get_minor(idev);
+ 	if (ret)
+diff -urNp linux-2.6.32.40/drivers/usb/atm/usbatm.c linux-2.6.32.40/drivers/usb/atm/usbatm.c
+--- linux-2.6.32.40/drivers/usb/atm/usbatm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/atm/usbatm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
  		if (printk_ratelimit())
  			atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -30042,9 +33269,9 @@ diff -urNp linux-2.6.32.39/drivers/usb/atm/usbatm.c linux-2.6.32.39/drivers/usb/
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-2.6.32.39/drivers/usb/class/cdc-wdm.c linux-2.6.32.39/drivers/usb/class/cdc-wdm.c
---- linux-2.6.32.39/drivers/usb/class/cdc-wdm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/class/cdc-wdm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/class/cdc-wdm.c linux-2.6.32.40/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.32.40/drivers/usb/class/cdc-wdm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/class/cdc-wdm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -314,7 +314,7 @@ static ssize_t wdm_write
  	if (r < 0)
  		goto outnp;
@@ -30054,9 +33281,9 @@ diff -urNp linux-2.6.32.39/drivers/usb/class/cdc-wdm.c linux-2.6.32.39/drivers/u
  		r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
  								&desc->flags));
  	else
-diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.c linux-2.6.32.39/drivers/usb/core/hcd.c
---- linux-2.6.32.39/drivers/usb/core/hcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/core/hcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/core/hcd.c linux-2.6.32.40/drivers/usb/core/hcd.c
+--- linux-2.6.32.40/drivers/usb/core/hcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/core/hcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
  
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -30075,9 +33302,9 @@ diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.c linux-2.6.32.39/drivers/usb/co
  {
  
  	if (mon_ops)
-diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.h linux-2.6.32.39/drivers/usb/core/hcd.h
---- linux-2.6.32.39/drivers/usb/core/hcd.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/core/hcd.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/core/hcd.h linux-2.6.32.40/drivers/usb/core/hcd.h
+--- linux-2.6.32.40/drivers/usb/core/hcd.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/core/hcd.h	2011-04-17 15:56:46.000000000 -0400
 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
  
@@ -30105,9 +33332,9 @@ diff -urNp linux-2.6.32.39/drivers/usb/core/hcd.h linux-2.6.32.39/drivers/usb/co
  void usb_mon_deregister(void);
  
  #else
-diff -urNp linux-2.6.32.39/drivers/usb/core/message.c linux-2.6.32.39/drivers/usb/core/message.c
---- linux-2.6.32.39/drivers/usb/core/message.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/core/message.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/core/message.c linux-2.6.32.40/drivers/usb/core/message.c
+--- linux-2.6.32.40/drivers/usb/core/message.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/core/message.c	2011-04-17 15:56:46.000000000 -0400
 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
@@ -30119,9 +33346,9 @@ diff -urNp linux-2.6.32.39/drivers/usb/core/message.c linux-2.6.32.39/drivers/us
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.32.39/drivers/usb/misc/appledisplay.c linux-2.6.32.39/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.39/drivers/usb/misc/appledisplay.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/misc/appledisplay.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/misc/appledisplay.c linux-2.6.32.40/drivers/usb/misc/appledisplay.c
+--- linux-2.6.32.40/drivers/usb/misc/appledisplay.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/misc/appledisplay.c	2011-04-17 15:56:46.000000000 -0400
 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
  		return pdata->msgdata[1];
  }
@@ -30131,9 +33358,9 @@ diff -urNp linux-2.6.32.39/drivers/usb/misc/appledisplay.c linux-2.6.32.39/drive
  	.get_brightness	= appledisplay_bl_get_brightness,
  	.update_status	= appledisplay_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/usb/mon/mon_main.c linux-2.6.32.39/drivers/usb/mon/mon_main.c
---- linux-2.6.32.39/drivers/usb/mon/mon_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/usb/mon/mon_main.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/mon/mon_main.c linux-2.6.32.40/drivers/usb/mon/mon_main.c
+--- linux-2.6.32.40/drivers/usb/mon/mon_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/mon/mon_main.c	2011-04-17 15:56:46.000000000 -0400
 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
  /*
   * Ops
@@ -30143,9 +33370,42 @@ diff -urNp linux-2.6.32.39/drivers/usb/mon/mon_main.c linux-2.6.32.39/drivers/us
  	.urb_submit =	mon_submit,
  	.urb_submit_error = mon_submit_error,
  	.urb_complete =	mon_complete,
-diff -urNp linux-2.6.32.39/drivers/uwb/wlp/messages.c linux-2.6.32.39/drivers/uwb/wlp/messages.c
---- linux-2.6.32.39/drivers/uwb/wlp/messages.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/uwb/wlp/messages.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.40/drivers/usb/wusbcore/wa-hc.h
+--- linux-2.6.32.40/drivers/usb/wusbcore/wa-hc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/wusbcore/wa-hc.h	2011-05-04 17:56:28.000000000 -0400
+@@ -192,7 +192,7 @@ struct wahc {
+ 	struct list_head xfer_delayed_list;
+ 	spinlock_t xfer_list_lock;
+ 	struct work_struct xfer_work;
+-	atomic_t xfer_id_count;
++	atomic_unchecked_t xfer_id_count;
+ };
+ 
+ 
+@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *
+ 	INIT_LIST_HEAD(&wa->xfer_delayed_list);
+ 	spin_lock_init(&wa->xfer_list_lock);
+ 	INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
+-	atomic_set(&wa->xfer_id_count, 1);
++	atomic_set_unchecked(&wa->xfer_id_count, 1);
+ }
+ 
+ /**
+diff -urNp linux-2.6.32.40/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.40/drivers/usb/wusbcore/wa-xfer.c
+--- linux-2.6.32.40/drivers/usb/wusbcore/wa-xfer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/usb/wusbcore/wa-xfer.c	2011-05-04 17:56:28.000000000 -0400
+@@ -293,7 +293,7 @@ out:
+  */
+ static void wa_xfer_id_init(struct wa_xfer *xfer)
+ {
+-	xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
++	xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
+ }
+ 
+ /*
+diff -urNp linux-2.6.32.40/drivers/uwb/wlp/messages.c linux-2.6.32.40/drivers/uwb/wlp/messages.c
+--- linux-2.6.32.40/drivers/uwb/wlp/messages.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/uwb/wlp/messages.c	2011-04-17 15:56:46.000000000 -0400
 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
  	size_t len = skb->len;
  	size_t used;
@@ -30155,9 +33415,9 @@ diff -urNp linux-2.6.32.39/drivers/uwb/wlp/messages.c linux-2.6.32.39/drivers/uw
  	enum wlp_assc_error assc_err;
  	char enonce_buf[WLP_WSS_NONCE_STRSIZE];
  	char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.32.39/drivers/uwb/wlp/sysfs.c linux-2.6.32.39/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.39/drivers/uwb/wlp/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/uwb/wlp/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/uwb/wlp/sysfs.c linux-2.6.32.40/drivers/uwb/wlp/sysfs.c
+--- linux-2.6.32.40/drivers/uwb/wlp/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/uwb/wlp/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
  	return ret;
  }
@@ -30168,9 +33428,9 @@ diff -urNp linux-2.6.32.39/drivers/uwb/wlp/sysfs.c linux-2.6.32.39/drivers/uwb/w
  	.show	= wlp_wss_attr_show,
  	.store	= wlp_wss_attr_store,
  };
-diff -urNp linux-2.6.32.39/drivers/video/atmel_lcdfb.c linux-2.6.32.39/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.39/drivers/video/atmel_lcdfb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/atmel_lcdfb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/atmel_lcdfb.c linux-2.6.32.40/drivers/video/atmel_lcdfb.c
+--- linux-2.6.32.40/drivers/video/atmel_lcdfb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/atmel_lcdfb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
  	return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
  }
@@ -30180,9 +33440,9 @@ diff -urNp linux-2.6.32.39/drivers/video/atmel_lcdfb.c linux-2.6.32.39/drivers/v
  	.update_status = atmel_bl_update_status,
  	.get_brightness = atmel_bl_get_brightness,
  };
-diff -urNp linux-2.6.32.39/drivers/video/aty/aty128fb.c linux-2.6.32.39/drivers/video/aty/aty128fb.c
---- linux-2.6.32.39/drivers/video/aty/aty128fb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/aty/aty128fb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/aty/aty128fb.c linux-2.6.32.40/drivers/video/aty/aty128fb.c
+--- linux-2.6.32.40/drivers/video/aty/aty128fb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/aty/aty128fb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
  	return bd->props.brightness;
  }
@@ -30192,9 +33452,9 @@ diff -urNp linux-2.6.32.39/drivers/video/aty/aty128fb.c linux-2.6.32.39/drivers/
  	.get_brightness	= aty128_bl_get_brightness,
  	.update_status	= aty128_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/aty/atyfb_base.c linux-2.6.32.39/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.39/drivers/video/aty/atyfb_base.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/aty/atyfb_base.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/aty/atyfb_base.c linux-2.6.32.40/drivers/video/aty/atyfb_base.c
+--- linux-2.6.32.40/drivers/video/aty/atyfb_base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/aty/atyfb_base.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 
  	return bd->props.brightness;
  }
@@ -30204,9 +33464,9 @@ diff -urNp linux-2.6.32.39/drivers/video/aty/atyfb_base.c linux-2.6.32.39/driver
  	.get_brightness = aty_bl_get_brightness,
  	.update_status	= aty_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/aty/radeon_backlight.c linux-2.6.32.39/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.39/drivers/video/aty/radeon_backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/aty/radeon_backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/aty/radeon_backlight.c linux-2.6.32.40/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.32.40/drivers/video/aty/radeon_backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/aty/radeon_backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
  	return bd->props.brightness;
  }
@@ -30216,9 +33476,9 @@ diff -urNp linux-2.6.32.39/drivers/video/aty/radeon_backlight.c linux-2.6.32.39/
  	.get_brightness = radeon_bl_get_brightness,
  	.update_status	= radeon_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/adp5520_bl.c linux-2.6.32.40/drivers/video/backlight/adp5520_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/adp5520_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/adp5520_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
  	return error ? data->current_brightness : reg_val;
  }
@@ -30228,9 +33488,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/adp5520_bl.c linux-2.6.32.39/
  	.update_status	= adp5520_bl_update_status,
  	.get_brightness	= adp5520_bl_get_brightness,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/adx_bl.c linux-2.6.32.39/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.39/drivers/video/backlight/adx_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/adx_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/adx_bl.c linux-2.6.32.40/drivers/video/backlight/adx_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/adx_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/adx_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
  	return 1;
  }
@@ -30240,9 +33500,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/adx_bl.c linux-2.6.32.39/driv
  	.options = 0,
  	.update_status = adx_backlight_update_status,
  	.get_brightness = adx_backlight_get_brightness,
-diff -urNp linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.40/drivers/video/backlight/atmel-pwm-bl.c
+--- linux-2.6.32.40/drivers/video/backlight/atmel-pwm-bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/atmel-pwm-bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 
  	return pwm_channel_enable(&pwmbl->pwmc);
  }
@@ -30252,9 +33512,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.3
  	.get_brightness = atmel_pwm_bl_get_intensity,
  	.update_status  = atmel_pwm_bl_set_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/backlight.c linux-2.6.32.39/drivers/video/backlight/backlight.c
---- linux-2.6.32.39/drivers/video/backlight/backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/backlight.c linux-2.6.32.40/drivers/video/backlight/backlight.c
+--- linux-2.6.32.40/drivers/video/backlight/backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
   * ERR_PTR() or a pointer to the newly allocated device.
   */
@@ -30264,9 +33524,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/backlight.c linux-2.6.32.39/d
  {
  	struct backlight_device *new_bd;
  	int rc;
-diff -urNp linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/corgi_lcd.c linux-2.6.32.40/drivers/video/backlight/corgi_lcd.c
+--- linux-2.6.32.40/drivers/video/backlight/corgi_lcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/corgi_lcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
  }
  EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -30276,9 +33536,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/corgi_lcd.c linux-2.6.32.39/d
  	.get_brightness	= corgi_bl_get_intensity,
  	.update_status  = corgi_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/cr_bllcd.c linux-2.6.32.40/drivers/video/backlight/cr_bllcd.c
+--- linux-2.6.32.40/drivers/video/backlight/cr_bllcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/cr_bllcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
  	return intensity;
  }
@@ -30288,9 +33548,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/cr_bllcd.c linux-2.6.32.39/dr
  	.get_brightness = cr_backlight_get_intensity,
  	.update_status = cr_backlight_set_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/da903x_bl.c linux-2.6.32.39/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.39/drivers/video/backlight/da903x_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/da903x_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/da903x_bl.c linux-2.6.32.40/drivers/video/backlight/da903x_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/da903x_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/da903x_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
  	return data->current_brightness;
  }
@@ -30300,9 +33560,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/da903x_bl.c linux-2.6.32.39/d
  	.update_status	= da903x_backlight_update_status,
  	.get_brightness	= da903x_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/generic_bl.c linux-2.6.32.39/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.39/drivers/video/backlight/generic_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/generic_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/generic_bl.c linux-2.6.32.40/drivers/video/backlight/generic_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/generic_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/generic_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
  }
  EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -30312,9 +33572,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/generic_bl.c linux-2.6.32.39/
  	.options = BL_CORE_SUSPENDRESUME,
  	.get_brightness = genericbl_get_intensity,
  	.update_status  = genericbl_send_intensity,
-diff -urNp linux-2.6.32.39/drivers/video/backlight/hp680_bl.c linux-2.6.32.39/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.39/drivers/video/backlight/hp680_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/hp680_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/hp680_bl.c linux-2.6.32.40/drivers/video/backlight/hp680_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/hp680_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/hp680_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 
  	return current_intensity;
  }
@@ -30324,9 +33584,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/hp680_bl.c linux-2.6.32.39/dr
  	.get_brightness = hp680bl_get_intensity,
  	.update_status  = hp680bl_set_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/jornada720_bl.c linux-2.6.32.40/drivers/video/backlight/jornada720_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/jornada720_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/jornada720_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -93,7 +93,7 @@ out:
  	return ret;
  }
@@ -30336,9 +33596,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
  	.get_brightness = jornada_bl_get_brightness,
  	.update_status = jornada_bl_update_status,
  	.options = BL_CORE_SUSPENDRESUME,
-diff -urNp linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/kb3886_bl.c linux-2.6.32.40/drivers/video/backlight/kb3886_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/kb3886_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/kb3886_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
  	return kb3886bl_intensity;
  }
@@ -30348,9 +33608,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/kb3886_bl.c linux-2.6.32.39/d
  	.get_brightness = kb3886bl_get_intensity,
  	.update_status  = kb3886bl_send_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/locomolcd.c linux-2.6.32.39/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.39/drivers/video/backlight/locomolcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/locomolcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/locomolcd.c linux-2.6.32.40/drivers/video/backlight/locomolcd.c
+--- linux-2.6.32.40/drivers/video/backlight/locomolcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/locomolcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
  	return current_intensity;
  }
@@ -30360,9 +33620,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/locomolcd.c linux-2.6.32.39/d
  	.get_brightness = locomolcd_get_intensity,
  	.update_status  = locomolcd_set_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.40/drivers/video/backlight/mbp_nvidia_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/mbp_nvidia_bl.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/mbp_nvidia_bl.c	2011-05-10 22:12:33.000000000 -0400
 @@ -33,7 +33,7 @@ struct dmi_match_data {
  	unsigned long iostart;
  	unsigned long iolen;
@@ -30372,9 +33632,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
  };
  
  /* Module parameters. */
-diff -urNp linux-2.6.32.39/drivers/video/backlight/omap1_bl.c linux-2.6.32.39/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.39/drivers/video/backlight/omap1_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/omap1_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/omap1_bl.c linux-2.6.32.40/drivers/video/backlight/omap1_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/omap1_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/omap1_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
  	return bl->current_intensity;
  }
@@ -30384,9 +33644,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/omap1_bl.c linux-2.6.32.39/dr
  	.get_brightness = omapbl_get_intensity,
  	.update_status  = omapbl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/progear_bl.c linux-2.6.32.39/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.39/drivers/video/backlight/progear_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/progear_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/progear_bl.c linux-2.6.32.40/drivers/video/backlight/progear_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/progear_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/progear_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
  	return intensity - HW_LEVEL_MIN;
  }
@@ -30396,9 +33656,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/progear_bl.c linux-2.6.32.39/
  	.get_brightness = progearbl_get_intensity,
  	.update_status = progearbl_set_intensity,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/pwm_bl.c linux-2.6.32.39/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.39/drivers/video/backlight/pwm_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/pwm_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/pwm_bl.c linux-2.6.32.40/drivers/video/backlight/pwm_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/pwm_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/pwm_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
  	return bl->props.brightness;
  }
@@ -30408,9 +33668,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/pwm_bl.c linux-2.6.32.39/driv
  	.update_status	= pwm_backlight_update_status,
  	.get_brightness	= pwm_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/tosa_bl.c linux-2.6.32.39/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.39/drivers/video/backlight/tosa_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/tosa_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/tosa_bl.c linux-2.6.32.40/drivers/video/backlight/tosa_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/tosa_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/tosa_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
  	return props->brightness;
  }
@@ -30420,9 +33680,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/tosa_bl.c linux-2.6.32.39/dri
  	.get_brightness		= tosa_bl_get_brightness,
  	.update_status		= tosa_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/backlight/wm831x_bl.c linux-2.6.32.40/drivers/video/backlight/wm831x_bl.c
+--- linux-2.6.32.40/drivers/video/backlight/wm831x_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/backlight/wm831x_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
  	return data->current_brightness;
  }
@@ -30432,9 +33692,9 @@ diff -urNp linux-2.6.32.39/drivers/video/backlight/wm831x_bl.c linux-2.6.32.39/d
  	.options = BL_CORE_SUSPENDRESUME,
  	.update_status	= wm831x_backlight_update_status,
  	.get_brightness	= wm831x_backlight_get_brightness,
-diff -urNp linux-2.6.32.39/drivers/video/bf54x-lq043fb.c linux-2.6.32.39/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.39/drivers/video/bf54x-lq043fb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/bf54x-lq043fb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/bf54x-lq043fb.c linux-2.6.32.40/drivers/video/bf54x-lq043fb.c
+--- linux-2.6.32.40/drivers/video/bf54x-lq043fb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/bf54x-lq043fb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
  	return 0;
  }
@@ -30444,9 +33704,9 @@ diff -urNp linux-2.6.32.39/drivers/video/bf54x-lq043fb.c linux-2.6.32.39/drivers
  	.get_brightness = bl_get_brightness,
  };
  
-diff -urNp linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.40/drivers/video/bfin-t350mcqb-fb.c
+--- linux-2.6.32.40/drivers/video/bfin-t350mcqb-fb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/bfin-t350mcqb-fb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
  	return 0;
  }
@@ -30456,9 +33716,9 @@ diff -urNp linux-2.6.32.39/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.39/driv
  	.get_brightness = bl_get_brightness,
  };
  
-diff -urNp linux-2.6.32.39/drivers/video/fbcmap.c linux-2.6.32.39/drivers/video/fbcmap.c
---- linux-2.6.32.39/drivers/video/fbcmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/fbcmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/fbcmap.c linux-2.6.32.40/drivers/video/fbcmap.c
+--- linux-2.6.32.40/drivers/video/fbcmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/fbcmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
@@ -30469,9 +33729,9 @@ diff -urNp linux-2.6.32.39/drivers/video/fbcmap.c linux-2.6.32.39/drivers/video/
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-2.6.32.39/drivers/video/fbmem.c linux-2.6.32.39/drivers/video/fbmem.c
---- linux-2.6.32.39/drivers/video/fbmem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/fbmem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/fbmem.c linux-2.6.32.40/drivers/video/fbmem.c
+--- linux-2.6.32.40/drivers/video/fbmem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/fbmem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
@@ -30499,9 +33759,9 @@ diff -urNp linux-2.6.32.39/drivers/video/fbmem.c linux-2.6.32.39/drivers/video/f
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.32.39/drivers/video/i810/i810_accel.c linux-2.6.32.39/drivers/video/i810/i810_accel.c
---- linux-2.6.32.39/drivers/video/i810/i810_accel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/i810/i810_accel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/i810/i810_accel.c linux-2.6.32.40/drivers/video/i810/i810_accel.c
+--- linux-2.6.32.40/drivers/video/i810/i810_accel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/i810/i810_accel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
@@ -30510,9 +33770,9 @@ diff -urNp linux-2.6.32.39/drivers/video/i810/i810_accel.c linux-2.6.32.39/drive
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/nvidia/nv_backlight.c linux-2.6.32.40/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.32.40/drivers/video/nvidia/nv_backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/nvidia/nv_backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
  	return bd->props.brightness;
  }
@@ -30522,9 +33782,9 @@ diff -urNp linux-2.6.32.39/drivers/video/nvidia/nv_backlight.c linux-2.6.32.39/d
  	.get_brightness = nvidia_bl_get_brightness,
  	.update_status	= nvidia_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/riva/fbdev.c linux-2.6.32.39/drivers/video/riva/fbdev.c
---- linux-2.6.32.39/drivers/video/riva/fbdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/riva/fbdev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/riva/fbdev.c linux-2.6.32.40/drivers/video/riva/fbdev.c
+--- linux-2.6.32.40/drivers/video/riva/fbdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/riva/fbdev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
  	return bd->props.brightness;
  }
@@ -30534,9 +33794,9 @@ diff -urNp linux-2.6.32.39/drivers/video/riva/fbdev.c linux-2.6.32.39/drivers/vi
  	.get_brightness = riva_bl_get_brightness,
  	.update_status	= riva_bl_update_status,
  };
-diff -urNp linux-2.6.32.39/drivers/video/uvesafb.c linux-2.6.32.39/drivers/video/uvesafb.c
---- linux-2.6.32.39/drivers/video/uvesafb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/uvesafb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/uvesafb.c linux-2.6.32.40/drivers/video/uvesafb.c
+--- linux-2.6.32.40/drivers/video/uvesafb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/uvesafb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/fb.h>
  #include <linux/io.h>
@@ -30612,9 +33872,9 @@ diff -urNp linux-2.6.32.39/drivers/video/uvesafb.c linux-2.6.32.39/drivers/video
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-2.6.32.39/drivers/video/vesafb.c linux-2.6.32.39/drivers/video/vesafb.c
---- linux-2.6.32.39/drivers/video/vesafb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/video/vesafb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/video/vesafb.c linux-2.6.32.40/drivers/video/vesafb.c
+--- linux-2.6.32.40/drivers/video/vesafb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/video/vesafb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -30718,9 +33978,9 @@ diff -urNp linux-2.6.32.39/drivers/video/vesafb.c linux-2.6.32.39/drivers/video/
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-2.6.32.39/drivers/xen/sys-hypervisor.c linux-2.6.32.39/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.39/drivers/xen/sys-hypervisor.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/drivers/xen/sys-hypervisor.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/drivers/xen/sys-hypervisor.c linux-2.6.32.40/drivers/xen/sys-hypervisor.c
+--- linux-2.6.32.40/drivers/xen/sys-hypervisor.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/drivers/xen/sys-hypervisor.c	2011-04-17 15:56:46.000000000 -0400
 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
  	return 0;
  }
@@ -30730,9 +33990,9 @@ diff -urNp linux-2.6.32.39/drivers/xen/sys-hypervisor.c linux-2.6.32.39/drivers/
  	.show = hyp_sysfs_show,
  	.store = hyp_sysfs_store,
  };
-diff -urNp linux-2.6.32.39/fs/9p/vfs_inode.c linux-2.6.32.39/fs/9p/vfs_inode.c
---- linux-2.6.32.39/fs/9p/vfs_inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/9p/vfs_inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/9p/vfs_inode.c linux-2.6.32.40/fs/9p/vfs_inode.c
+--- linux-2.6.32.40/fs/9p/vfs_inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/9p/vfs_inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
  static void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -30742,9 +34002,9 @@ diff -urNp linux-2.6.32.39/fs/9p/vfs_inode.c linux-2.6.32.39/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.32.39/fs/aio.c linux-2.6.32.39/fs/aio.c
---- linux-2.6.32.39/fs/aio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/aio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/aio.c linux-2.6.32.40/fs/aio.c
+--- linux-2.6.32.40/fs/aio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/aio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -30754,9 +34014,9 @@ diff -urNp linux-2.6.32.39/fs/aio.c linux-2.6.32.39/fs/aio.c
  		return -EINVAL;
  
  	nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.32.39/fs/attr.c linux-2.6.32.39/fs/attr.c
---- linux-2.6.32.39/fs/attr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/attr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/attr.c linux-2.6.32.40/fs/attr.c
+--- linux-2.6.32.40/fs/attr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/attr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
@@ -30765,9 +34025,9 @@ diff -urNp linux-2.6.32.39/fs/attr.c linux-2.6.32.39/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.32.39/fs/autofs/root.c linux-2.6.32.39/fs/autofs/root.c
---- linux-2.6.32.39/fs/autofs/root.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/autofs/root.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/autofs/root.c linux-2.6.32.40/fs/autofs/root.c
+--- linux-2.6.32.40/fs/autofs/root.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/autofs/root.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
  	set_bit(n,sbi->symlink_bitmap);
  	sl = &sbi->symlink[n];
@@ -30778,9 +34038,9 @@ diff -urNp linux-2.6.32.39/fs/autofs/root.c linux-2.6.32.39/fs/autofs/root.c
  	if (!sl->data) {
  		clear_bit(n,sbi->symlink_bitmap);
  		unlock_kernel();
-diff -urNp linux-2.6.32.39/fs/autofs4/symlink.c linux-2.6.32.39/fs/autofs4/symlink.c
---- linux-2.6.32.39/fs/autofs4/symlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/autofs4/symlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/autofs4/symlink.c linux-2.6.32.40/fs/autofs4/symlink.c
+--- linux-2.6.32.40/fs/autofs4/symlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/autofs4/symlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,7 @@
  static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
@@ -30790,9 +34050,9 @@ diff -urNp linux-2.6.32.39/fs/autofs4/symlink.c linux-2.6.32.39/fs/autofs4/symli
  	return NULL;
  }
  
-diff -urNp linux-2.6.32.39/fs/befs/linuxvfs.c linux-2.6.32.39/fs/befs/linuxvfs.c
---- linux-2.6.32.39/fs/befs/linuxvfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/befs/linuxvfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/befs/linuxvfs.c linux-2.6.32.40/fs/befs/linuxvfs.c
+--- linux-2.6.32.40/fs/befs/linuxvfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/befs/linuxvfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -30802,9 +34062,9 @@ diff -urNp linux-2.6.32.39/fs/befs/linuxvfs.c linux-2.6.32.39/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-2.6.32.39/fs/binfmt_aout.c linux-2.6.32.39/fs/binfmt_aout.c
---- linux-2.6.32.39/fs/binfmt_aout.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/binfmt_aout.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/binfmt_aout.c linux-2.6.32.40/fs/binfmt_aout.c
+--- linux-2.6.32.40/fs/binfmt_aout.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/binfmt_aout.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -30892,9 +34152,9 @@ diff -urNp linux-2.6.32.39/fs/binfmt_aout.c linux-2.6.32.39/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.32.39/fs/binfmt_elf.c linux-2.6.32.39/fs/binfmt_elf.c
---- linux-2.6.32.39/fs/binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/binfmt_elf.c linux-2.6.32.40/fs/binfmt_elf.c
+--- linux-2.6.32.40/fs/binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
  #define elf_core_dump	NULL
  #endif
@@ -31566,9 +34826,9 @@ diff -urNp linux-2.6.32.39/fs/binfmt_elf.c linux-2.6.32.39/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-2.6.32.39/fs/binfmt_flat.c linux-2.6.32.39/fs/binfmt_flat.c
---- linux-2.6.32.39/fs/binfmt_flat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/binfmt_flat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/binfmt_flat.c linux-2.6.32.40/fs/binfmt_flat.c
+--- linux-2.6.32.40/fs/binfmt_flat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/binfmt_flat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
@@ -31601,9 +34861,9 @@ diff -urNp linux-2.6.32.39/fs/binfmt_flat.c linux-2.6.32.39/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-2.6.32.39/fs/bio.c linux-2.6.32.39/fs/bio.c
---- linux-2.6.32.39/fs/bio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/bio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/bio.c linux-2.6.32.40/fs/bio.c
+--- linux-2.6.32.40/fs/bio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/bio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
  
  	i = 0;
@@ -31622,9 +34882,9 @@ diff -urNp linux-2.6.32.39/fs/bio.c linux-2.6.32.39/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.32.39/fs/block_dev.c linux-2.6.32.39/fs/block_dev.c
---- linux-2.6.32.39/fs/block_dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/block_dev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/block_dev.c linux-2.6.32.40/fs/block_dev.c
+--- linux-2.6.32.40/fs/block_dev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/block_dev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 
  	else if (bdev->bd_contains == bdev)
  		res = 0;  	 /* is a whole device which isn't held */
@@ -31634,9 +34894,9 @@ diff -urNp linux-2.6.32.39/fs/block_dev.c linux-2.6.32.39/fs/block_dev.c
  		res = 0; 	 /* is a partition of a device that is being partitioned */
  	else if (bdev->bd_contains->bd_holder != NULL)
  		res = -EBUSY;	 /* is a partition of a held device */
-diff -urNp linux-2.6.32.39/fs/btrfs/ctree.c linux-2.6.32.39/fs/btrfs/ctree.c
---- linux-2.6.32.39/fs/btrfs/ctree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/ctree.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/ctree.c linux-2.6.32.40/fs/btrfs/ctree.c
+--- linux-2.6.32.40/fs/btrfs/ctree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/ctree.c	2011-04-17 15:56:46.000000000 -0400
 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
@@ -31661,9 +34921,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/ctree.c linux-2.6.32.39/fs/btrfs/ctree.c
  		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
  		ret = fixup_low_keys(trans, root, path, &disk_key, 1);
  	}
-diff -urNp linux-2.6.32.39/fs/btrfs/disk-io.c linux-2.6.32.39/fs/btrfs/disk-io.c
---- linux-2.6.32.39/fs/btrfs/disk-io.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/disk-io.c	2011-04-17 17:03:11.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/disk-io.c linux-2.6.32.40/fs/btrfs/disk-io.c
+--- linux-2.6.32.40/fs/btrfs/disk-io.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/disk-io.c	2011-04-17 17:03:11.000000000 -0400
 @@ -39,7 +39,7 @@
  #include "tree-log.h"
  #include "free-space-cache.h"
@@ -31682,9 +34942,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/disk-io.c linux-2.6.32.39/fs/btrfs/disk-io.c
  	.write_cache_pages_lock_hook = btree_lock_page_hook,
  	.readpage_end_io_hook = btree_readpage_end_io_hook,
  	.submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.32.39/fs/btrfs/extent_io.h linux-2.6.32.39/fs/btrfs/extent_io.h
---- linux-2.6.32.39/fs/btrfs/extent_io.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/extent_io.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/extent_io.h linux-2.6.32.40/fs/btrfs/extent_io.h
+--- linux-2.6.32.40/fs/btrfs/extent_io.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/extent_io.h	2011-04-17 15:56:46.000000000 -0400
 @@ -49,36 +49,36 @@ typedef	int (extent_submit_bio_hook_t)(s
  				       struct bio *bio, int mirror_num,
  				       unsigned long bio_flags);
@@ -31745,9 +35005,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/extent_io.h linux-2.6.32.39/fs/btrfs/extent_
  };
  
  struct extent_state {
-diff -urNp linux-2.6.32.39/fs/btrfs/free-space-cache.c linux-2.6.32.39/fs/btrfs/free-space-cache.c
---- linux-2.6.32.39/fs/btrfs/free-space-cache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/free-space-cache.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/free-space-cache.c linux-2.6.32.40/fs/btrfs/free-space-cache.c
+--- linux-2.6.32.40/fs/btrfs/free-space-cache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/free-space-cache.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
  
  	while(1) {
@@ -31766,9 +35026,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/free-space-cache.c linux-2.6.32.39/fs/btrfs/
  
  		if (entry->bitmap && entry->bytes > bytes + empty_size) {
  			ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.32.39/fs/btrfs/inode.c linux-2.6.32.39/fs/btrfs/inode.c
---- linux-2.6.32.39/fs/btrfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/inode.c linux-2.6.32.40/fs/btrfs/inode.c
+--- linux-2.6.32.40/fs/btrfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -63,7 +63,7 @@ static const struct inode_operations btr
  static const struct address_space_operations btrfs_aops;
  static const struct address_space_operations btrfs_symlink_aops;
@@ -31811,9 +35071,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/inode.c linux-2.6.32.39/fs/btrfs/inode.c
  	.fill_delalloc = run_delalloc_range,
  	.submit_bio_hook = btrfs_submit_bio_hook,
  	.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.32.39/fs/btrfs/relocation.c linux-2.6.32.39/fs/btrfs/relocation.c
---- linux-2.6.32.39/fs/btrfs/relocation.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/relocation.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/relocation.c linux-2.6.32.40/fs/btrfs/relocation.c
+--- linux-2.6.32.40/fs/btrfs/relocation.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/relocation.c	2011-04-17 15:56:46.000000000 -0400
 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
@@ -31823,9 +35083,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/relocation.c linux-2.6.32.39/fs/btrfs/reloca
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.32.39/fs/btrfs/sysfs.c linux-2.6.32.39/fs/btrfs/sysfs.c
---- linux-2.6.32.39/fs/btrfs/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/btrfs/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/btrfs/sysfs.c linux-2.6.32.40/fs/btrfs/sysfs.c
+--- linux-2.6.32.40/fs/btrfs/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/btrfs/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
  	complete(&root->kobj_unregister);
  }
@@ -31841,9 +35101,9 @@ diff -urNp linux-2.6.32.39/fs/btrfs/sysfs.c linux-2.6.32.39/fs/btrfs/sysfs.c
  	.show	= btrfs_root_attr_show,
  	.store	= btrfs_root_attr_store,
  };
-diff -urNp linux-2.6.32.39/fs/buffer.c linux-2.6.32.39/fs/buffer.c
---- linux-2.6.32.39/fs/buffer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/buffer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/buffer.c linux-2.6.32.40/fs/buffer.c
+--- linux-2.6.32.40/fs/buffer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/buffer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/percpu.h>
  #include <linux/slab.h>
@@ -31852,9 +35112,9 @@ diff -urNp linux-2.6.32.39/fs/buffer.c linux-2.6.32.39/fs/buffer.c
  #include <linux/blkdev.h>
  #include <linux/file.h>
  #include <linux/quotaops.h>
-diff -urNp linux-2.6.32.39/fs/cachefiles/bind.c linux-2.6.32.39/fs/cachefiles/bind.c
---- linux-2.6.32.39/fs/cachefiles/bind.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/cachefiles/bind.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/cachefiles/bind.c linux-2.6.32.40/fs/cachefiles/bind.c
+--- linux-2.6.32.40/fs/cachefiles/bind.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cachefiles/bind.c	2011-04-17 15:56:46.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -31871,9 +35131,9 @@ diff -urNp linux-2.6.32.39/fs/cachefiles/bind.c linux-2.6.32.39/fs/cachefiles/bi
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-2.6.32.39/fs/cachefiles/daemon.c linux-2.6.32.39/fs/cachefiles/daemon.c
---- linux-2.6.32.39/fs/cachefiles/daemon.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/cachefiles/daemon.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/cachefiles/daemon.c linux-2.6.32.40/fs/cachefiles/daemon.c
+--- linux-2.6.32.40/fs/cachefiles/daemon.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cachefiles/daemon.c	2011-04-17 15:56:46.000000000 -0400
 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
  	if (test_bit(CACHEFILES_DEAD, &cache->flags))
  		return -EIO;
@@ -31901,9 +35161,87 @@ diff -urNp linux-2.6.32.39/fs/cachefiles/daemon.c linux-2.6.32.39/fs/cachefiles/
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-2.6.32.39/fs/cachefiles/rdwr.c linux-2.6.32.39/fs/cachefiles/rdwr.c
---- linux-2.6.32.39/fs/cachefiles/rdwr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/cachefiles/rdwr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/cachefiles/internal.h linux-2.6.32.40/fs/cachefiles/internal.h
+--- linux-2.6.32.40/fs/cachefiles/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cachefiles/internal.h	2011-05-04 17:56:28.000000000 -0400
+@@ -56,7 +56,7 @@ struct cachefiles_cache {
+ 	wait_queue_head_t		daemon_pollwq;	/* poll waitqueue for daemon */
+ 	struct rb_root			active_nodes;	/* active nodes (can't be culled) */
+ 	rwlock_t			active_lock;	/* lock for active_nodes */
+-	atomic_t			gravecounter;	/* graveyard uniquifier */
++	atomic_unchecked_t		gravecounter;	/* graveyard uniquifier */
+ 	unsigned			frun_percent;	/* when to stop culling (% files) */
+ 	unsigned			fcull_percent;	/* when to start culling (% files) */
+ 	unsigned			fstop_percent;	/* when to stop allocating (% files) */
+@@ -168,19 +168,19 @@ extern int cachefiles_check_in_use(struc
+  * proc.c
+  */
+ #ifdef CONFIG_CACHEFILES_HISTOGRAM
+-extern atomic_t cachefiles_lookup_histogram[HZ];
+-extern atomic_t cachefiles_mkdir_histogram[HZ];
+-extern atomic_t cachefiles_create_histogram[HZ];
++extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
++extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
++extern atomic_unchecked_t cachefiles_create_histogram[HZ];
+ 
+ extern int __init cachefiles_proc_init(void);
+ extern void cachefiles_proc_cleanup(void);
+ static inline
+-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
++void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
+ {
+ 	unsigned long jif = jiffies - start_jif;
+ 	if (jif >= HZ)
+ 		jif = HZ - 1;
+-	atomic_inc(&histogram[jif]);
++	atomic_inc_unchecked(&histogram[jif]);
+ }
+ 
+ #else
+diff -urNp linux-2.6.32.40/fs/cachefiles/namei.c linux-2.6.32.40/fs/cachefiles/namei.c
+--- linux-2.6.32.40/fs/cachefiles/namei.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cachefiles/namei.c	2011-05-04 17:56:28.000000000 -0400
+@@ -250,7 +250,7 @@ try_again:
+ 	/* first step is to make up a grave dentry in the graveyard */
+ 	sprintf(nbuffer, "%08x%08x",
+ 		(uint32_t) get_seconds(),
+-		(uint32_t) atomic_inc_return(&cache->gravecounter));
++		(uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
+ 
+ 	/* do the multiway lock magic */
+ 	trap = lock_rename(cache->graveyard, dir);
+diff -urNp linux-2.6.32.40/fs/cachefiles/proc.c linux-2.6.32.40/fs/cachefiles/proc.c
+--- linux-2.6.32.40/fs/cachefiles/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cachefiles/proc.c	2011-05-04 17:56:28.000000000 -0400
+@@ -14,9 +14,9 @@
+ #include <linux/seq_file.h>
+ #include "internal.h"
+ 
+-atomic_t cachefiles_lookup_histogram[HZ];
+-atomic_t cachefiles_mkdir_histogram[HZ];
+-atomic_t cachefiles_create_histogram[HZ];
++atomic_unchecked_t cachefiles_lookup_histogram[HZ];
++atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
++atomic_unchecked_t cachefiles_create_histogram[HZ];
+ 
+ /*
+  * display the latency histogram
+@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(str
+ 		return 0;
+ 	default:
+ 		index = (unsigned long) v - 3;
+-		x = atomic_read(&cachefiles_lookup_histogram[index]);
+-		y = atomic_read(&cachefiles_mkdir_histogram[index]);
+-		z = atomic_read(&cachefiles_create_histogram[index]);
++		x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
++		y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
++		z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
+ 		if (x == 0 && y == 0 && z == 0)
+ 			return 0;
+ 
+diff -urNp linux-2.6.32.40/fs/cachefiles/rdwr.c linux-2.6.32.40/fs/cachefiles/rdwr.c
+--- linux-2.6.32.40/fs/cachefiles/rdwr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cachefiles/rdwr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -31913,9 +35251,182 @@ diff -urNp linux-2.6.32.39/fs/cachefiles/rdwr.c linux-2.6.32.39/fs/cachefiles/rd
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-2.6.32.39/fs/cifs/link.c linux-2.6.32.39/fs/cifs/link.c
---- linux-2.6.32.39/fs/cifs/link.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/cifs/link.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/cifs/cifs_debug.c linux-2.6.32.40/fs/cifs/cifs_debug.c
+--- linux-2.6.32.40/fs/cifs/cifs_debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cifs/cifs_debug.c	2011-05-04 17:56:28.000000000 -0400
+@@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(str
+ 					tcon = list_entry(tmp3,
+ 							  struct cifsTconInfo,
+ 							  tcon_list);
+-					atomic_set(&tcon->num_smbs_sent, 0);
+-					atomic_set(&tcon->num_writes, 0);
+-					atomic_set(&tcon->num_reads, 0);
+-					atomic_set(&tcon->num_oplock_brks, 0);
+-					atomic_set(&tcon->num_opens, 0);
+-					atomic_set(&tcon->num_posixopens, 0);
+-					atomic_set(&tcon->num_posixmkdirs, 0);
+-					atomic_set(&tcon->num_closes, 0);
+-					atomic_set(&tcon->num_deletes, 0);
+-					atomic_set(&tcon->num_mkdirs, 0);
+-					atomic_set(&tcon->num_rmdirs, 0);
+-					atomic_set(&tcon->num_renames, 0);
+-					atomic_set(&tcon->num_t2renames, 0);
+-					atomic_set(&tcon->num_ffirst, 0);
+-					atomic_set(&tcon->num_fnext, 0);
+-					atomic_set(&tcon->num_fclose, 0);
+-					atomic_set(&tcon->num_hardlinks, 0);
+-					atomic_set(&tcon->num_symlinks, 0);
+-					atomic_set(&tcon->num_locks, 0);
++					atomic_set_unchecked(&tcon->num_smbs_sent, 0);
++					atomic_set_unchecked(&tcon->num_writes, 0);
++					atomic_set_unchecked(&tcon->num_reads, 0);
++					atomic_set_unchecked(&tcon->num_oplock_brks, 0);
++					atomic_set_unchecked(&tcon->num_opens, 0);
++					atomic_set_unchecked(&tcon->num_posixopens, 0);
++					atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
++					atomic_set_unchecked(&tcon->num_closes, 0);
++					atomic_set_unchecked(&tcon->num_deletes, 0);
++					atomic_set_unchecked(&tcon->num_mkdirs, 0);
++					atomic_set_unchecked(&tcon->num_rmdirs, 0);
++					atomic_set_unchecked(&tcon->num_renames, 0);
++					atomic_set_unchecked(&tcon->num_t2renames, 0);
++					atomic_set_unchecked(&tcon->num_ffirst, 0);
++					atomic_set_unchecked(&tcon->num_fnext, 0);
++					atomic_set_unchecked(&tcon->num_fclose, 0);
++					atomic_set_unchecked(&tcon->num_hardlinks, 0);
++					atomic_set_unchecked(&tcon->num_symlinks, 0);
++					atomic_set_unchecked(&tcon->num_locks, 0);
+ 				}
+ 			}
+ 		}
+@@ -334,41 +334,41 @@ static int cifs_stats_proc_show(struct s
+ 				if (tcon->need_reconnect)
+ 					seq_puts(m, "\tDISCONNECTED ");
+ 				seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
+-					atomic_read(&tcon->num_smbs_sent),
+-					atomic_read(&tcon->num_oplock_brks));
++					atomic_read_unchecked(&tcon->num_smbs_sent),
++					atomic_read_unchecked(&tcon->num_oplock_brks));
+ 				seq_printf(m, "\nReads:  %d Bytes: %lld",
+-					atomic_read(&tcon->num_reads),
++					atomic_read_unchecked(&tcon->num_reads),
+ 					(long long)(tcon->bytes_read));
+ 				seq_printf(m, "\nWrites: %d Bytes: %lld",
+-					atomic_read(&tcon->num_writes),
++					atomic_read_unchecked(&tcon->num_writes),
+ 					(long long)(tcon->bytes_written));
+ 				seq_printf(m, "\nFlushes: %d",
+-					atomic_read(&tcon->num_flushes));
++					atomic_read_unchecked(&tcon->num_flushes));
+ 				seq_printf(m, "\nLocks: %d HardLinks: %d "
+ 					      "Symlinks: %d",
+-					atomic_read(&tcon->num_locks),
+-					atomic_read(&tcon->num_hardlinks),
+-					atomic_read(&tcon->num_symlinks));
++					atomic_read_unchecked(&tcon->num_locks),
++					atomic_read_unchecked(&tcon->num_hardlinks),
++					atomic_read_unchecked(&tcon->num_symlinks));
+ 				seq_printf(m, "\nOpens: %d Closes: %d "
+ 					      "Deletes: %d",
+-					atomic_read(&tcon->num_opens),
+-					atomic_read(&tcon->num_closes),
+-					atomic_read(&tcon->num_deletes));
++					atomic_read_unchecked(&tcon->num_opens),
++					atomic_read_unchecked(&tcon->num_closes),
++					atomic_read_unchecked(&tcon->num_deletes));
+ 				seq_printf(m, "\nPosix Opens: %d "
+ 					      "Posix Mkdirs: %d",
+-					atomic_read(&tcon->num_posixopens),
+-					atomic_read(&tcon->num_posixmkdirs));
++					atomic_read_unchecked(&tcon->num_posixopens),
++					atomic_read_unchecked(&tcon->num_posixmkdirs));
+ 				seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
+-					atomic_read(&tcon->num_mkdirs),
+-					atomic_read(&tcon->num_rmdirs));
++					atomic_read_unchecked(&tcon->num_mkdirs),
++					atomic_read_unchecked(&tcon->num_rmdirs));
+ 				seq_printf(m, "\nRenames: %d T2 Renames %d",
+-					atomic_read(&tcon->num_renames),
+-					atomic_read(&tcon->num_t2renames));
++					atomic_read_unchecked(&tcon->num_renames),
++					atomic_read_unchecked(&tcon->num_t2renames));
+ 				seq_printf(m, "\nFindFirst: %d FNext %d "
+ 					      "FClose %d",
+-					atomic_read(&tcon->num_ffirst),
+-					atomic_read(&tcon->num_fnext),
+-					atomic_read(&tcon->num_fclose));
++					atomic_read_unchecked(&tcon->num_ffirst),
++					atomic_read_unchecked(&tcon->num_fnext),
++					atomic_read_unchecked(&tcon->num_fclose));
+ 			}
+ 		}
+ 	}
+diff -urNp linux-2.6.32.40/fs/cifs/cifsglob.h linux-2.6.32.40/fs/cifs/cifsglob.h
+--- linux-2.6.32.40/fs/cifs/cifsglob.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cifs/cifsglob.h	2011-05-04 17:56:28.000000000 -0400
+@@ -252,28 +252,28 @@ struct cifsTconInfo {
+ 	__u16 Flags;		/* optional support bits */
+ 	enum statusEnum tidStatus;
+ #ifdef CONFIG_CIFS_STATS
+-	atomic_t num_smbs_sent;
+-	atomic_t num_writes;
+-	atomic_t num_reads;
+-	atomic_t num_flushes;
+-	atomic_t num_oplock_brks;
+-	atomic_t num_opens;
+-	atomic_t num_closes;
+-	atomic_t num_deletes;
+-	atomic_t num_mkdirs;
+-	atomic_t num_posixopens;
+-	atomic_t num_posixmkdirs;
+-	atomic_t num_rmdirs;
+-	atomic_t num_renames;
+-	atomic_t num_t2renames;
+-	atomic_t num_ffirst;
+-	atomic_t num_fnext;
+-	atomic_t num_fclose;
+-	atomic_t num_hardlinks;
+-	atomic_t num_symlinks;
+-	atomic_t num_locks;
+-	atomic_t num_acl_get;
+-	atomic_t num_acl_set;
++	atomic_unchecked_t num_smbs_sent;
++	atomic_unchecked_t num_writes;
++	atomic_unchecked_t num_reads;
++	atomic_unchecked_t num_flushes;
++	atomic_unchecked_t num_oplock_brks;
++	atomic_unchecked_t num_opens;
++	atomic_unchecked_t num_closes;
++	atomic_unchecked_t num_deletes;
++	atomic_unchecked_t num_mkdirs;
++	atomic_unchecked_t num_posixopens;
++	atomic_unchecked_t num_posixmkdirs;
++	atomic_unchecked_t num_rmdirs;
++	atomic_unchecked_t num_renames;
++	atomic_unchecked_t num_t2renames;
++	atomic_unchecked_t num_ffirst;
++	atomic_unchecked_t num_fnext;
++	atomic_unchecked_t num_fclose;
++	atomic_unchecked_t num_hardlinks;
++	atomic_unchecked_t num_symlinks;
++	atomic_unchecked_t num_locks;
++	atomic_unchecked_t num_acl_get;
++	atomic_unchecked_t num_acl_set;
+ #ifdef CONFIG_CIFS_STATS2
+ 	unsigned long long time_writes;
+ 	unsigned long long time_reads;
+@@ -414,7 +414,7 @@ static inline char CIFS_DIR_SEP(const st
+ }
+ 
+ #ifdef CONFIG_CIFS_STATS
+-#define cifs_stats_inc atomic_inc
++#define cifs_stats_inc atomic_inc_unchecked
+ 
+ static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
+ 					    unsigned int bytes)
+diff -urNp linux-2.6.32.40/fs/cifs/link.c linux-2.6.32.40/fs/cifs/link.c
+--- linux-2.6.32.40/fs/cifs/link.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/cifs/link.c	2011-04-17 15:56:46.000000000 -0400
 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -31925,9 +35436,54 @@ diff -urNp linux-2.6.32.39/fs/cifs/link.c linux-2.6.32.39/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-2.6.32.39/fs/compat_binfmt_elf.c linux-2.6.32.39/fs/compat_binfmt_elf.c
---- linux-2.6.32.39/fs/compat_binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/compat_binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/coda/cache.c linux-2.6.32.40/fs/coda/cache.c
+--- linux-2.6.32.40/fs/coda/cache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/coda/cache.c	2011-05-04 17:56:28.000000000 -0400
+@@ -24,14 +24,14 @@
+ #include <linux/coda_fs_i.h>
+ #include <linux/coda_cache.h>
+ 
+-static atomic_t permission_epoch = ATOMIC_INIT(0);
++static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
+ 
+ /* replace or extend an acl cache hit */
+ void coda_cache_enter(struct inode *inode, int mask)
+ {
+ 	struct coda_inode_info *cii = ITOC(inode);
+ 
+-	cii->c_cached_epoch = atomic_read(&permission_epoch);
++	cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
+ 	if (cii->c_uid != current_fsuid()) {
+ 		cii->c_uid = current_fsuid();
+                 cii->c_cached_perm = mask;
+@@ -43,13 +43,13 @@ void coda_cache_enter(struct inode *inod
+ void coda_cache_clear_inode(struct inode *inode)
+ {
+ 	struct coda_inode_info *cii = ITOC(inode);
+-	cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
++	cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
+ }
+ 
+ /* remove all acl caches */
+ void coda_cache_clear_all(struct super_block *sb)
+ {
+-	atomic_inc(&permission_epoch);
++	atomic_inc_unchecked(&permission_epoch);
+ }
+ 
+ 
+@@ -61,7 +61,7 @@ int coda_cache_check(struct inode *inode
+ 	
+         hit = (mask & cii->c_cached_perm) == mask &&
+ 		cii->c_uid == current_fsuid() &&
+-		cii->c_cached_epoch == atomic_read(&permission_epoch);
++		cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
+ 
+         return hit;
+ }
+diff -urNp linux-2.6.32.40/fs/compat_binfmt_elf.c linux-2.6.32.40/fs/compat_binfmt_elf.c
+--- linux-2.6.32.40/fs/compat_binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/compat_binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,10 +29,12 @@
  #undef	elfhdr
  #undef	elf_phdr
@@ -31941,9 +35497,9 @@ diff -urNp linux-2.6.32.39/fs/compat_binfmt_elf.c linux-2.6.32.39/fs/compat_binf
  #define elf_addr_t	Elf32_Addr
  
  /*
-diff -urNp linux-2.6.32.39/fs/compat.c linux-2.6.32.39/fs/compat.c
---- linux-2.6.32.39/fs/compat.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/fs/compat.c	2011-04-23 13:29:24.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/compat.c linux-2.6.32.40/fs/compat.c
+--- linux-2.6.32.40/fs/compat.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/fs/compat.c	2011-04-23 13:29:24.000000000 -0400
 @@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
  
  struct compat_readdir_callback {
@@ -32123,9 +35679,9 @@ diff -urNp linux-2.6.32.39/fs/compat.c linux-2.6.32.39/fs/compat.c
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-diff -urNp linux-2.6.32.39/fs/compat_ioctl.c linux-2.6.32.39/fs/compat_ioctl.c
---- linux-2.6.32.39/fs/compat_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/compat_ioctl.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/compat_ioctl.c linux-2.6.32.40/fs/compat_ioctl.c
+--- linux-2.6.32.40/fs/compat_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/compat_ioctl.c	2011-04-23 12:56:11.000000000 -0400
 @@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
  	up = (struct compat_video_spu_palette __user *) arg;
  	err  = get_user(palp, &up->palette);
@@ -32135,9 +35691,36 @@ diff -urNp linux-2.6.32.39/fs/compat_ioctl.c linux-2.6.32.39/fs/compat_ioctl.c
  
  	up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
  	err  = put_user(compat_ptr(palp), &up_native->palette);
-diff -urNp linux-2.6.32.39/fs/dcache.c linux-2.6.32.39/fs/dcache.c
---- linux-2.6.32.39/fs/dcache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/dcache.c	2011-04-23 13:32:21.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/configfs/dir.c linux-2.6.32.40/fs/configfs/dir.c
+--- linux-2.6.32.40/fs/configfs/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/configfs/dir.c	2011-05-11 18:25:15.000000000 -0400
+@@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file 
+ 			}
+ 			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
+ 				struct configfs_dirent *next;
+-				const char * name;
++				const unsigned char * name;
++				char d_name[sizeof(next->s_dentry->d_iname)];
+ 				int len;
+ 
+ 				next = list_entry(p, struct configfs_dirent,
+@@ -1581,7 +1582,12 @@ static int configfs_readdir(struct file 
+ 					continue;
+ 
+ 				name = configfs_get_name(next);
+-				len = strlen(name);
++				if (next->s_dentry && name == next->s_dentry->d_iname) {
++					len =  next->s_dentry->d_name.len;
++					memcpy(d_name, name, len);
++					name = d_name;
++				} else
++					len = strlen(name);
+ 				if (next->s_dentry)
+ 					ino = next->s_dentry->d_inode->i_ino;
+ 				else
+diff -urNp linux-2.6.32.40/fs/dcache.c linux-2.6.32.40/fs/dcache.c
+--- linux-2.6.32.40/fs/dcache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/dcache.c	2011-04-23 13:32:21.000000000 -0400
 @@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock);
  
  static struct kmem_cache *dentry_cache __read_mostly;
@@ -32156,9 +35739,9 @@ diff -urNp linux-2.6.32.39/fs/dcache.c linux-2.6.32.39/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-2.6.32.39/fs/dlm/lockspace.c linux-2.6.32.39/fs/dlm/lockspace.c
---- linux-2.6.32.39/fs/dlm/lockspace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/dlm/lockspace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/dlm/lockspace.c linux-2.6.32.40/fs/dlm/lockspace.c
+--- linux-2.6.32.40/fs/dlm/lockspace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/dlm/lockspace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
  	kfree(ls);
  }
@@ -32168,9 +35751,9 @@ diff -urNp linux-2.6.32.39/fs/dlm/lockspace.c linux-2.6.32.39/fs/dlm/lockspace.c
  	.show  = dlm_attr_show,
  	.store = dlm_attr_store,
  };
-diff -urNp linux-2.6.32.39/fs/ecryptfs/inode.c linux-2.6.32.39/fs/ecryptfs/inode.c
---- linux-2.6.32.39/fs/ecryptfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ecryptfs/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ecryptfs/inode.c linux-2.6.32.40/fs/ecryptfs/inode.c
+--- linux-2.6.32.40/fs/ecryptfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ecryptfs/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -32189,9 +35772,9 @@ diff -urNp linux-2.6.32.39/fs/ecryptfs/inode.c linux-2.6.32.39/fs/ecryptfs/inode
  	set_fs(old_fs);
  	if (rc < 0)
  		goto out_free;
-diff -urNp linux-2.6.32.39/fs/exec.c linux-2.6.32.39/fs/exec.c
---- linux-2.6.32.39/fs/exec.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/fs/exec.c	2011-04-23 13:35:12.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/exec.c linux-2.6.32.40/fs/exec.c
+--- linux-2.6.32.40/fs/exec.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/fs/exec.c	2011-05-04 17:56:20.000000000 -0400
 @@ -56,12 +56,24 @@
  #include <linux/fsnotify.h>
  #include <linux/fs_struct.h>
@@ -32715,7 +36298,12 @@ diff -urNp linux-2.6.32.39/fs/exec.c linux-2.6.32.39/fs/exec.c
  	pipe_unlock(pipe);
  
  }
-@@ -1833,6 +2126,9 @@ void do_coredump(long signr, int exit_co
+@@ -1829,10 +2122,13 @@ void do_coredump(long signr, int exit_co
+ 	char **helper_argv = NULL;
+ 	int helper_argc = 0;
+ 	int dump_count = 0;
+-	static atomic_t core_dump_count = ATOMIC_INIT(0);
++	static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
  
  	audit_core_dumps(signr);
  
@@ -32734,9 +36322,27 @@ diff -urNp linux-2.6.32.39/fs/exec.c linux-2.6.32.39/fs/exec.c
  	/*
  	 * lock_kernel() because format_corename() is controlled by sysctl, which
  	 * uses lock_kernel()
-diff -urNp linux-2.6.32.39/fs/ext2/balloc.c linux-2.6.32.39/fs/ext2/balloc.c
---- linux-2.6.32.39/fs/ext2/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ext2/balloc.c	2011-04-17 15:56:46.000000000 -0400
+@@ -1911,7 +2209,7 @@ void do_coredump(long signr, int exit_co
+ 			goto fail_unlock;
+ 		}
+ 
+-		dump_count = atomic_inc_return(&core_dump_count);
++		dump_count = atomic_inc_return_unchecked(&core_dump_count);
+ 		if (core_pipe_limit && (core_pipe_limit < dump_count)) {
+ 			printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
+ 			       task_tgid_vnr(current), current->comm);
+@@ -1975,7 +2273,7 @@ close_fail:
+ 	filp_close(file, NULL);
+ fail_dropcount:
+ 	if (dump_count)
+-		atomic_dec(&core_dump_count);
++		atomic_dec_unchecked(&core_dump_count);
+ fail_unlock:
+ 	if (helper_argv)
+ 		argv_free(helper_argv);
+diff -urNp linux-2.6.32.40/fs/ext2/balloc.c linux-2.6.32.40/fs/ext2/balloc.c
+--- linux-2.6.32.40/fs/ext2/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ext2/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -32746,9 +36352,9 @@ diff -urNp linux-2.6.32.39/fs/ext2/balloc.c linux-2.6.32.39/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.32.39/fs/ext3/balloc.c linux-2.6.32.39/fs/ext3/balloc.c
---- linux-2.6.32.39/fs/ext3/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ext3/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ext3/balloc.c linux-2.6.32.40/fs/ext3/balloc.c
+--- linux-2.6.32.40/fs/ext3/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ext3/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -32758,9 +36364,9 @@ diff -urNp linux-2.6.32.39/fs/ext3/balloc.c linux-2.6.32.39/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.32.39/fs/ext4/balloc.c linux-2.6.32.39/fs/ext4/balloc.c
---- linux-2.6.32.39/fs/ext4/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ext4/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ext4/balloc.c linux-2.6.32.40/fs/ext4/balloc.c
+--- linux-2.6.32.40/fs/ext4/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ext4/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
  	/* Hm, nope.  Are (enough) root reserved blocks available? */
  	if (sbi->s_resuid == current_fsuid() ||
@@ -32770,9 +36376,9 @@ diff -urNp linux-2.6.32.39/fs/ext4/balloc.c linux-2.6.32.39/fs/ext4/balloc.c
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
  	}
-diff -urNp linux-2.6.32.39/fs/ext4/ext4.h linux-2.6.32.39/fs/ext4/ext4.h
---- linux-2.6.32.39/fs/ext4/ext4.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ext4/ext4.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ext4/ext4.h linux-2.6.32.40/fs/ext4/ext4.h
+--- linux-2.6.32.40/fs/ext4/ext4.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ext4/ext4.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1078,19 +1078,19 @@ struct ext4_sb_info {
  
  	/* stats for buddy allocator */
@@ -32803,9 +36409,9 @@ diff -urNp linux-2.6.32.39/fs/ext4/ext4.h linux-2.6.32.39/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-2.6.32.39/fs/ext4/mballoc.c linux-2.6.32.39/fs/ext4/mballoc.c
---- linux-2.6.32.39/fs/ext4/mballoc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ext4/mballoc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ext4/mballoc.c linux-2.6.32.40/fs/ext4/mballoc.c
+--- linux-2.6.32.40/fs/ext4/mballoc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ext4/mballoc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1753,7 +1753,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
@@ -32919,9 +36525,9 @@ diff -urNp linux-2.6.32.39/fs/ext4/mballoc.c linux-2.6.32.39/fs/ext4/mballoc.c
  
  	if (ac) {
  		ac->ac_sb = sb;
-diff -urNp linux-2.6.32.39/fs/ext4/super.c linux-2.6.32.39/fs/ext4/super.c
---- linux-2.6.32.39/fs/ext4/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ext4/super.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ext4/super.c linux-2.6.32.40/fs/ext4/super.c
+--- linux-2.6.32.40/fs/ext4/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ext4/super.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
  }
  
@@ -32931,9 +36537,9 @@ diff -urNp linux-2.6.32.39/fs/ext4/super.c linux-2.6.32.39/fs/ext4/super.c
  	.show	= ext4_attr_show,
  	.store	= ext4_attr_store,
  };
-diff -urNp linux-2.6.32.39/fs/fcntl.c linux-2.6.32.39/fs/fcntl.c
---- linux-2.6.32.39/fs/fcntl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fcntl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fcntl.c linux-2.6.32.40/fs/fcntl.c
+--- linux-2.6.32.40/fs/fcntl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fcntl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -32954,9 +36560,9 @@ diff -urNp linux-2.6.32.39/fs/fcntl.c linux-2.6.32.39/fs/fcntl.c
  		if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
  			break;
  		err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-diff -urNp linux-2.6.32.39/fs/fifo.c linux-2.6.32.39/fs/fifo.c
---- linux-2.6.32.39/fs/fifo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fifo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fifo.c linux-2.6.32.40/fs/fifo.c
+--- linux-2.6.32.40/fs/fifo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fifo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
@@ -33027,9 +36633,9 @@ diff -urNp linux-2.6.32.39/fs/fifo.c linux-2.6.32.39/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.32.39/fs/file.c linux-2.6.32.39/fs/file.c
---- linux-2.6.32.39/fs/file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/file.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/file.c linux-2.6.32.40/fs/file.c
+--- linux-2.6.32.40/fs/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/file.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -33047,9 +36653,9 @@ diff -urNp linux-2.6.32.39/fs/file.c linux-2.6.32.39/fs/file.c
  	if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
  		return -EMFILE;
  
-diff -urNp linux-2.6.32.39/fs/filesystems.c linux-2.6.32.39/fs/filesystems.c
---- linux-2.6.32.39/fs/filesystems.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/filesystems.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/filesystems.c linux-2.6.32.40/fs/filesystems.c
+--- linux-2.6.32.40/fs/filesystems.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/filesystems.c	2011-04-17 15:56:46.000000000 -0400
 @@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
@@ -33063,9 +36669,1332 @@ diff -urNp linux-2.6.32.39/fs/filesystems.c linux-2.6.32.39/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-2.6.32.39/fs/fs_struct.c linux-2.6.32.39/fs/fs_struct.c
---- linux-2.6.32.39/fs/fs_struct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fs_struct.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fscache/cookie.c linux-2.6.32.40/fs/fscache/cookie.c
+--- linux-2.6.32.40/fs/fscache/cookie.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fscache/cookie.c	2011-05-04 17:56:28.000000000 -0400
+@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
+ 	       parent ? (char *) parent->def->name : "<no-parent>",
+ 	       def->name, netfs_data);
+ 
+-	fscache_stat(&fscache_n_acquires);
++	fscache_stat_unchecked(&fscache_n_acquires);
+ 
+ 	/* if there's no parent cookie, then we don't create one here either */
+ 	if (!parent) {
+-		fscache_stat(&fscache_n_acquires_null);
++		fscache_stat_unchecked(&fscache_n_acquires_null);
+ 		_leave(" [no parent]");
+ 		return NULL;
+ 	}
+@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire
+ 	/* allocate and initialise a cookie */
+ 	cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
+ 	if (!cookie) {
+-		fscache_stat(&fscache_n_acquires_oom);
++		fscache_stat_unchecked(&fscache_n_acquires_oom);
+ 		_leave(" [ENOMEM]");
+ 		return NULL;
+ 	}
+@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire
+ 
+ 	switch (cookie->def->type) {
+ 	case FSCACHE_COOKIE_TYPE_INDEX:
+-		fscache_stat(&fscache_n_cookie_index);
++		fscache_stat_unchecked(&fscache_n_cookie_index);
+ 		break;
+ 	case FSCACHE_COOKIE_TYPE_DATAFILE:
+-		fscache_stat(&fscache_n_cookie_data);
++		fscache_stat_unchecked(&fscache_n_cookie_data);
+ 		break;
+ 	default:
+-		fscache_stat(&fscache_n_cookie_special);
++		fscache_stat_unchecked(&fscache_n_cookie_special);
+ 		break;
+ 	}
+ 
+@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire
+ 		if (fscache_acquire_non_index_cookie(cookie) < 0) {
+ 			atomic_dec(&parent->n_children);
+ 			__fscache_cookie_put(cookie);
+-			fscache_stat(&fscache_n_acquires_nobufs);
++			fscache_stat_unchecked(&fscache_n_acquires_nobufs);
+ 			_leave(" = NULL");
+ 			return NULL;
+ 		}
+ 	}
+ 
+-	fscache_stat(&fscache_n_acquires_ok);
++	fscache_stat_unchecked(&fscache_n_acquires_ok);
+ 	_leave(" = %p", cookie);
+ 	return cookie;
+ }
+@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_coo
+ 	cache = fscache_select_cache_for_object(cookie->parent);
+ 	if (!cache) {
+ 		up_read(&fscache_addremove_sem);
+-		fscache_stat(&fscache_n_acquires_no_cache);
++		fscache_stat_unchecked(&fscache_n_acquires_no_cache);
+ 		_leave(" = -ENOMEDIUM [no cache]");
+ 		return -ENOMEDIUM;
+ 	}
+@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct f
+ 	object = cache->ops->alloc_object(cache, cookie);
+ 	fscache_stat_d(&fscache_n_cop_alloc_object);
+ 	if (IS_ERR(object)) {
+-		fscache_stat(&fscache_n_object_no_alloc);
++		fscache_stat_unchecked(&fscache_n_object_no_alloc);
+ 		ret = PTR_ERR(object);
+ 		goto error;
+ 	}
+ 
+-	fscache_stat(&fscache_n_object_alloc);
++	fscache_stat_unchecked(&fscache_n_object_alloc);
+ 
+ 	object->debug_id = atomic_inc_return(&fscache_object_debug_id);
+ 
+@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fsca
+ 	struct fscache_object *object;
+ 	struct hlist_node *_p;
+ 
+-	fscache_stat(&fscache_n_updates);
++	fscache_stat_unchecked(&fscache_n_updates);
+ 
+ 	if (!cookie) {
+-		fscache_stat(&fscache_n_updates_null);
++		fscache_stat_unchecked(&fscache_n_updates_null);
+ 		_leave(" [no cookie]");
+ 		return;
+ 	}
+@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct 
+ 	struct fscache_object *object;
+ 	unsigned long event;
+ 
+-	fscache_stat(&fscache_n_relinquishes);
++	fscache_stat_unchecked(&fscache_n_relinquishes);
+ 	if (retire)
+-		fscache_stat(&fscache_n_relinquishes_retire);
++		fscache_stat_unchecked(&fscache_n_relinquishes_retire);
+ 
+ 	if (!cookie) {
+-		fscache_stat(&fscache_n_relinquishes_null);
++		fscache_stat_unchecked(&fscache_n_relinquishes_null);
+ 		_leave(" [no cookie]");
+ 		return;
+ 	}
+@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct 
+ 
+ 	/* wait for the cookie to finish being instantiated (or to fail) */
+ 	if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
+-		fscache_stat(&fscache_n_relinquishes_waitcrt);
++		fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
+ 		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
+ 			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
+ 	}
+diff -urNp linux-2.6.32.40/fs/fscache/internal.h linux-2.6.32.40/fs/fscache/internal.h
+--- linux-2.6.32.40/fs/fscache/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fscache/internal.h	2011-05-04 17:56:28.000000000 -0400
+@@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void);
+ extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
+ extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
+ 
+-extern atomic_t fscache_n_op_pend;
+-extern atomic_t fscache_n_op_run;
+-extern atomic_t fscache_n_op_enqueue;
+-extern atomic_t fscache_n_op_deferred_release;
+-extern atomic_t fscache_n_op_release;
+-extern atomic_t fscache_n_op_gc;
+-extern atomic_t fscache_n_op_cancelled;
+-extern atomic_t fscache_n_op_rejected;
+-
+-extern atomic_t fscache_n_attr_changed;
+-extern atomic_t fscache_n_attr_changed_ok;
+-extern atomic_t fscache_n_attr_changed_nobufs;
+-extern atomic_t fscache_n_attr_changed_nomem;
+-extern atomic_t fscache_n_attr_changed_calls;
+-
+-extern atomic_t fscache_n_allocs;
+-extern atomic_t fscache_n_allocs_ok;
+-extern atomic_t fscache_n_allocs_wait;
+-extern atomic_t fscache_n_allocs_nobufs;
+-extern atomic_t fscache_n_allocs_intr;
+-extern atomic_t fscache_n_allocs_object_dead;
+-extern atomic_t fscache_n_alloc_ops;
+-extern atomic_t fscache_n_alloc_op_waits;
+-
+-extern atomic_t fscache_n_retrievals;
+-extern atomic_t fscache_n_retrievals_ok;
+-extern atomic_t fscache_n_retrievals_wait;
+-extern atomic_t fscache_n_retrievals_nodata;
+-extern atomic_t fscache_n_retrievals_nobufs;
+-extern atomic_t fscache_n_retrievals_intr;
+-extern atomic_t fscache_n_retrievals_nomem;
+-extern atomic_t fscache_n_retrievals_object_dead;
+-extern atomic_t fscache_n_retrieval_ops;
+-extern atomic_t fscache_n_retrieval_op_waits;
+-
+-extern atomic_t fscache_n_stores;
+-extern atomic_t fscache_n_stores_ok;
+-extern atomic_t fscache_n_stores_again;
+-extern atomic_t fscache_n_stores_nobufs;
+-extern atomic_t fscache_n_stores_oom;
+-extern atomic_t fscache_n_store_ops;
+-extern atomic_t fscache_n_store_calls;
+-extern atomic_t fscache_n_store_pages;
+-extern atomic_t fscache_n_store_radix_deletes;
+-extern atomic_t fscache_n_store_pages_over_limit;
+-
+-extern atomic_t fscache_n_store_vmscan_not_storing;
+-extern atomic_t fscache_n_store_vmscan_gone;
+-extern atomic_t fscache_n_store_vmscan_busy;
+-extern atomic_t fscache_n_store_vmscan_cancelled;
+-
+-extern atomic_t fscache_n_marks;
+-extern atomic_t fscache_n_uncaches;
+-
+-extern atomic_t fscache_n_acquires;
+-extern atomic_t fscache_n_acquires_null;
+-extern atomic_t fscache_n_acquires_no_cache;
+-extern atomic_t fscache_n_acquires_ok;
+-extern atomic_t fscache_n_acquires_nobufs;
+-extern atomic_t fscache_n_acquires_oom;
+-
+-extern atomic_t fscache_n_updates;
+-extern atomic_t fscache_n_updates_null;
+-extern atomic_t fscache_n_updates_run;
+-
+-extern atomic_t fscache_n_relinquishes;
+-extern atomic_t fscache_n_relinquishes_null;
+-extern atomic_t fscache_n_relinquishes_waitcrt;
+-extern atomic_t fscache_n_relinquishes_retire;
+-
+-extern atomic_t fscache_n_cookie_index;
+-extern atomic_t fscache_n_cookie_data;
+-extern atomic_t fscache_n_cookie_special;
+-
+-extern atomic_t fscache_n_object_alloc;
+-extern atomic_t fscache_n_object_no_alloc;
+-extern atomic_t fscache_n_object_lookups;
+-extern atomic_t fscache_n_object_lookups_negative;
+-extern atomic_t fscache_n_object_lookups_positive;
+-extern atomic_t fscache_n_object_lookups_timed_out;
+-extern atomic_t fscache_n_object_created;
+-extern atomic_t fscache_n_object_avail;
+-extern atomic_t fscache_n_object_dead;
+-
+-extern atomic_t fscache_n_checkaux_none;
+-extern atomic_t fscache_n_checkaux_okay;
+-extern atomic_t fscache_n_checkaux_update;
+-extern atomic_t fscache_n_checkaux_obsolete;
++extern atomic_unchecked_t fscache_n_op_pend;
++extern atomic_unchecked_t fscache_n_op_run;
++extern atomic_unchecked_t fscache_n_op_enqueue;
++extern atomic_unchecked_t fscache_n_op_deferred_release;
++extern atomic_unchecked_t fscache_n_op_release;
++extern atomic_unchecked_t fscache_n_op_gc;
++extern atomic_unchecked_t fscache_n_op_cancelled;
++extern atomic_unchecked_t fscache_n_op_rejected;
++
++extern atomic_unchecked_t fscache_n_attr_changed;
++extern atomic_unchecked_t fscache_n_attr_changed_ok;
++extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
++extern atomic_unchecked_t fscache_n_attr_changed_nomem;
++extern atomic_unchecked_t fscache_n_attr_changed_calls;
++
++extern atomic_unchecked_t fscache_n_allocs;
++extern atomic_unchecked_t fscache_n_allocs_ok;
++extern atomic_unchecked_t fscache_n_allocs_wait;
++extern atomic_unchecked_t fscache_n_allocs_nobufs;
++extern atomic_unchecked_t fscache_n_allocs_intr;
++extern atomic_unchecked_t fscache_n_allocs_object_dead;
++extern atomic_unchecked_t fscache_n_alloc_ops;
++extern atomic_unchecked_t fscache_n_alloc_op_waits;
++
++extern atomic_unchecked_t fscache_n_retrievals;
++extern atomic_unchecked_t fscache_n_retrievals_ok;
++extern atomic_unchecked_t fscache_n_retrievals_wait;
++extern atomic_unchecked_t fscache_n_retrievals_nodata;
++extern atomic_unchecked_t fscache_n_retrievals_nobufs;
++extern atomic_unchecked_t fscache_n_retrievals_intr;
++extern atomic_unchecked_t fscache_n_retrievals_nomem;
++extern atomic_unchecked_t fscache_n_retrievals_object_dead;
++extern atomic_unchecked_t fscache_n_retrieval_ops;
++extern atomic_unchecked_t fscache_n_retrieval_op_waits;
++
++extern atomic_unchecked_t fscache_n_stores;
++extern atomic_unchecked_t fscache_n_stores_ok;
++extern atomic_unchecked_t fscache_n_stores_again;
++extern atomic_unchecked_t fscache_n_stores_nobufs;
++extern atomic_unchecked_t fscache_n_stores_oom;
++extern atomic_unchecked_t fscache_n_store_ops;
++extern atomic_unchecked_t fscache_n_store_calls;
++extern atomic_unchecked_t fscache_n_store_pages;
++extern atomic_unchecked_t fscache_n_store_radix_deletes;
++extern atomic_unchecked_t fscache_n_store_pages_over_limit;
++
++extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
++extern atomic_unchecked_t fscache_n_store_vmscan_gone;
++extern atomic_unchecked_t fscache_n_store_vmscan_busy;
++extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
++
++extern atomic_unchecked_t fscache_n_marks;
++extern atomic_unchecked_t fscache_n_uncaches;
++
++extern atomic_unchecked_t fscache_n_acquires;
++extern atomic_unchecked_t fscache_n_acquires_null;
++extern atomic_unchecked_t fscache_n_acquires_no_cache;
++extern atomic_unchecked_t fscache_n_acquires_ok;
++extern atomic_unchecked_t fscache_n_acquires_nobufs;
++extern atomic_unchecked_t fscache_n_acquires_oom;
++
++extern atomic_unchecked_t fscache_n_updates;
++extern atomic_unchecked_t fscache_n_updates_null;
++extern atomic_unchecked_t fscache_n_updates_run;
++
++extern atomic_unchecked_t fscache_n_relinquishes;
++extern atomic_unchecked_t fscache_n_relinquishes_null;
++extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
++extern atomic_unchecked_t fscache_n_relinquishes_retire;
++
++extern atomic_unchecked_t fscache_n_cookie_index;
++extern atomic_unchecked_t fscache_n_cookie_data;
++extern atomic_unchecked_t fscache_n_cookie_special;
++
++extern atomic_unchecked_t fscache_n_object_alloc;
++extern atomic_unchecked_t fscache_n_object_no_alloc;
++extern atomic_unchecked_t fscache_n_object_lookups;
++extern atomic_unchecked_t fscache_n_object_lookups_negative;
++extern atomic_unchecked_t fscache_n_object_lookups_positive;
++extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
++extern atomic_unchecked_t fscache_n_object_created;
++extern atomic_unchecked_t fscache_n_object_avail;
++extern atomic_unchecked_t fscache_n_object_dead;
++
++extern atomic_unchecked_t fscache_n_checkaux_none;
++extern atomic_unchecked_t fscache_n_checkaux_okay;
++extern atomic_unchecked_t fscache_n_checkaux_update;
++extern atomic_unchecked_t fscache_n_checkaux_obsolete;
+ 
+ extern atomic_t fscache_n_cop_alloc_object;
+ extern atomic_t fscache_n_cop_lookup_object;
+@@ -247,6 +247,11 @@ static inline void fscache_stat(atomic_t
+ 	atomic_inc(stat);
+ }
+ 
++static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
++{
++	atomic_inc_unchecked(stat);
++}
++
+ static inline void fscache_stat_d(atomic_t *stat)
+ {
+ 	atomic_dec(stat);
+@@ -259,6 +264,7 @@ extern const struct file_operations fsca
+ 
+ #define __fscache_stat(stat) (NULL)
+ #define fscache_stat(stat) do {} while (0)
++#define fscache_stat_unchecked(stat) do {} while (0)
+ #define fscache_stat_d(stat) do {} while (0)
+ #endif
+ 
+diff -urNp linux-2.6.32.40/fs/fscache/object.c linux-2.6.32.40/fs/fscache/object.c
+--- linux-2.6.32.40/fs/fscache/object.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fscache/object.c	2011-05-04 17:56:28.000000000 -0400
+@@ -144,7 +144,7 @@ static void fscache_object_state_machine
+ 		/* update the object metadata on disk */
+ 	case FSCACHE_OBJECT_UPDATING:
+ 		clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
+-		fscache_stat(&fscache_n_updates_run);
++		fscache_stat_unchecked(&fscache_n_updates_run);
+ 		fscache_stat(&fscache_n_cop_update_object);
+ 		object->cache->ops->update_object(object);
+ 		fscache_stat_d(&fscache_n_cop_update_object);
+@@ -233,7 +233,7 @@ static void fscache_object_state_machine
+ 		spin_lock(&object->lock);
+ 		object->state = FSCACHE_OBJECT_DEAD;
+ 		spin_unlock(&object->lock);
+-		fscache_stat(&fscache_n_object_dead);
++		fscache_stat_unchecked(&fscache_n_object_dead);
+ 		goto terminal_transit;
+ 
+ 		/* handle the parent cache of this object being withdrawn from
+@@ -248,7 +248,7 @@ static void fscache_object_state_machine
+ 		spin_lock(&object->lock);
+ 		object->state = FSCACHE_OBJECT_DEAD;
+ 		spin_unlock(&object->lock);
+-		fscache_stat(&fscache_n_object_dead);
++		fscache_stat_unchecked(&fscache_n_object_dead);
+ 		goto terminal_transit;
+ 
+ 		/* complain about the object being woken up once it is
+@@ -492,7 +492,7 @@ static void fscache_lookup_object(struct
+ 	       parent->cookie->def->name, cookie->def->name,
+ 	       object->cache->tag->name);
+ 
+-	fscache_stat(&fscache_n_object_lookups);
++	fscache_stat_unchecked(&fscache_n_object_lookups);
+ 	fscache_stat(&fscache_n_cop_lookup_object);
+ 	ret = object->cache->ops->lookup_object(object);
+ 	fscache_stat_d(&fscache_n_cop_lookup_object);
+@@ -503,7 +503,7 @@ static void fscache_lookup_object(struct
+ 	if (ret == -ETIMEDOUT) {
+ 		/* probably stuck behind another object, so move this one to
+ 		 * the back of the queue */
+-		fscache_stat(&fscache_n_object_lookups_timed_out);
++		fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
+ 		set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
+ 	}
+ 
+@@ -526,7 +526,7 @@ void fscache_object_lookup_negative(stru
+ 
+ 	spin_lock(&object->lock);
+ 	if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
+-		fscache_stat(&fscache_n_object_lookups_negative);
++		fscache_stat_unchecked(&fscache_n_object_lookups_negative);
+ 
+ 		/* transit here to allow write requests to begin stacking up
+ 		 * and read requests to begin returning ENODATA */
+@@ -572,7 +572,7 @@ void fscache_obtained_object(struct fsca
+ 	 * result, in which case there may be data available */
+ 	spin_lock(&object->lock);
+ 	if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
+-		fscache_stat(&fscache_n_object_lookups_positive);
++		fscache_stat_unchecked(&fscache_n_object_lookups_positive);
+ 
+ 		clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
+ 
+@@ -586,7 +586,7 @@ void fscache_obtained_object(struct fsca
+ 		set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
+ 	} else {
+ 		ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
+-		fscache_stat(&fscache_n_object_created);
++		fscache_stat_unchecked(&fscache_n_object_created);
+ 
+ 		object->state = FSCACHE_OBJECT_AVAILABLE;
+ 		spin_unlock(&object->lock);
+@@ -633,7 +633,7 @@ static void fscache_object_available(str
+ 	fscache_enqueue_dependents(object);
+ 
+ 	fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
+-	fscache_stat(&fscache_n_object_avail);
++	fscache_stat_unchecked(&fscache_n_object_avail);
+ 
+ 	_leave("");
+ }
+@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(
+ 	enum fscache_checkaux result;
+ 
+ 	if (!object->cookie->def->check_aux) {
+-		fscache_stat(&fscache_n_checkaux_none);
++		fscache_stat_unchecked(&fscache_n_checkaux_none);
+ 		return FSCACHE_CHECKAUX_OKAY;
+ 	}
+ 
+@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(
+ 	switch (result) {
+ 		/* entry okay as is */
+ 	case FSCACHE_CHECKAUX_OKAY:
+-		fscache_stat(&fscache_n_checkaux_okay);
++		fscache_stat_unchecked(&fscache_n_checkaux_okay);
+ 		break;
+ 
+ 		/* entry requires update */
+ 	case FSCACHE_CHECKAUX_NEEDS_UPDATE:
+-		fscache_stat(&fscache_n_checkaux_update);
++		fscache_stat_unchecked(&fscache_n_checkaux_update);
+ 		break;
+ 
+ 		/* entry requires deletion */
+ 	case FSCACHE_CHECKAUX_OBSOLETE:
+-		fscache_stat(&fscache_n_checkaux_obsolete);
++		fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
+ 		break;
+ 
+ 	default:
+diff -urNp linux-2.6.32.40/fs/fscache/operation.c linux-2.6.32.40/fs/fscache/operation.c
+--- linux-2.6.32.40/fs/fscache/operation.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fscache/operation.c	2011-05-04 17:56:28.000000000 -0400
+@@ -16,7 +16,7 @@
+ #include <linux/seq_file.h>
+ #include "internal.h"
+ 
+-atomic_t fscache_op_debug_id;
++atomic_unchecked_t fscache_op_debug_id;
+ EXPORT_SYMBOL(fscache_op_debug_id);
+ 
+ /**
+@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fs
+ 	ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
+ 	ASSERTCMP(atomic_read(&op->usage), >, 0);
+ 
+-	fscache_stat(&fscache_n_op_enqueue);
++	fscache_stat_unchecked(&fscache_n_op_enqueue);
+ 	switch (op->flags & FSCACHE_OP_TYPE) {
+ 	case FSCACHE_OP_FAST:
+ 		_debug("queue fast");
+@@ -76,7 +76,7 @@ static void fscache_run_op(struct fscach
+ 		wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
+ 	if (op->processor)
+ 		fscache_enqueue_operation(op);
+-	fscache_stat(&fscache_n_op_run);
++	fscache_stat_unchecked(&fscache_n_op_run);
+ }
+ 
+ /*
+@@ -107,11 +107,11 @@ int fscache_submit_exclusive_op(struct f
+ 		if (object->n_ops > 0) {
+ 			atomic_inc(&op->usage);
+ 			list_add_tail(&op->pend_link, &object->pending_ops);
+-			fscache_stat(&fscache_n_op_pend);
++			fscache_stat_unchecked(&fscache_n_op_pend);
+ 		} else if (!list_empty(&object->pending_ops)) {
+ 			atomic_inc(&op->usage);
+ 			list_add_tail(&op->pend_link, &object->pending_ops);
+-			fscache_stat(&fscache_n_op_pend);
++			fscache_stat_unchecked(&fscache_n_op_pend);
+ 			fscache_start_operations(object);
+ 		} else {
+ 			ASSERTCMP(object->n_in_progress, ==, 0);
+@@ -127,7 +127,7 @@ int fscache_submit_exclusive_op(struct f
+ 		object->n_exclusive++;	/* reads and writes must wait */
+ 		atomic_inc(&op->usage);
+ 		list_add_tail(&op->pend_link, &object->pending_ops);
+-		fscache_stat(&fscache_n_op_pend);
++		fscache_stat_unchecked(&fscache_n_op_pend);
+ 		ret = 0;
+ 	} else {
+ 		/* not allowed to submit ops in any other state */
+@@ -214,11 +214,11 @@ int fscache_submit_op(struct fscache_obj
+ 		if (object->n_exclusive > 0) {
+ 			atomic_inc(&op->usage);
+ 			list_add_tail(&op->pend_link, &object->pending_ops);
+-			fscache_stat(&fscache_n_op_pend);
++			fscache_stat_unchecked(&fscache_n_op_pend);
+ 		} else if (!list_empty(&object->pending_ops)) {
+ 			atomic_inc(&op->usage);
+ 			list_add_tail(&op->pend_link, &object->pending_ops);
+-			fscache_stat(&fscache_n_op_pend);
++			fscache_stat_unchecked(&fscache_n_op_pend);
+ 			fscache_start_operations(object);
+ 		} else {
+ 			ASSERTCMP(object->n_exclusive, ==, 0);
+@@ -230,12 +230,12 @@ int fscache_submit_op(struct fscache_obj
+ 		object->n_ops++;
+ 		atomic_inc(&op->usage);
+ 		list_add_tail(&op->pend_link, &object->pending_ops);
+-		fscache_stat(&fscache_n_op_pend);
++		fscache_stat_unchecked(&fscache_n_op_pend);
+ 		ret = 0;
+ 	} else if (object->state == FSCACHE_OBJECT_DYING ||
+ 		   object->state == FSCACHE_OBJECT_LC_DYING ||
+ 		   object->state == FSCACHE_OBJECT_WITHDRAWING) {
+-		fscache_stat(&fscache_n_op_rejected);
++		fscache_stat_unchecked(&fscache_n_op_rejected);
+ 		ret = -ENOBUFS;
+ 	} else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
+ 		fscache_report_unexpected_submission(object, op, ostate);
+@@ -305,7 +305,7 @@ int fscache_cancel_op(struct fscache_ope
+ 
+ 	ret = -EBUSY;
+ 	if (!list_empty(&op->pend_link)) {
+-		fscache_stat(&fscache_n_op_cancelled);
++		fscache_stat_unchecked(&fscache_n_op_cancelled);
+ 		list_del_init(&op->pend_link);
+ 		object->n_ops--;
+ 		if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
+@@ -344,7 +344,7 @@ void fscache_put_operation(struct fscach
+ 	if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
+ 		BUG();
+ 
+-	fscache_stat(&fscache_n_op_release);
++	fscache_stat_unchecked(&fscache_n_op_release);
+ 
+ 	if (op->release) {
+ 		op->release(op);
+@@ -361,7 +361,7 @@ void fscache_put_operation(struct fscach
+ 	 * lock, and defer it otherwise */
+ 	if (!spin_trylock(&object->lock)) {
+ 		_debug("defer put");
+-		fscache_stat(&fscache_n_op_deferred_release);
++		fscache_stat_unchecked(&fscache_n_op_deferred_release);
+ 
+ 		cache = object->cache;
+ 		spin_lock(&cache->op_gc_list_lock);
+@@ -423,7 +423,7 @@ void fscache_operation_gc(struct work_st
+ 
+ 		_debug("GC DEFERRED REL OBJ%x OP%x",
+ 		       object->debug_id, op->debug_id);
+-		fscache_stat(&fscache_n_op_gc);
++		fscache_stat_unchecked(&fscache_n_op_gc);
+ 
+ 		ASSERTCMP(atomic_read(&op->usage), ==, 0);
+ 
+diff -urNp linux-2.6.32.40/fs/fscache/page.c linux-2.6.32.40/fs/fscache/page.c
+--- linux-2.6.32.40/fs/fscache/page.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fscache/page.c	2011-05-04 17:56:28.000000000 -0400
+@@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct
+ 	val = radix_tree_lookup(&cookie->stores, page->index);
+ 	if (!val) {
+ 		rcu_read_unlock();
+-		fscache_stat(&fscache_n_store_vmscan_not_storing);
++		fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
+ 		__fscache_uncache_page(cookie, page);
+ 		return true;
+ 	}
+@@ -89,11 +89,11 @@ bool __fscache_maybe_release_page(struct
+ 	spin_unlock(&cookie->stores_lock);
+ 
+ 	if (xpage) {
+-		fscache_stat(&fscache_n_store_vmscan_cancelled);
+-		fscache_stat(&fscache_n_store_radix_deletes);
++		fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
++		fscache_stat_unchecked(&fscache_n_store_radix_deletes);
+ 		ASSERTCMP(xpage, ==, page);
+ 	} else {
+-		fscache_stat(&fscache_n_store_vmscan_gone);
++		fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
+ 	}
+ 
+ 	wake_up_bit(&cookie->flags, 0);
+@@ -106,7 +106,7 @@ page_busy:
+ 	/* we might want to wait here, but that could deadlock the allocator as
+ 	 * the slow-work threads writing to the cache may all end up sleeping
+ 	 * on memory allocation */
+-	fscache_stat(&fscache_n_store_vmscan_busy);
++	fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
+ 	return false;
+ }
+ EXPORT_SYMBOL(__fscache_maybe_release_page);
+@@ -130,7 +130,7 @@ static void fscache_end_page_write(struc
+ 				     FSCACHE_COOKIE_STORING_TAG);
+ 		if (!radix_tree_tag_get(&cookie->stores, page->index,
+ 					FSCACHE_COOKIE_PENDING_TAG)) {
+-			fscache_stat(&fscache_n_store_radix_deletes);
++			fscache_stat_unchecked(&fscache_n_store_radix_deletes);
+ 			xpage = radix_tree_delete(&cookie->stores, page->index);
+ 		}
+ 		spin_unlock(&cookie->stores_lock);
+@@ -151,7 +151,7 @@ static void fscache_attr_changed_op(stru
+ 
+ 	_enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
+ 
+-	fscache_stat(&fscache_n_attr_changed_calls);
++	fscache_stat_unchecked(&fscache_n_attr_changed_calls);
+ 
+ 	if (fscache_object_is_active(object)) {
+ 		fscache_set_op_state(op, "CallFS");
+@@ -178,11 +178,11 @@ int __fscache_attr_changed(struct fscach
+ 
+ 	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
+ 
+-	fscache_stat(&fscache_n_attr_changed);
++	fscache_stat_unchecked(&fscache_n_attr_changed);
+ 
+ 	op = kzalloc(sizeof(*op), GFP_KERNEL);
+ 	if (!op) {
+-		fscache_stat(&fscache_n_attr_changed_nomem);
++		fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
+ 		_leave(" = -ENOMEM");
+ 		return -ENOMEM;
+ 	}
+@@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscach
+ 	if (fscache_submit_exclusive_op(object, op) < 0)
+ 		goto nobufs;
+ 	spin_unlock(&cookie->lock);
+-	fscache_stat(&fscache_n_attr_changed_ok);
++	fscache_stat_unchecked(&fscache_n_attr_changed_ok);
+ 	fscache_put_operation(op);
+ 	_leave(" = 0");
+ 	return 0;
+@@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscach
+ nobufs:
+ 	spin_unlock(&cookie->lock);
+ 	kfree(op);
+-	fscache_stat(&fscache_n_attr_changed_nobufs);
++	fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
+ 	_leave(" = %d", -ENOBUFS);
+ 	return -ENOBUFS;
+ }
+@@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache
+ 	/* allocate a retrieval operation and attempt to submit it */
+ 	op = kzalloc(sizeof(*op), GFP_NOIO);
+ 	if (!op) {
+-		fscache_stat(&fscache_n_retrievals_nomem);
++		fscache_stat_unchecked(&fscache_n_retrievals_nomem);
+ 		return NULL;
+ 	}
+ 
+@@ -294,13 +294,13 @@ static int fscache_wait_for_deferred_loo
+ 		return 0;
+ 	}
+ 
+-	fscache_stat(&fscache_n_retrievals_wait);
++	fscache_stat_unchecked(&fscache_n_retrievals_wait);
+ 
+ 	jif = jiffies;
+ 	if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
+ 			fscache_wait_bit_interruptible,
+ 			TASK_INTERRUPTIBLE) != 0) {
+-		fscache_stat(&fscache_n_retrievals_intr);
++		fscache_stat_unchecked(&fscache_n_retrievals_intr);
+ 		_leave(" = -ERESTARTSYS");
+ 		return -ERESTARTSYS;
+ 	}
+@@ -318,8 +318,8 @@ static int fscache_wait_for_deferred_loo
+  */
+ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
+ 						 struct fscache_retrieval *op,
+-						 atomic_t *stat_op_waits,
+-						 atomic_t *stat_object_dead)
++						 atomic_unchecked_t *stat_op_waits,
++						 atomic_unchecked_t *stat_object_dead)
+ {
+ 	int ret;
+ 
+@@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_ac
+ 		goto check_if_dead;
+ 
+ 	_debug(">>> WT");
+-	fscache_stat(stat_op_waits);
++	fscache_stat_unchecked(stat_op_waits);
+ 	if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
+ 			fscache_wait_bit_interruptible,
+ 			TASK_INTERRUPTIBLE) < 0) {
+@@ -344,7 +344,7 @@ static int fscache_wait_for_retrieval_ac
+ 
+ check_if_dead:
+ 	if (unlikely(fscache_object_is_dead(object))) {
+-		fscache_stat(stat_object_dead);
++		fscache_stat_unchecked(stat_object_dead);
+ 		return -ENOBUFS;
+ 	}
+ 	return 0;
+@@ -371,7 +371,7 @@ int __fscache_read_or_alloc_page(struct 
+ 
+ 	_enter("%p,%p,,,", cookie, page);
+ 
+-	fscache_stat(&fscache_n_retrievals);
++	fscache_stat_unchecked(&fscache_n_retrievals);
+ 
+ 	if (hlist_empty(&cookie->backing_objects))
+ 		goto nobufs;
+@@ -405,7 +405,7 @@ int __fscache_read_or_alloc_page(struct 
+ 		goto nobufs_unlock;
+ 	spin_unlock(&cookie->lock);
+ 
+-	fscache_stat(&fscache_n_retrieval_ops);
++	fscache_stat_unchecked(&fscache_n_retrieval_ops);
+ 
+ 	/* pin the netfs read context in case we need to do the actual netfs
+ 	 * read because we've encountered a cache read failure */
+@@ -435,15 +435,15 @@ int __fscache_read_or_alloc_page(struct 
+ 
+ error:
+ 	if (ret == -ENOMEM)
+-		fscache_stat(&fscache_n_retrievals_nomem);
++		fscache_stat_unchecked(&fscache_n_retrievals_nomem);
+ 	else if (ret == -ERESTARTSYS)
+-		fscache_stat(&fscache_n_retrievals_intr);
++		fscache_stat_unchecked(&fscache_n_retrievals_intr);
+ 	else if (ret == -ENODATA)
+-		fscache_stat(&fscache_n_retrievals_nodata);
++		fscache_stat_unchecked(&fscache_n_retrievals_nodata);
+ 	else if (ret < 0)
+-		fscache_stat(&fscache_n_retrievals_nobufs);
++		fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
+ 	else
+-		fscache_stat(&fscache_n_retrievals_ok);
++		fscache_stat_unchecked(&fscache_n_retrievals_ok);
+ 
+ 	fscache_put_retrieval(op);
+ 	_leave(" = %d", ret);
+@@ -453,7 +453,7 @@ nobufs_unlock:
+ 	spin_unlock(&cookie->lock);
+ 	kfree(op);
+ nobufs:
+-	fscache_stat(&fscache_n_retrievals_nobufs);
++	fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
+ 	_leave(" = -ENOBUFS");
+ 	return -ENOBUFS;
+ }
+@@ -491,7 +491,7 @@ int __fscache_read_or_alloc_pages(struct
+ 
+ 	_enter("%p,,%d,,,", cookie, *nr_pages);
+ 
+-	fscache_stat(&fscache_n_retrievals);
++	fscache_stat_unchecked(&fscache_n_retrievals);
+ 
+ 	if (hlist_empty(&cookie->backing_objects))
+ 		goto nobufs;
+@@ -522,7 +522,7 @@ int __fscache_read_or_alloc_pages(struct
+ 		goto nobufs_unlock;
+ 	spin_unlock(&cookie->lock);
+ 
+-	fscache_stat(&fscache_n_retrieval_ops);
++	fscache_stat_unchecked(&fscache_n_retrieval_ops);
+ 
+ 	/* pin the netfs read context in case we need to do the actual netfs
+ 	 * read because we've encountered a cache read failure */
+@@ -552,15 +552,15 @@ int __fscache_read_or_alloc_pages(struct
+ 
+ error:
+ 	if (ret == -ENOMEM)
+-		fscache_stat(&fscache_n_retrievals_nomem);
++		fscache_stat_unchecked(&fscache_n_retrievals_nomem);
+ 	else if (ret == -ERESTARTSYS)
+-		fscache_stat(&fscache_n_retrievals_intr);
++		fscache_stat_unchecked(&fscache_n_retrievals_intr);
+ 	else if (ret == -ENODATA)
+-		fscache_stat(&fscache_n_retrievals_nodata);
++		fscache_stat_unchecked(&fscache_n_retrievals_nodata);
+ 	else if (ret < 0)
+-		fscache_stat(&fscache_n_retrievals_nobufs);
++		fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
+ 	else
+-		fscache_stat(&fscache_n_retrievals_ok);
++		fscache_stat_unchecked(&fscache_n_retrievals_ok);
+ 
+ 	fscache_put_retrieval(op);
+ 	_leave(" = %d", ret);
+@@ -570,7 +570,7 @@ nobufs_unlock:
+ 	spin_unlock(&cookie->lock);
+ 	kfree(op);
+ nobufs:
+-	fscache_stat(&fscache_n_retrievals_nobufs);
++	fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
+ 	_leave(" = -ENOBUFS");
+ 	return -ENOBUFS;
+ }
+@@ -594,7 +594,7 @@ int __fscache_alloc_page(struct fscache_
+ 
+ 	_enter("%p,%p,,,", cookie, page);
+ 
+-	fscache_stat(&fscache_n_allocs);
++	fscache_stat_unchecked(&fscache_n_allocs);
+ 
+ 	if (hlist_empty(&cookie->backing_objects))
+ 		goto nobufs;
+@@ -621,7 +621,7 @@ int __fscache_alloc_page(struct fscache_
+ 		goto nobufs_unlock;
+ 	spin_unlock(&cookie->lock);
+ 
+-	fscache_stat(&fscache_n_alloc_ops);
++	fscache_stat_unchecked(&fscache_n_alloc_ops);
+ 
+ 	ret = fscache_wait_for_retrieval_activation(
+ 		object, op,
+@@ -637,11 +637,11 @@ int __fscache_alloc_page(struct fscache_
+ 
+ error:
+ 	if (ret == -ERESTARTSYS)
+-		fscache_stat(&fscache_n_allocs_intr);
++		fscache_stat_unchecked(&fscache_n_allocs_intr);
+ 	else if (ret < 0)
+-		fscache_stat(&fscache_n_allocs_nobufs);
++		fscache_stat_unchecked(&fscache_n_allocs_nobufs);
+ 	else
+-		fscache_stat(&fscache_n_allocs_ok);
++		fscache_stat_unchecked(&fscache_n_allocs_ok);
+ 
+ 	fscache_put_retrieval(op);
+ 	_leave(" = %d", ret);
+@@ -651,7 +651,7 @@ nobufs_unlock:
+ 	spin_unlock(&cookie->lock);
+ 	kfree(op);
+ nobufs:
+-	fscache_stat(&fscache_n_allocs_nobufs);
++	fscache_stat_unchecked(&fscache_n_allocs_nobufs);
+ 	_leave(" = -ENOBUFS");
+ 	return -ENOBUFS;
+ }
+@@ -694,7 +694,7 @@ static void fscache_write_op(struct fsca
+ 
+ 	spin_lock(&cookie->stores_lock);
+ 
+-	fscache_stat(&fscache_n_store_calls);
++	fscache_stat_unchecked(&fscache_n_store_calls);
+ 
+ 	/* find a page to store */
+ 	page = NULL;
+@@ -705,7 +705,7 @@ static void fscache_write_op(struct fsca
+ 	page = results[0];
+ 	_debug("gang %d [%lx]", n, page->index);
+ 	if (page->index > op->store_limit) {
+-		fscache_stat(&fscache_n_store_pages_over_limit);
++		fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
+ 		goto superseded;
+ 	}
+ 
+@@ -721,7 +721,7 @@ static void fscache_write_op(struct fsca
+ 
+ 	if (page) {
+ 		fscache_set_op_state(&op->op, "Store");
+-		fscache_stat(&fscache_n_store_pages);
++		fscache_stat_unchecked(&fscache_n_store_pages);
+ 		fscache_stat(&fscache_n_cop_write_page);
+ 		ret = object->cache->ops->write_page(op, page);
+ 		fscache_stat_d(&fscache_n_cop_write_page);
+@@ -792,7 +792,7 @@ int __fscache_write_page(struct fscache_
+ 	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
+ 	ASSERT(PageFsCache(page));
+ 
+-	fscache_stat(&fscache_n_stores);
++	fscache_stat_unchecked(&fscache_n_stores);
+ 
+ 	op = kzalloc(sizeof(*op), GFP_NOIO);
+ 	if (!op)
+@@ -844,7 +844,7 @@ int __fscache_write_page(struct fscache_
+ 	spin_unlock(&cookie->stores_lock);
+ 	spin_unlock(&object->lock);
+ 
+-	op->op.debug_id	= atomic_inc_return(&fscache_op_debug_id);
++	op->op.debug_id	= atomic_inc_return_unchecked(&fscache_op_debug_id);
+ 	op->store_limit = object->store_limit;
+ 
+ 	if (fscache_submit_op(object, &op->op) < 0)
+@@ -852,8 +852,8 @@ int __fscache_write_page(struct fscache_
+ 
+ 	spin_unlock(&cookie->lock);
+ 	radix_tree_preload_end();
+-	fscache_stat(&fscache_n_store_ops);
+-	fscache_stat(&fscache_n_stores_ok);
++	fscache_stat_unchecked(&fscache_n_store_ops);
++	fscache_stat_unchecked(&fscache_n_stores_ok);
+ 
+ 	/* the slow work queue now carries its own ref on the object */
+ 	fscache_put_operation(&op->op);
+@@ -861,14 +861,14 @@ int __fscache_write_page(struct fscache_
+ 	return 0;
+ 
+ already_queued:
+-	fscache_stat(&fscache_n_stores_again);
++	fscache_stat_unchecked(&fscache_n_stores_again);
+ already_pending:
+ 	spin_unlock(&cookie->stores_lock);
+ 	spin_unlock(&object->lock);
+ 	spin_unlock(&cookie->lock);
+ 	radix_tree_preload_end();
+ 	kfree(op);
+-	fscache_stat(&fscache_n_stores_ok);
++	fscache_stat_unchecked(&fscache_n_stores_ok);
+ 	_leave(" = 0");
+ 	return 0;
+ 
+@@ -886,14 +886,14 @@ nobufs:
+ 	spin_unlock(&cookie->lock);
+ 	radix_tree_preload_end();
+ 	kfree(op);
+-	fscache_stat(&fscache_n_stores_nobufs);
++	fscache_stat_unchecked(&fscache_n_stores_nobufs);
+ 	_leave(" = -ENOBUFS");
+ 	return -ENOBUFS;
+ 
+ nomem_free:
+ 	kfree(op);
+ nomem:
+-	fscache_stat(&fscache_n_stores_oom);
++	fscache_stat_unchecked(&fscache_n_stores_oom);
+ 	_leave(" = -ENOMEM");
+ 	return -ENOMEM;
+ }
+@@ -911,7 +911,7 @@ void __fscache_uncache_page(struct fscac
+ 	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
+ 	ASSERTCMP(page, !=, NULL);
+ 
+-	fscache_stat(&fscache_n_uncaches);
++	fscache_stat_unchecked(&fscache_n_uncaches);
+ 
+ 	/* cache withdrawal may beat us to it */
+ 	if (!PageFsCache(page))
+@@ -964,7 +964,7 @@ void fscache_mark_pages_cached(struct fs
+ 	unsigned long loop;
+ 
+ #ifdef CONFIG_FSCACHE_STATS
+-	atomic_add(pagevec->nr, &fscache_n_marks);
++	atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
+ #endif
+ 
+ 	for (loop = 0; loop < pagevec->nr; loop++) {
+diff -urNp linux-2.6.32.40/fs/fscache/stats.c linux-2.6.32.40/fs/fscache/stats.c
+--- linux-2.6.32.40/fs/fscache/stats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fscache/stats.c	2011-05-04 17:56:28.000000000 -0400
+@@ -18,95 +18,95 @@
+ /*
+  * operation counters
+  */
+-atomic_t fscache_n_op_pend;
+-atomic_t fscache_n_op_run;
+-atomic_t fscache_n_op_enqueue;
+-atomic_t fscache_n_op_requeue;
+-atomic_t fscache_n_op_deferred_release;
+-atomic_t fscache_n_op_release;
+-atomic_t fscache_n_op_gc;
+-atomic_t fscache_n_op_cancelled;
+-atomic_t fscache_n_op_rejected;
+-
+-atomic_t fscache_n_attr_changed;
+-atomic_t fscache_n_attr_changed_ok;
+-atomic_t fscache_n_attr_changed_nobufs;
+-atomic_t fscache_n_attr_changed_nomem;
+-atomic_t fscache_n_attr_changed_calls;
+-
+-atomic_t fscache_n_allocs;
+-atomic_t fscache_n_allocs_ok;
+-atomic_t fscache_n_allocs_wait;
+-atomic_t fscache_n_allocs_nobufs;
+-atomic_t fscache_n_allocs_intr;
+-atomic_t fscache_n_allocs_object_dead;
+-atomic_t fscache_n_alloc_ops;
+-atomic_t fscache_n_alloc_op_waits;
+-
+-atomic_t fscache_n_retrievals;
+-atomic_t fscache_n_retrievals_ok;
+-atomic_t fscache_n_retrievals_wait;
+-atomic_t fscache_n_retrievals_nodata;
+-atomic_t fscache_n_retrievals_nobufs;
+-atomic_t fscache_n_retrievals_intr;
+-atomic_t fscache_n_retrievals_nomem;
+-atomic_t fscache_n_retrievals_object_dead;
+-atomic_t fscache_n_retrieval_ops;
+-atomic_t fscache_n_retrieval_op_waits;
+-
+-atomic_t fscache_n_stores;
+-atomic_t fscache_n_stores_ok;
+-atomic_t fscache_n_stores_again;
+-atomic_t fscache_n_stores_nobufs;
+-atomic_t fscache_n_stores_oom;
+-atomic_t fscache_n_store_ops;
+-atomic_t fscache_n_store_calls;
+-atomic_t fscache_n_store_pages;
+-atomic_t fscache_n_store_radix_deletes;
+-atomic_t fscache_n_store_pages_over_limit;
+-
+-atomic_t fscache_n_store_vmscan_not_storing;
+-atomic_t fscache_n_store_vmscan_gone;
+-atomic_t fscache_n_store_vmscan_busy;
+-atomic_t fscache_n_store_vmscan_cancelled;
+-
+-atomic_t fscache_n_marks;
+-atomic_t fscache_n_uncaches;
+-
+-atomic_t fscache_n_acquires;
+-atomic_t fscache_n_acquires_null;
+-atomic_t fscache_n_acquires_no_cache;
+-atomic_t fscache_n_acquires_ok;
+-atomic_t fscache_n_acquires_nobufs;
+-atomic_t fscache_n_acquires_oom;
+-
+-atomic_t fscache_n_updates;
+-atomic_t fscache_n_updates_null;
+-atomic_t fscache_n_updates_run;
+-
+-atomic_t fscache_n_relinquishes;
+-atomic_t fscache_n_relinquishes_null;
+-atomic_t fscache_n_relinquishes_waitcrt;
+-atomic_t fscache_n_relinquishes_retire;
+-
+-atomic_t fscache_n_cookie_index;
+-atomic_t fscache_n_cookie_data;
+-atomic_t fscache_n_cookie_special;
+-
+-atomic_t fscache_n_object_alloc;
+-atomic_t fscache_n_object_no_alloc;
+-atomic_t fscache_n_object_lookups;
+-atomic_t fscache_n_object_lookups_negative;
+-atomic_t fscache_n_object_lookups_positive;
+-atomic_t fscache_n_object_lookups_timed_out;
+-atomic_t fscache_n_object_created;
+-atomic_t fscache_n_object_avail;
+-atomic_t fscache_n_object_dead;
+-
+-atomic_t fscache_n_checkaux_none;
+-atomic_t fscache_n_checkaux_okay;
+-atomic_t fscache_n_checkaux_update;
+-atomic_t fscache_n_checkaux_obsolete;
++atomic_unchecked_t fscache_n_op_pend;
++atomic_unchecked_t fscache_n_op_run;
++atomic_unchecked_t fscache_n_op_enqueue;
++atomic_unchecked_t fscache_n_op_requeue;
++atomic_unchecked_t fscache_n_op_deferred_release;
++atomic_unchecked_t fscache_n_op_release;
++atomic_unchecked_t fscache_n_op_gc;
++atomic_unchecked_t fscache_n_op_cancelled;
++atomic_unchecked_t fscache_n_op_rejected;
++
++atomic_unchecked_t fscache_n_attr_changed;
++atomic_unchecked_t fscache_n_attr_changed_ok;
++atomic_unchecked_t fscache_n_attr_changed_nobufs;
++atomic_unchecked_t fscache_n_attr_changed_nomem;
++atomic_unchecked_t fscache_n_attr_changed_calls;
++
++atomic_unchecked_t fscache_n_allocs;
++atomic_unchecked_t fscache_n_allocs_ok;
++atomic_unchecked_t fscache_n_allocs_wait;
++atomic_unchecked_t fscache_n_allocs_nobufs;
++atomic_unchecked_t fscache_n_allocs_intr;
++atomic_unchecked_t fscache_n_allocs_object_dead;
++atomic_unchecked_t fscache_n_alloc_ops;
++atomic_unchecked_t fscache_n_alloc_op_waits;
++
++atomic_unchecked_t fscache_n_retrievals;
++atomic_unchecked_t fscache_n_retrievals_ok;
++atomic_unchecked_t fscache_n_retrievals_wait;
++atomic_unchecked_t fscache_n_retrievals_nodata;
++atomic_unchecked_t fscache_n_retrievals_nobufs;
++atomic_unchecked_t fscache_n_retrievals_intr;
++atomic_unchecked_t fscache_n_retrievals_nomem;
++atomic_unchecked_t fscache_n_retrievals_object_dead;
++atomic_unchecked_t fscache_n_retrieval_ops;
++atomic_unchecked_t fscache_n_retrieval_op_waits;
++
++atomic_unchecked_t fscache_n_stores;
++atomic_unchecked_t fscache_n_stores_ok;
++atomic_unchecked_t fscache_n_stores_again;
++atomic_unchecked_t fscache_n_stores_nobufs;
++atomic_unchecked_t fscache_n_stores_oom;
++atomic_unchecked_t fscache_n_store_ops;
++atomic_unchecked_t fscache_n_store_calls;
++atomic_unchecked_t fscache_n_store_pages;
++atomic_unchecked_t fscache_n_store_radix_deletes;
++atomic_unchecked_t fscache_n_store_pages_over_limit;
++
++atomic_unchecked_t fscache_n_store_vmscan_not_storing;
++atomic_unchecked_t fscache_n_store_vmscan_gone;
++atomic_unchecked_t fscache_n_store_vmscan_busy;
++atomic_unchecked_t fscache_n_store_vmscan_cancelled;
++
++atomic_unchecked_t fscache_n_marks;
++atomic_unchecked_t fscache_n_uncaches;
++
++atomic_unchecked_t fscache_n_acquires;
++atomic_unchecked_t fscache_n_acquires_null;
++atomic_unchecked_t fscache_n_acquires_no_cache;
++atomic_unchecked_t fscache_n_acquires_ok;
++atomic_unchecked_t fscache_n_acquires_nobufs;
++atomic_unchecked_t fscache_n_acquires_oom;
++
++atomic_unchecked_t fscache_n_updates;
++atomic_unchecked_t fscache_n_updates_null;
++atomic_unchecked_t fscache_n_updates_run;
++
++atomic_unchecked_t fscache_n_relinquishes;
++atomic_unchecked_t fscache_n_relinquishes_null;
++atomic_unchecked_t fscache_n_relinquishes_waitcrt;
++atomic_unchecked_t fscache_n_relinquishes_retire;
++
++atomic_unchecked_t fscache_n_cookie_index;
++atomic_unchecked_t fscache_n_cookie_data;
++atomic_unchecked_t fscache_n_cookie_special;
++
++atomic_unchecked_t fscache_n_object_alloc;
++atomic_unchecked_t fscache_n_object_no_alloc;
++atomic_unchecked_t fscache_n_object_lookups;
++atomic_unchecked_t fscache_n_object_lookups_negative;
++atomic_unchecked_t fscache_n_object_lookups_positive;
++atomic_unchecked_t fscache_n_object_lookups_timed_out;
++atomic_unchecked_t fscache_n_object_created;
++atomic_unchecked_t fscache_n_object_avail;
++atomic_unchecked_t fscache_n_object_dead;
++
++atomic_unchecked_t fscache_n_checkaux_none;
++atomic_unchecked_t fscache_n_checkaux_okay;
++atomic_unchecked_t fscache_n_checkaux_update;
++atomic_unchecked_t fscache_n_checkaux_obsolete;
+ 
+ atomic_t fscache_n_cop_alloc_object;
+ atomic_t fscache_n_cop_lookup_object;
+@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq
+ 	seq_puts(m, "FS-Cache statistics\n");
+ 
+ 	seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
+-		   atomic_read(&fscache_n_cookie_index),
+-		   atomic_read(&fscache_n_cookie_data),
+-		   atomic_read(&fscache_n_cookie_special));
++		   atomic_read_unchecked(&fscache_n_cookie_index),
++		   atomic_read_unchecked(&fscache_n_cookie_data),
++		   atomic_read_unchecked(&fscache_n_cookie_special));
+ 
+ 	seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
+-		   atomic_read(&fscache_n_object_alloc),
+-		   atomic_read(&fscache_n_object_no_alloc),
+-		   atomic_read(&fscache_n_object_avail),
+-		   atomic_read(&fscache_n_object_dead));
++		   atomic_read_unchecked(&fscache_n_object_alloc),
++		   atomic_read_unchecked(&fscache_n_object_no_alloc),
++		   atomic_read_unchecked(&fscache_n_object_avail),
++		   atomic_read_unchecked(&fscache_n_object_dead));
+ 	seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
+-		   atomic_read(&fscache_n_checkaux_none),
+-		   atomic_read(&fscache_n_checkaux_okay),
+-		   atomic_read(&fscache_n_checkaux_update),
+-		   atomic_read(&fscache_n_checkaux_obsolete));
++		   atomic_read_unchecked(&fscache_n_checkaux_none),
++		   atomic_read_unchecked(&fscache_n_checkaux_okay),
++		   atomic_read_unchecked(&fscache_n_checkaux_update),
++		   atomic_read_unchecked(&fscache_n_checkaux_obsolete));
+ 
+ 	seq_printf(m, "Pages  : mrk=%u unc=%u\n",
+-		   atomic_read(&fscache_n_marks),
+-		   atomic_read(&fscache_n_uncaches));
++		   atomic_read_unchecked(&fscache_n_marks),
++		   atomic_read_unchecked(&fscache_n_uncaches));
+ 
+ 	seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
+ 		   " oom=%u\n",
+-		   atomic_read(&fscache_n_acquires),
+-		   atomic_read(&fscache_n_acquires_null),
+-		   atomic_read(&fscache_n_acquires_no_cache),
+-		   atomic_read(&fscache_n_acquires_ok),
+-		   atomic_read(&fscache_n_acquires_nobufs),
+-		   atomic_read(&fscache_n_acquires_oom));
++		   atomic_read_unchecked(&fscache_n_acquires),
++		   atomic_read_unchecked(&fscache_n_acquires_null),
++		   atomic_read_unchecked(&fscache_n_acquires_no_cache),
++		   atomic_read_unchecked(&fscache_n_acquires_ok),
++		   atomic_read_unchecked(&fscache_n_acquires_nobufs),
++		   atomic_read_unchecked(&fscache_n_acquires_oom));
+ 
+ 	seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
+-		   atomic_read(&fscache_n_object_lookups),
+-		   atomic_read(&fscache_n_object_lookups_negative),
+-		   atomic_read(&fscache_n_object_lookups_positive),
+-		   atomic_read(&fscache_n_object_lookups_timed_out),
+-		   atomic_read(&fscache_n_object_created));
++		   atomic_read_unchecked(&fscache_n_object_lookups),
++		   atomic_read_unchecked(&fscache_n_object_lookups_negative),
++		   atomic_read_unchecked(&fscache_n_object_lookups_positive),
++		   atomic_read_unchecked(&fscache_n_object_lookups_timed_out),
++		   atomic_read_unchecked(&fscache_n_object_created));
+ 
+ 	seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
+-		   atomic_read(&fscache_n_updates),
+-		   atomic_read(&fscache_n_updates_null),
+-		   atomic_read(&fscache_n_updates_run));
++		   atomic_read_unchecked(&fscache_n_updates),
++		   atomic_read_unchecked(&fscache_n_updates_null),
++		   atomic_read_unchecked(&fscache_n_updates_run));
+ 
+ 	seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
+-		   atomic_read(&fscache_n_relinquishes),
+-		   atomic_read(&fscache_n_relinquishes_null),
+-		   atomic_read(&fscache_n_relinquishes_waitcrt),
+-		   atomic_read(&fscache_n_relinquishes_retire));
++		   atomic_read_unchecked(&fscache_n_relinquishes),
++		   atomic_read_unchecked(&fscache_n_relinquishes_null),
++		   atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
++		   atomic_read_unchecked(&fscache_n_relinquishes_retire));
+ 
+ 	seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
+-		   atomic_read(&fscache_n_attr_changed),
+-		   atomic_read(&fscache_n_attr_changed_ok),
+-		   atomic_read(&fscache_n_attr_changed_nobufs),
+-		   atomic_read(&fscache_n_attr_changed_nomem),
+-		   atomic_read(&fscache_n_attr_changed_calls));
++		   atomic_read_unchecked(&fscache_n_attr_changed),
++		   atomic_read_unchecked(&fscache_n_attr_changed_ok),
++		   atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
++		   atomic_read_unchecked(&fscache_n_attr_changed_nomem),
++		   atomic_read_unchecked(&fscache_n_attr_changed_calls));
+ 
+ 	seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
+-		   atomic_read(&fscache_n_allocs),
+-		   atomic_read(&fscache_n_allocs_ok),
+-		   atomic_read(&fscache_n_allocs_wait),
+-		   atomic_read(&fscache_n_allocs_nobufs),
+-		   atomic_read(&fscache_n_allocs_intr));
++		   atomic_read_unchecked(&fscache_n_allocs),
++		   atomic_read_unchecked(&fscache_n_allocs_ok),
++		   atomic_read_unchecked(&fscache_n_allocs_wait),
++		   atomic_read_unchecked(&fscache_n_allocs_nobufs),
++		   atomic_read_unchecked(&fscache_n_allocs_intr));
+ 	seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
+-		   atomic_read(&fscache_n_alloc_ops),
+-		   atomic_read(&fscache_n_alloc_op_waits),
+-		   atomic_read(&fscache_n_allocs_object_dead));
++		   atomic_read_unchecked(&fscache_n_alloc_ops),
++		   atomic_read_unchecked(&fscache_n_alloc_op_waits),
++		   atomic_read_unchecked(&fscache_n_allocs_object_dead));
+ 
+ 	seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
+ 		   " int=%u oom=%u\n",
+-		   atomic_read(&fscache_n_retrievals),
+-		   atomic_read(&fscache_n_retrievals_ok),
+-		   atomic_read(&fscache_n_retrievals_wait),
+-		   atomic_read(&fscache_n_retrievals_nodata),
+-		   atomic_read(&fscache_n_retrievals_nobufs),
+-		   atomic_read(&fscache_n_retrievals_intr),
+-		   atomic_read(&fscache_n_retrievals_nomem));
++		   atomic_read_unchecked(&fscache_n_retrievals),
++		   atomic_read_unchecked(&fscache_n_retrievals_ok),
++		   atomic_read_unchecked(&fscache_n_retrievals_wait),
++		   atomic_read_unchecked(&fscache_n_retrievals_nodata),
++		   atomic_read_unchecked(&fscache_n_retrievals_nobufs),
++		   atomic_read_unchecked(&fscache_n_retrievals_intr),
++		   atomic_read_unchecked(&fscache_n_retrievals_nomem));
+ 	seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
+-		   atomic_read(&fscache_n_retrieval_ops),
+-		   atomic_read(&fscache_n_retrieval_op_waits),
+-		   atomic_read(&fscache_n_retrievals_object_dead));
++		   atomic_read_unchecked(&fscache_n_retrieval_ops),
++		   atomic_read_unchecked(&fscache_n_retrieval_op_waits),
++		   atomic_read_unchecked(&fscache_n_retrievals_object_dead));
+ 
+ 	seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
+-		   atomic_read(&fscache_n_stores),
+-		   atomic_read(&fscache_n_stores_ok),
+-		   atomic_read(&fscache_n_stores_again),
+-		   atomic_read(&fscache_n_stores_nobufs),
+-		   atomic_read(&fscache_n_stores_oom));
++		   atomic_read_unchecked(&fscache_n_stores),
++		   atomic_read_unchecked(&fscache_n_stores_ok),
++		   atomic_read_unchecked(&fscache_n_stores_again),
++		   atomic_read_unchecked(&fscache_n_stores_nobufs),
++		   atomic_read_unchecked(&fscache_n_stores_oom));
+ 	seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
+-		   atomic_read(&fscache_n_store_ops),
+-		   atomic_read(&fscache_n_store_calls),
+-		   atomic_read(&fscache_n_store_pages),
+-		   atomic_read(&fscache_n_store_radix_deletes),
+-		   atomic_read(&fscache_n_store_pages_over_limit));
++		   atomic_read_unchecked(&fscache_n_store_ops),
++		   atomic_read_unchecked(&fscache_n_store_calls),
++		   atomic_read_unchecked(&fscache_n_store_pages),
++		   atomic_read_unchecked(&fscache_n_store_radix_deletes),
++		   atomic_read_unchecked(&fscache_n_store_pages_over_limit));
+ 
+ 	seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
+-		   atomic_read(&fscache_n_store_vmscan_not_storing),
+-		   atomic_read(&fscache_n_store_vmscan_gone),
+-		   atomic_read(&fscache_n_store_vmscan_busy),
+-		   atomic_read(&fscache_n_store_vmscan_cancelled));
++		   atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
++		   atomic_read_unchecked(&fscache_n_store_vmscan_gone),
++		   atomic_read_unchecked(&fscache_n_store_vmscan_busy),
++		   atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
+ 
+ 	seq_printf(m, "Ops    : pend=%u run=%u enq=%u can=%u rej=%u\n",
+-		   atomic_read(&fscache_n_op_pend),
+-		   atomic_read(&fscache_n_op_run),
+-		   atomic_read(&fscache_n_op_enqueue),
+-		   atomic_read(&fscache_n_op_cancelled),
+-		   atomic_read(&fscache_n_op_rejected));
++		   atomic_read_unchecked(&fscache_n_op_pend),
++		   atomic_read_unchecked(&fscache_n_op_run),
++		   atomic_read_unchecked(&fscache_n_op_enqueue),
++		   atomic_read_unchecked(&fscache_n_op_cancelled),
++		   atomic_read_unchecked(&fscache_n_op_rejected));
+ 	seq_printf(m, "Ops    : dfr=%u rel=%u gc=%u\n",
+-		   atomic_read(&fscache_n_op_deferred_release),
+-		   atomic_read(&fscache_n_op_release),
+-		   atomic_read(&fscache_n_op_gc));
++		   atomic_read_unchecked(&fscache_n_op_deferred_release),
++		   atomic_read_unchecked(&fscache_n_op_release),
++		   atomic_read_unchecked(&fscache_n_op_gc));
+ 
+ 	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
+ 		   atomic_read(&fscache_n_cop_alloc_object),
+diff -urNp linux-2.6.32.40/fs/fs_struct.c linux-2.6.32.40/fs/fs_struct.c
+--- linux-2.6.32.40/fs/fs_struct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fs_struct.c	2011-04-17 15:56:46.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -33145,9 +38074,9 @@ diff -urNp linux-2.6.32.39/fs/fs_struct.c linux-2.6.32.39/fs/fs_struct.c
  		write_unlock(&fs->lock);
  
  		task_unlock(current);
-diff -urNp linux-2.6.32.39/fs/fuse/cuse.c linux-2.6.32.39/fs/fuse/cuse.c
---- linux-2.6.32.39/fs/fuse/cuse.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fuse/cuse.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fuse/cuse.c linux-2.6.32.40/fs/fuse/cuse.c
+--- linux-2.6.32.40/fs/fuse/cuse.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fuse/cuse.c	2011-04-17 15:56:46.000000000 -0400
 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
  	return rc;
  }
@@ -33182,9 +38111,9 @@ diff -urNp linux-2.6.32.39/fs/fuse/cuse.c linux-2.6.32.39/fs/fuse/cuse.c
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
  		return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.32.39/fs/fuse/dev.c linux-2.6.32.39/fs/fuse/dev.c
---- linux-2.6.32.39/fs/fuse/dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fuse/dev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fuse/dev.c linux-2.6.32.40/fs/fuse/dev.c
+--- linux-2.6.32.40/fs/fuse/dev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fuse/dev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -745,7 +745,7 @@ __releases(&fc->lock)
   * request_end().  Otherwise add it to the processing list, and set
   * the 'sent' flag.
@@ -33290,9 +38219,9 @@ diff -urNp linux-2.6.32.39/fs/fuse/dev.c linux-2.6.32.39/fs/fuse/dev.c
  
  const struct file_operations fuse_dev_operations = {
  	.owner		= THIS_MODULE,
-diff -urNp linux-2.6.32.39/fs/fuse/dir.c linux-2.6.32.39/fs/fuse/dir.c
---- linux-2.6.32.39/fs/fuse/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fuse/dir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fuse/dir.c linux-2.6.32.40/fs/fuse/dir.c
+--- linux-2.6.32.40/fs/fuse/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fuse/dir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
@@ -33302,9 +38231,9 @@ diff -urNp linux-2.6.32.39/fs/fuse/dir.c linux-2.6.32.39/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-2.6.32.39/fs/fuse/fuse_i.h linux-2.6.32.39/fs/fuse/fuse_i.h
---- linux-2.6.32.39/fs/fuse/fuse_i.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/fuse/fuse_i.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/fuse/fuse_i.h linux-2.6.32.40/fs/fuse/fuse_i.h
+--- linux-2.6.32.40/fs/fuse/fuse_i.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/fuse/fuse_i.h	2011-04-17 15:56:46.000000000 -0400
 @@ -525,6 +525,16 @@ extern const struct file_operations fuse
  
  extern const struct dentry_operations fuse_dentry_operations;
@@ -33322,9 +38251,9 @@ diff -urNp linux-2.6.32.39/fs/fuse/fuse_i.h linux-2.6.32.39/fs/fuse/fuse_i.h
  /**
   * Inode to nodeid comparison.
   */
-diff -urNp linux-2.6.32.39/fs/gfs2/sys.c linux-2.6.32.39/fs/gfs2/sys.c
---- linux-2.6.32.39/fs/gfs2/sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/gfs2/sys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/gfs2/sys.c linux-2.6.32.40/fs/gfs2/sys.c
+--- linux-2.6.32.40/fs/gfs2/sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/gfs2/sys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
  	return a->store ? a->store(sdp, buf, len) : len;
  }
@@ -33343,9 +38272,9 @@ diff -urNp linux-2.6.32.39/fs/gfs2/sys.c linux-2.6.32.39/fs/gfs2/sys.c
  	.uevent = gfs2_uevent,
  };
  
-diff -urNp linux-2.6.32.39/fs/hugetlbfs/inode.c linux-2.6.32.39/fs/hugetlbfs/inode.c
---- linux-2.6.32.39/fs/hugetlbfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/hugetlbfs/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/hugetlbfs/inode.c linux-2.6.32.40/fs/hugetlbfs/inode.c
+--- linux-2.6.32.40/fs/hugetlbfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/hugetlbfs/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
@@ -33355,9 +38284,9 @@ diff -urNp linux-2.6.32.39/fs/hugetlbfs/inode.c linux-2.6.32.39/fs/hugetlbfs/ino
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-2.6.32.39/fs/ioctl.c linux-2.6.32.39/fs/ioctl.c
---- linux-2.6.32.39/fs/ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ioctl.c linux-2.6.32.40/fs/ioctl.c
+--- linux-2.6.32.40/fs/ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
  			    u64 phys, u64 len, u32 flags)
  {
@@ -33385,9 +38314,9 @@ diff -urNp linux-2.6.32.39/fs/ioctl.c linux-2.6.32.39/fs/ioctl.c
  		error = -EFAULT;
  
  	return error;
-diff -urNp linux-2.6.32.39/fs/jffs2/erase.c linux-2.6.32.39/fs/jffs2/erase.c
---- linux-2.6.32.39/fs/jffs2/erase.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/jffs2/erase.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/jffs2/erase.c linux-2.6.32.40/fs/jffs2/erase.c
+--- linux-2.6.32.40/fs/jffs2/erase.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/jffs2/erase.c	2011-04-17 15:56:46.000000000 -0400
 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -33398,9 +38327,9 @@ diff -urNp linux-2.6.32.39/fs/jffs2/erase.c linux-2.6.32.39/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.32.39/fs/jffs2/wbuf.c linux-2.6.32.39/fs/jffs2/wbuf.c
---- linux-2.6.32.39/fs/jffs2/wbuf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/jffs2/wbuf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/jffs2/wbuf.c linux-2.6.32.40/fs/jffs2/wbuf.c
+--- linux-2.6.32.40/fs/jffs2/wbuf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/jffs2/wbuf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -33411,9 +38340,9 @@ diff -urNp linux-2.6.32.39/fs/jffs2/wbuf.c linux-2.6.32.39/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.32.39/fs/Kconfig.binfmt linux-2.6.32.39/fs/Kconfig.binfmt
---- linux-2.6.32.39/fs/Kconfig.binfmt	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/Kconfig.binfmt	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/Kconfig.binfmt linux-2.6.32.40/fs/Kconfig.binfmt
+--- linux-2.6.32.40/fs/Kconfig.binfmt	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/Kconfig.binfmt	2011-04-17 15:56:46.000000000 -0400
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -33423,35 +38352,51 @@ diff -urNp linux-2.6.32.39/fs/Kconfig.binfmt linux-2.6.32.39/fs/Kconfig.binfmt
  	---help---
  	  A.out (Assembler.OUTput) is a set of formats for libraries and
  	  executables used in the earliest versions of UNIX.  Linux used
-diff -urNp linux-2.6.32.39/fs/libfs.c linux-2.6.32.39/fs/libfs.c
---- linux-2.6.32.39/fs/libfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/libfs.c	2011-04-23 13:36:01.000000000 -0400
-@@ -132,6 +132,8 @@ int dcache_readdir(struct file * filp, v
- 	struct dentry *dentry = filp->f_path.dentry;
- 	struct dentry *cursor = filp->private_data;
- 	struct list_head *p, *q = &cursor->d_u.d_child;
-+	char d_name[DNAME_INLINE_LEN];
-+	const char *name;
- 	ino_t ino;
- 	int i = filp->f_pos;
- 
-@@ -162,7 +164,12 @@ int dcache_readdir(struct file * filp, v
+diff -urNp linux-2.6.32.40/fs/libfs.c linux-2.6.32.40/fs/libfs.c
+--- linux-2.6.32.40/fs/libfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/libfs.c	2011-05-11 18:25:15.000000000 -0400
+@@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, v
+ 
+ 			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ 				struct dentry *next;
++				char d_name[sizeof(next->d_iname)];
++				const unsigned char *name;
++
+ 				next = list_entry(p, struct dentry, d_u.d_child);
+ 				if (d_unhashed(next) || !next->d_inode)
  					continue;
  
  				spin_unlock(&dcache_lock);
 -				if (filldir(dirent, next->d_name.name, 
-+				if (next->d_name.len < DNAME_INLINE_LEN) {
-+					memcpy(d_name, next->d_name.name, next->d_name.len);
++				name = next->d_name.name;
++				if (name == next->d_iname) {
++					memcpy(d_name, name, next->d_name.len);
 +					name = d_name;
-+				} else
-+					name = next->d_name.name;
++				}
 +				if (filldir(dirent, name, 
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff -urNp linux-2.6.32.39/fs/lockd/svc.c linux-2.6.32.39/fs/lockd/svc.c
---- linux-2.6.32.39/fs/lockd/svc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/lockd/svc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/lockd/clntproc.c linux-2.6.32.40/fs/lockd/clntproc.c
+--- linux-2.6.32.40/fs/lockd/clntproc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/lockd/clntproc.c	2011-05-04 17:56:28.000000000 -0400
+@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
+ /*
+  * Cookie counter for NLM requests
+  */
+-static atomic_t	nlm_cookie = ATOMIC_INIT(0x1234);
++static atomic_unchecked_t	nlm_cookie = ATOMIC_INIT(0x1234);
+ 
+ void nlmclnt_next_cookie(struct nlm_cookie *c)
+ {
+-	u32	cookie = atomic_inc_return(&nlm_cookie);
++	u32	cookie = atomic_inc_return_unchecked(&nlm_cookie);
+ 
+ 	memcpy(c->data, &cookie, 4);
+ 	c->len=4;
+diff -urNp linux-2.6.32.40/fs/lockd/svc.c linux-2.6.32.40/fs/lockd/svc.c
+--- linux-2.6.32.40/fs/lockd/svc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/lockd/svc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@
  
  static struct svc_program	nlmsvc_program;
@@ -33461,9 +38406,9 @@ diff -urNp linux-2.6.32.39/fs/lockd/svc.c linux-2.6.32.39/fs/lockd/svc.c
  EXPORT_SYMBOL_GPL(nlmsvc_ops);
  
  static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.32.39/fs/locks.c linux-2.6.32.39/fs/locks.c
---- linux-2.6.32.39/fs/locks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/locks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/locks.c linux-2.6.32.40/fs/locks.c
+--- linux-2.6.32.40/fs/locks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/locks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
@@ -33485,9 +38430,9 @@ diff -urNp linux-2.6.32.39/fs/locks.c linux-2.6.32.39/fs/locks.c
  	}
  
  	lock_kernel();
-diff -urNp linux-2.6.32.39/fs/namei.c linux-2.6.32.39/fs/namei.c
---- linux-2.6.32.39/fs/namei.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/namei.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/namei.c linux-2.6.32.40/fs/namei.c
+--- linux-2.6.32.40/fs/namei.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/namei.c	2011-04-17 15:56:46.000000000 -0400
 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -33914,9 +38859,9 @@ diff -urNp linux-2.6.32.39/fs/namei.c linux-2.6.32.39/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-2.6.32.39/fs/namespace.c linux-2.6.32.39/fs/namespace.c
---- linux-2.6.32.39/fs/namespace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/namespace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/namespace.c linux-2.6.32.40/fs/namespace.c
+--- linux-2.6.32.40/fs/namespace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/namespace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -33977,10 +38922,10 @@ diff -urNp linux-2.6.32.39/fs/namespace.c linux-2.6.32.39/fs/namespace.c
  	read_lock(&current->fs->lock);
  	root = current->fs->root;
  	path_get(&current->fs->root);
-diff -urNp linux-2.6.32.39/fs/nfs/inode.c linux-2.6.32.39/fs/nfs/inode.c
---- linux-2.6.32.39/fs/nfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/nfs/inode.c	2011-04-17 15:56:46.000000000 -0400
-@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
+diff -urNp linux-2.6.32.40/fs/nfs/inode.c linux-2.6.32.40/fs/nfs/inode.c
+--- linux-2.6.32.40/fs/nfs/inode.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/fs/nfs/inode.c	2011-05-10 22:12:33.000000000 -0400
+@@ -973,16 +973,16 @@ static int nfs_size_need_update(const st
  	return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -34000,9 +38945,9 @@ diff -urNp linux-2.6.32.39/fs/nfs/inode.c linux-2.6.32.39/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.32.39/fs/nfsd/lockd.c linux-2.6.32.39/fs/nfsd/lockd.c
---- linux-2.6.32.39/fs/nfsd/lockd.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/fs/nfsd/lockd.c	2011-04-17 17:03:15.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/nfsd/lockd.c linux-2.6.32.40/fs/nfsd/lockd.c
+--- linux-2.6.32.40/fs/nfsd/lockd.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/fs/nfsd/lockd.c	2011-04-17 17:03:15.000000000 -0400
 @@ -66,7 +66,7 @@ nlm_fclose(struct file *filp)
  	fput(filp);
  }
@@ -34012,9 +38957,9 @@ diff -urNp linux-2.6.32.39/fs/nfsd/lockd.c linux-2.6.32.39/fs/nfsd/lockd.c
  	.fopen		= nlm_fopen,		/* open file for locking */
  	.fclose		= nlm_fclose,		/* close file */
  };
-diff -urNp linux-2.6.32.39/fs/nfsd/vfs.c linux-2.6.32.39/fs/nfsd/vfs.c
---- linux-2.6.32.39/fs/nfsd/vfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/nfsd/vfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/nfsd/vfs.c linux-2.6.32.40/fs/nfsd/vfs.c
+--- linux-2.6.32.40/fs/nfsd/vfs.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/fs/nfsd/vfs.c	2011-05-10 22:12:33.000000000 -0400
 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -34033,7 +38978,7 @@ diff -urNp linux-2.6.32.39/fs/nfsd/vfs.c linux-2.6.32.39/fs/nfsd/vfs.c
  	set_fs(oldfs);
  	if (host_err < 0)
  		goto out_nfserr;
-@@ -1535,7 +1535,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1542,7 +1542,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
  	 */
  
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -34042,9 +38987,21 @@ diff -urNp linux-2.6.32.39/fs/nfsd/vfs.c linux-2.6.32.39/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-2.6.32.39/fs/notify/dnotify/dnotify.c linux-2.6.32.39/fs/notify/dnotify/dnotify.c
---- linux-2.6.32.39/fs/notify/dnotify/dnotify.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/notify/dnotify/dnotify.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/nilfs2/ioctl.c linux-2.6.32.40/fs/nilfs2/ioctl.c
+--- linux-2.6.32.40/fs/nilfs2/ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/nilfs2/ioctl.c	2011-05-04 17:56:28.000000000 -0400
+@@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(st
+ 				      unsigned int cmd, void __user *argp)
+ {
+ 	struct nilfs_argv argv[5];
+-	const static size_t argsz[5] = {
++	static const size_t argsz[5] = {
+ 		sizeof(struct nilfs_vdesc),
+ 		sizeof(struct nilfs_period),
+ 		sizeof(__u64),
+diff -urNp linux-2.6.32.40/fs/notify/dnotify/dnotify.c linux-2.6.32.40/fs/notify/dnotify/dnotify.c
+--- linux-2.6.32.40/fs/notify/dnotify/dnotify.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/notify/dnotify/dnotify.c	2011-04-17 15:56:46.000000000 -0400
 @@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn
  	kmem_cache_free(dnotify_mark_entry_cache, dnentry);
  }
@@ -34054,9 +39011,30 @@ diff -urNp linux-2.6.32.39/fs/notify/dnotify/dnotify.c linux-2.6.32.39/fs/notify
  	.handle_event = dnotify_handle_event,
  	.should_send_event = dnotify_should_send_event,
  	.free_group_priv = NULL,
-diff -urNp linux-2.6.32.39/fs/ntfs/dir.c linux-2.6.32.39/fs/ntfs/dir.c
---- linux-2.6.32.39/fs/ntfs/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ntfs/dir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/notify/notification.c linux-2.6.32.40/fs/notify/notification.c
+--- linux-2.6.32.40/fs/notify/notification.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/notify/notification.c	2011-05-04 17:56:28.000000000 -0400
+@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
+  * get set to 0 so it will never get 'freed'
+  */
+ static struct fsnotify_event q_overflow_event;
+-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
++static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
+ 
+ /**
+  * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
+@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = A
+  */
+ u32 fsnotify_get_cookie(void)
+ {
+-	return atomic_inc_return(&fsnotify_sync_cookie);
++	return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
+ }
+ EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
+ 
+diff -urNp linux-2.6.32.40/fs/ntfs/dir.c linux-2.6.32.40/fs/ntfs/dir.c
+--- linux-2.6.32.40/fs/ntfs/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ntfs/dir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1328,7 +1328,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -34066,9 +39044,9 @@ diff -urNp linux-2.6.32.39/fs/ntfs/dir.c linux-2.6.32.39/fs/ntfs/dir.c
  		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
  				"inode 0x%lx or driver bug.", vdir->i_ino);
  		goto err_out;
-diff -urNp linux-2.6.32.39/fs/ntfs/file.c linux-2.6.32.39/fs/ntfs/file.c
---- linux-2.6.32.39/fs/ntfs/file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ntfs/file.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ntfs/file.c linux-2.6.32.40/fs/ntfs/file.c
+--- linux-2.6.32.40/fs/ntfs/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ntfs/file.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -34078,9 +39056,9 @@ diff -urNp linux-2.6.32.39/fs/ntfs/file.c linux-2.6.32.39/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.32.39/fs/ocfs2/cluster/masklog.c linux-2.6.32.39/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.39/fs/ocfs2/cluster/masklog.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ocfs2/cluster/masklog.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ocfs2/cluster/masklog.c linux-2.6.32.40/fs/ocfs2/cluster/masklog.c
+--- linux-2.6.32.40/fs/ocfs2/cluster/masklog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ocfs2/cluster/masklog.c	2011-04-17 15:56:46.000000000 -0400
 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
  	return mlog_mask_store(mlog_attr->mask, buf, count);
  }
@@ -34090,9 +39068,9 @@ diff -urNp linux-2.6.32.39/fs/ocfs2/cluster/masklog.c linux-2.6.32.39/fs/ocfs2/c
  	.show  = mlog_show,
  	.store = mlog_store,
  };
-diff -urNp linux-2.6.32.39/fs/ocfs2/localalloc.c linux-2.6.32.39/fs/ocfs2/localalloc.c
---- linux-2.6.32.39/fs/ocfs2/localalloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ocfs2/localalloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ocfs2/localalloc.c linux-2.6.32.40/fs/ocfs2/localalloc.c
+--- linux-2.6.32.40/fs/ocfs2/localalloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ocfs2/localalloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
@@ -34102,9 +39080,9 @@ diff -urNp linux-2.6.32.39/fs/ocfs2/localalloc.c linux-2.6.32.39/fs/ocfs2/locala
  
  	status = 0;
  bail:
-diff -urNp linux-2.6.32.39/fs/ocfs2/ocfs2.h linux-2.6.32.39/fs/ocfs2/ocfs2.h
---- linux-2.6.32.39/fs/ocfs2/ocfs2.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ocfs2/ocfs2.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ocfs2/ocfs2.h linux-2.6.32.40/fs/ocfs2/ocfs2.h
+--- linux-2.6.32.40/fs/ocfs2/ocfs2.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ocfs2/ocfs2.h	2011-04-17 15:56:46.000000000 -0400
 @@ -217,11 +217,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -34122,9 +39100,9 @@ diff -urNp linux-2.6.32.39/fs/ocfs2/ocfs2.h linux-2.6.32.39/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.32.39/fs/ocfs2/suballoc.c linux-2.6.32.39/fs/ocfs2/suballoc.c
---- linux-2.6.32.39/fs/ocfs2/suballoc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ocfs2/suballoc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ocfs2/suballoc.c linux-2.6.32.40/fs/ocfs2/suballoc.c
+--- linux-2.6.32.40/fs/ocfs2/suballoc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ocfs2/suballoc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
@@ -34170,9 +39148,9 @@ diff -urNp linux-2.6.32.39/fs/ocfs2/suballoc.c linux-2.6.32.39/fs/ocfs2/suballoc
  		}
  	}
  	if (status < 0) {
-diff -urNp linux-2.6.32.39/fs/ocfs2/super.c linux-2.6.32.39/fs/ocfs2/super.c
---- linux-2.6.32.39/fs/ocfs2/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/ocfs2/super.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/ocfs2/super.c linux-2.6.32.40/fs/ocfs2/super.c
+--- linux-2.6.32.40/fs/ocfs2/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/ocfs2/super.c	2011-04-17 15:56:46.000000000 -0400
 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -34207,9 +39185,9 @@ diff -urNp linux-2.6.32.39/fs/ocfs2/super.c linux-2.6.32.39/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.32.39/fs/open.c linux-2.6.32.39/fs/open.c
---- linux-2.6.32.39/fs/open.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/open.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/open.c linux-2.6.32.40/fs/open.c
+--- linux-2.6.32.40/fs/open.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/open.c	2011-04-17 15:56:46.000000000 -0400
 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -34394,33 +39372,18 @@ diff -urNp linux-2.6.32.39/fs/open.c linux-2.6.32.39/fs/open.c
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-2.6.32.39/fs/partitions/ldm.c linux-2.6.32.39/fs/partitions/ldm.c
---- linux-2.6.32.39/fs/partitions/ldm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/partitions/ldm.c	2011-04-18 19:31:12.000000000 -0400
-@@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data
- 
- 	BUG_ON (!data || !frags);
- 
-+	if (size < 2 * VBLK_SIZE_HEAD) {
-+		ldm_error("Value of size is to small.");
-+		return false;
-+	}
-+
- 	group = get_unaligned_be32(data + 0x08);
- 	rec   = get_unaligned_be16(data + 0x0C);
- 	num   = get_unaligned_be16(data + 0x0E);
-@@ -1307,13 +1312,18 @@ static bool ldm_frag_add (const u8 *data
+diff -urNp linux-2.6.32.40/fs/partitions/ldm.c linux-2.6.32.40/fs/partitions/ldm.c
+--- linux-2.6.32.40/fs/partitions/ldm.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/fs/partitions/ldm.c	2011-04-18 19:31:12.000000000 -0400
+@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
+ 		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
  	}
- 
-+	if (rec >= num) {
-+		ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
-+		return false;
-+	}
 +
- 	list_for_each (item, frags) {
- 		f = list_entry (item, struct frag, list);
- 		if (f->group == group)
+ 	if (rec >= num) {
+ 		ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
+ 		return false;
+@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data
  			goto found;
  	}
  
@@ -34429,23 +39392,9 @@ diff -urNp linux-2.6.32.39/fs/partitions/ldm.c linux-2.6.32.39/fs/partitions/ldm
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-@@ -1334,10 +1344,9 @@ found:
- 
- 	f->map |= (1 << rec);
- 
--	if (num > 0) {
--		data += VBLK_SIZE_HEAD;
--		size -= VBLK_SIZE_HEAD;
--	}
-+	data += VBLK_SIZE_HEAD;
-+	size -= VBLK_SIZE_HEAD;
-+
- 	memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size);
- 
- 	return true;
-diff -urNp linux-2.6.32.39/fs/partitions/mac.c linux-2.6.32.39/fs/partitions/mac.c
---- linux-2.6.32.39/fs/partitions/mac.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/partitions/mac.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/partitions/mac.c linux-2.6.32.40/fs/partitions/mac.c
+--- linux-2.6.32.40/fs/partitions/mac.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/partitions/mac.c	2011-04-17 15:56:46.000000000 -0400
 @@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio
  		return 0;		/* not a MacOS disk */
  	}
@@ -34459,9 +39408,9 @@ diff -urNp linux-2.6.32.39/fs/partitions/mac.c linux-2.6.32.39/fs/partitions/mac
  	for (slot = 1; slot <= blocks_in_map; ++slot) {
  		int pos = slot * secsize;
  		put_dev_sector(sect);
-diff -urNp linux-2.6.32.39/fs/pipe.c linux-2.6.32.39/fs/pipe.c
---- linux-2.6.32.39/fs/pipe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/pipe.c	2011-04-23 13:37:17.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/pipe.c linux-2.6.32.40/fs/pipe.c
+--- linux-2.6.32.40/fs/pipe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/pipe.c	2011-04-23 13:37:17.000000000 -0400
 @@ -401,9 +401,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -34585,9 +39534,9 @@ diff -urNp linux-2.6.32.39/fs/pipe.c linux-2.6.32.39/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-2.6.32.39/fs/proc/array.c linux-2.6.32.39/fs/proc/array.c
---- linux-2.6.32.39/fs/proc/array.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/array.c	2011-04-20 18:18:31.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/array.c linux-2.6.32.40/fs/proc/array.c
+--- linux-2.6.32.40/fs/proc/array.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/array.c	2011-05-10 21:30:39.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -34643,6 +39592,15 @@ diff -urNp linux-2.6.32.39/fs/proc/array.c linux-2.6.32.39/fs/proc/array.c
  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task, int whole)
  {
+@@ -358,7 +389,7 @@ static int do_task_stat(struct seq_file 
+ 	cputime_t cutime, cstime, utime, stime;
+ 	cputime_t cgtime, gtime;
+ 	unsigned long rsslim = 0;
+-	char tcomm[sizeof(task->comm)];
++	char tcomm[sizeof(task->comm)] = { 0 };
+ 	unsigned long flags;
+ 
+ 	state = *get_task_state(task);
 @@ -433,6 +464,19 @@ static int do_task_stat(struct seq_file 
  		gtime = task_gtime(task);
  	}
@@ -34698,9 +39656,9 @@ diff -urNp linux-2.6.32.39/fs/proc/array.c linux-2.6.32.39/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.32.39/fs/proc/base.c linux-2.6.32.39/fs/proc/base.c
---- linux-2.6.32.39/fs/proc/base.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/base.c	2011-04-22 19:16:44.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/base.c linux-2.6.32.40/fs/proc/base.c
+--- linux-2.6.32.40/fs/proc/base.c	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.40/fs/proc/base.c	2011-04-22 19:16:44.000000000 -0400
 @@ -102,6 +102,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -35126,9 +40084,9 @@ diff -urNp linux-2.6.32.39/fs/proc/base.c linux-2.6.32.39/fs/proc/base.c
  	ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.32.39/fs/proc/cmdline.c linux-2.6.32.39/fs/proc/cmdline.c
---- linux-2.6.32.39/fs/proc/cmdline.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/cmdline.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/cmdline.c linux-2.6.32.40/fs/proc/cmdline.c
+--- linux-2.6.32.40/fs/proc/cmdline.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/cmdline.c	2011-04-17 15:56:46.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -35141,9 +40099,9 @@ diff -urNp linux-2.6.32.39/fs/proc/cmdline.c linux-2.6.32.39/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.32.39/fs/proc/devices.c linux-2.6.32.39/fs/proc/devices.c
---- linux-2.6.32.39/fs/proc/devices.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/devices.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/devices.c linux-2.6.32.40/fs/proc/devices.c
+--- linux-2.6.32.40/fs/proc/devices.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/devices.c	2011-04-17 15:56:46.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -35156,9 +40114,9 @@ diff -urNp linux-2.6.32.39/fs/proc/devices.c linux-2.6.32.39/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.32.39/fs/proc/inode.c linux-2.6.32.39/fs/proc/inode.c
---- linux-2.6.32.39/fs/proc/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/inode.c linux-2.6.32.40/fs/proc/inode.c
+--- linux-2.6.32.40/fs/proc/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
@@ -35171,9 +40129,9 @@ diff -urNp linux-2.6.32.39/fs/proc/inode.c linux-2.6.32.39/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-2.6.32.39/fs/proc/internal.h linux-2.6.32.39/fs/proc/internal.h
---- linux-2.6.32.39/fs/proc/internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/internal.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/internal.h linux-2.6.32.40/fs/proc/internal.h
+--- linux-2.6.32.40/fs/proc/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/internal.h	2011-04-17 15:56:46.000000000 -0400
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -35184,9 +40142,9 @@ diff -urNp linux-2.6.32.39/fs/proc/internal.h linux-2.6.32.39/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.32.39/fs/proc/Kconfig linux-2.6.32.39/fs/proc/Kconfig
---- linux-2.6.32.39/fs/proc/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/Kconfig linux-2.6.32.40/fs/proc/Kconfig
+--- linux-2.6.32.40/fs/proc/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -35214,9 +40172,9 @@ diff -urNp linux-2.6.32.39/fs/proc/Kconfig linux-2.6.32.39/fs/proc/Kconfig
  	bool "Enable /proc page monitoring" if EMBEDDED
   	help
  	  Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.32.39/fs/proc/kcore.c linux-2.6.32.39/fs/proc/kcore.c
---- linux-2.6.32.39/fs/proc/kcore.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/kcore.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/kcore.c linux-2.6.32.40/fs/proc/kcore.c
+--- linux-2.6.32.40/fs/proc/kcore.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/kcore.c	2011-04-17 15:56:46.000000000 -0400
 @@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
  	 * the addresses in the elf_phdr on our list.
  	 */
@@ -35275,9 +40233,9 @@ diff -urNp linux-2.6.32.39/fs/proc/kcore.c linux-2.6.32.39/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-2.6.32.39/fs/proc/meminfo.c linux-2.6.32.39/fs/proc/meminfo.c
---- linux-2.6.32.39/fs/proc/meminfo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/meminfo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/meminfo.c linux-2.6.32.40/fs/proc/meminfo.c
+--- linux-2.6.32.40/fs/proc/meminfo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/meminfo.c	2011-05-11 18:25:06.000000000 -0400
 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
  		vmi.used >> 10,
  		vmi.largest_chunk >> 10
@@ -35287,9 +40245,9 @@ diff -urNp linux-2.6.32.39/fs/proc/meminfo.c linux-2.6.32.39/fs/proc/meminfo.c
  #endif
  		);
  
-diff -urNp linux-2.6.32.39/fs/proc/nommu.c linux-2.6.32.39/fs/proc/nommu.c
---- linux-2.6.32.39/fs/proc/nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/nommu.c linux-2.6.32.40/fs/proc/nommu.c
+--- linux-2.6.32.40/fs/proc/nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
@@ -35299,9 +40257,9 @@ diff -urNp linux-2.6.32.39/fs/proc/nommu.c linux-2.6.32.39/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.32.39/fs/proc/proc_net.c linux-2.6.32.39/fs/proc/proc_net.c
---- linux-2.6.32.39/fs/proc/proc_net.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/proc_net.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/proc_net.c linux-2.6.32.40/fs/proc/proc_net.c
+--- linux-2.6.32.40/fs/proc/proc_net.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/proc_net.c	2011-04-17 15:56:46.000000000 -0400
 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
@@ -35320,9 +40278,9 @@ diff -urNp linux-2.6.32.39/fs/proc/proc_net.c linux-2.6.32.39/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.32.39/fs/proc/proc_sysctl.c linux-2.6.32.39/fs/proc/proc_sysctl.c
---- linux-2.6.32.39/fs/proc/proc_sysctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/proc_sysctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/proc_sysctl.c linux-2.6.32.40/fs/proc/proc_sysctl.c
+--- linux-2.6.32.40/fs/proc/proc_sysctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/proc_sysctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -7,6 +7,8 @@
  #include <linux/security.h>
  #include "internal.h"
@@ -35362,9 +40320,9 @@ diff -urNp linux-2.6.32.39/fs/proc/proc_sysctl.c linux-2.6.32.39/fs/proc/proc_sy
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.32.39/fs/proc/root.c linux-2.6.32.39/fs/proc/root.c
---- linux-2.6.32.39/fs/proc/root.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/root.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/root.c linux-2.6.32.40/fs/proc/root.c
+--- linux-2.6.32.40/fs/proc/root.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/root.c	2011-04-17 15:56:46.000000000 -0400
 @@ -134,7 +134,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
@@ -35381,9 +40339,9 @@ diff -urNp linux-2.6.32.39/fs/proc/root.c linux-2.6.32.39/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-2.6.32.39/fs/proc/task_mmu.c linux-2.6.32.39/fs/proc/task_mmu.c
---- linux-2.6.32.39/fs/proc/task_mmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/task_mmu.c	2011-04-23 13:38:09.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/task_mmu.c linux-2.6.32.40/fs/proc/task_mmu.c
+--- linux-2.6.32.40/fs/proc/task_mmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/task_mmu.c	2011-04-23 13:38:09.000000000 -0400
 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
  		"VmStk:\t%8lu kB\n"
  		"VmExe:\t%8lu kB\n"
@@ -35529,9 +40487,9 @@ diff -urNp linux-2.6.32.39/fs/proc/task_mmu.c linux-2.6.32.39/fs/proc/task_mmu.c
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-diff -urNp linux-2.6.32.39/fs/proc/task_nommu.c linux-2.6.32.39/fs/proc/task_nommu.c
---- linux-2.6.32.39/fs/proc/task_nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/proc/task_nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/proc/task_nommu.c linux-2.6.32.40/fs/proc/task_nommu.c
+--- linux-2.6.32.40/fs/proc/task_nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/proc/task_nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
@@ -35550,9 +40508,9 @@ diff -urNp linux-2.6.32.39/fs/proc/task_nommu.c linux-2.6.32.39/fs/proc/task_nom
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.32.39/fs/readdir.c linux-2.6.32.39/fs/readdir.c
---- linux-2.6.32.39/fs/readdir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/readdir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/readdir.c linux-2.6.32.40/fs/readdir.c
+--- linux-2.6.32.40/fs/readdir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/readdir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -35642,9 +40600,9 @@ diff -urNp linux-2.6.32.39/fs/readdir.c linux-2.6.32.39/fs/readdir.c
  	buf.count = count;
  	buf.error = 0;
  
-diff -urNp linux-2.6.32.39/fs/reiserfs/do_balan.c linux-2.6.32.39/fs/reiserfs/do_balan.c
---- linux-2.6.32.39/fs/reiserfs/do_balan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/reiserfs/do_balan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/reiserfs/do_balan.c linux-2.6.32.40/fs/reiserfs/do_balan.c
+--- linux-2.6.32.40/fs/reiserfs/do_balan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/reiserfs/do_balan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
@@ -35654,9 +40612,9 @@ diff -urNp linux-2.6.32.39/fs/reiserfs/do_balan.c linux-2.6.32.39/fs/reiserfs/do
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.32.39/fs/reiserfs/item_ops.c linux-2.6.32.39/fs/reiserfs/item_ops.c
---- linux-2.6.32.39/fs/reiserfs/item_ops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/reiserfs/item_ops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/reiserfs/item_ops.c linux-2.6.32.40/fs/reiserfs/item_ops.c
+--- linux-2.6.32.40/fs/reiserfs/item_ops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/reiserfs/item_ops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
  			 vi->vi_index, vi->vi_type, vi->vi_ih);
  }
@@ -35711,9 +40669,9 @@ diff -urNp linux-2.6.32.39/fs/reiserfs/item_ops.c linux-2.6.32.39/fs/reiserfs/it
  	&stat_data_ops,
  	&indirect_ops,
  	&direct_ops,
-diff -urNp linux-2.6.32.39/fs/reiserfs/procfs.c linux-2.6.32.39/fs/reiserfs/procfs.c
---- linux-2.6.32.39/fs/reiserfs/procfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/reiserfs/procfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/reiserfs/procfs.c linux-2.6.32.40/fs/reiserfs/procfs.c
+--- linux-2.6.32.40/fs/reiserfs/procfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/reiserfs/procfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -35723,9 +40681,9 @@ diff -urNp linux-2.6.32.39/fs/reiserfs/procfs.c linux-2.6.32.39/fs/reiserfs/proc
  		   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
  		   SF(s_do_balance), SF(s_unneeded_left_neighbor),
  		   SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.32.39/fs/select.c linux-2.6.32.39/fs/select.c
---- linux-2.6.32.39/fs/select.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/select.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/select.c linux-2.6.32.40/fs/select.c
+--- linux-2.6.32.40/fs/select.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/select.c	2011-05-11 18:26:03.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -35734,17 +40692,29 @@ diff -urNp linux-2.6.32.39/fs/select.c linux-2.6.32.39/fs/select.c
  #include <linux/personality.h> /* for STICKY_TIMEOUTS */
  #include <linux/file.h>
  #include <linux/fdtable.h>
-@@ -821,6 +822,7 @@ int do_sys_poll(struct pollfd __user *uf
+@@ -401,6 +402,8 @@ int do_select(int n, fd_set_bits *fds, s
+ 	int retval, i, timed_out = 0;
+ 	unsigned long slack = 0;
+ 
++	stackleak_probe(table);
++
+ 	rcu_read_lock();
+ 	retval = max_select_fd(n, fds);
+ 	rcu_read_unlock();
+@@ -821,6 +824,10 @@ int do_sys_poll(struct pollfd __user *uf
   	struct poll_list *walk = head;
   	unsigned long todo = nfds;
  
++	stackleak_probe(table);
++	stackleak_probe(stack_pps);
++
 +	gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
  	if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.39/fs/seq_file.c linux-2.6.32.39/fs/seq_file.c
---- linux-2.6.32.39/fs/seq_file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/seq_file.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/seq_file.c linux-2.6.32.40/fs/seq_file.c
+--- linux-2.6.32.40/fs/seq_file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/seq_file.c	2011-04-17 15:56:46.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -35785,9 +40755,9 @@ diff -urNp linux-2.6.32.39/fs/seq_file.c linux-2.6.32.39/fs/seq_file.c
  		if (!m->buf)
  			goto Enomem;
  		m->count = 0;
-diff -urNp linux-2.6.32.39/fs/smbfs/symlink.c linux-2.6.32.39/fs/smbfs/symlink.c
---- linux-2.6.32.39/fs/smbfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/smbfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/smbfs/symlink.c linux-2.6.32.40/fs/smbfs/symlink.c
+--- linux-2.6.32.40/fs/smbfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/smbfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
  
  static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -35797,9 +40767,9 @@ diff -urNp linux-2.6.32.39/fs/smbfs/symlink.c linux-2.6.32.39/fs/smbfs/symlink.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
---- linux-2.6.32.39/fs/splice.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/splice.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/splice.c linux-2.6.32.40/fs/splice.c
+--- linux-2.6.32.40/fs/splice.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/splice.c	2011-05-11 18:25:15.000000000 -0400
 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -35821,7 +40791,16 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  	}
  
  	pipe_unlock(pipe);
-@@ -521,7 +521,7 @@ static ssize_t kernel_readv(struct file 
+@@ -285,6 +285,8 @@ __generic_file_splice_read(struct file *
+ 		.spd_release = spd_release_page,
+ 	};
+ 
++	stackleak_probe(partial);
++
+ 	index = *ppos >> PAGE_CACHE_SHIFT;
+ 	loff = *ppos & ~PAGE_CACHE_MASK;
+ 	req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+@@ -521,7 +523,7 @@ static ssize_t kernel_readv(struct file 
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -35830,7 +40809,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  	set_fs(old_fs);
  
  	return res;
-@@ -536,7 +536,7 @@ static ssize_t kernel_write(struct file 
+@@ -536,7 +538,7 @@ static ssize_t kernel_write(struct file 
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -35839,7 +40818,16 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  	set_fs(old_fs);
  
  	return res;
-@@ -578,7 +578,7 @@ ssize_t default_file_splice_read(struct 
+@@ -565,6 +567,8 @@ ssize_t default_file_splice_read(struct 
+ 		.spd_release = spd_release_page,
+ 	};
+ 
++	stackleak_probe(partial);
++
+ 	index = *ppos >> PAGE_CACHE_SHIFT;
+ 	offset = *ppos & ~PAGE_CACHE_MASK;
+ 	nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+@@ -578,7 +582,7 @@ ssize_t default_file_splice_read(struct 
  			goto err;
  
  		this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
@@ -35848,7 +40836,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  		vec[i].iov_len = this_len;
  		pages[i] = page;
  		spd.nr_pages++;
-@@ -800,10 +800,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -800,10 +804,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
  int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
  {
  	while (!pipe->nrbufs) {
@@ -35861,7 +40849,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  			return 0;
  
  		if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1140,7 +1140,7 @@ ssize_t splice_direct_to_actor(struct fi
+@@ -1140,7 +1144,7 @@ ssize_t splice_direct_to_actor(struct fi
  		 * out of the pipe right after the splice_to_pipe(). So set
  		 * PIPE_READERS appropriately.
  		 */
@@ -35870,7 +40858,16 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  
  		current->splice_pipe = pipe;
  	}
-@@ -1700,9 +1700,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1592,6 +1596,8 @@ static long vmsplice_to_pipe(struct file
+ 		.spd_release = spd_release_page,
+ 	};
+ 
++	stackleak_probe(partial);
++
+ 	pipe = pipe_info(file->f_path.dentry->d_inode);
+ 	if (!pipe)
+ 		return -EBADF;
+@@ -1700,9 +1706,9 @@ static int ipipe_prep(struct pipe_inode_
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -35882,7 +40879,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  			if (flags & SPLICE_F_NONBLOCK) {
  				ret = -EAGAIN;
  				break;
-@@ -1734,7 +1734,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1734,7 +1740,7 @@ static int opipe_prep(struct pipe_inode_
  	pipe_lock(pipe);
  
  	while (pipe->nrbufs >= PIPE_BUFFERS) {
@@ -35891,7 +40888,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  			send_sig(SIGPIPE, current, 0);
  			ret = -EPIPE;
  			break;
-@@ -1747,9 +1747,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1747,9 +1753,9 @@ static int opipe_prep(struct pipe_inode_
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -35903,7 +40900,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  	}
  
  	pipe_unlock(pipe);
-@@ -1785,14 +1785,14 @@ retry:
+@@ -1785,14 +1791,14 @@ retry:
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -35920,7 +40917,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  			break;
  
  		/*
-@@ -1892,7 +1892,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1892,7 +1898,7 @@ static int link_pipe(struct pipe_inode_i
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -35929,7 +40926,7 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -1937,7 +1937,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1937,7 +1943,7 @@ static int link_pipe(struct pipe_inode_i
  	 * return EAGAIN if we have the potential of some data in the
  	 * future, otherwise just return 0
  	 */
@@ -35938,9 +40935,18 @@ diff -urNp linux-2.6.32.39/fs/splice.c linux-2.6.32.39/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-2.6.32.39/fs/sysfs/file.c linux-2.6.32.39/fs/sysfs/file.c
---- linux-2.6.32.39/fs/sysfs/file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/sysfs/file.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/sysfs/file.c linux-2.6.32.40/fs/sysfs/file.c
+--- linux-2.6.32.40/fs/sysfs/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/sysfs/file.c	2011-05-04 17:56:20.000000000 -0400
+@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
+ 
+ struct sysfs_open_dirent {
+ 	atomic_t		refcnt;
+-	atomic_t		event;
++	atomic_unchecked_t	event;
+ 	wait_queue_head_t	poll;
+ 	struct list_head	buffers; /* goes through sysfs_buffer.list */
+ };
 @@ -53,7 +53,7 @@ struct sysfs_buffer {
  	size_t			count;
  	loff_t			pos;
@@ -35959,6 +40965,15 @@ diff -urNp linux-2.6.32.39/fs/sysfs/file.c linux-2.6.32.39/fs/sysfs/file.c
  	int ret = 0;
  	ssize_t count;
  
+@@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentr
+ 	if (!sysfs_get_active_two(attr_sd))
+ 		return -ENODEV;
+ 
+-	buffer->event = atomic_read(&attr_sd->s_attr.open->event);
++	buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
+ 	count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
+ 
+ 	sysfs_put_active_two(attr_sd);
 @@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentr
  {
  	struct sysfs_dirent *attr_sd = dentry->d_fsdata;
@@ -35968,6 +40983,15 @@ diff -urNp linux-2.6.32.39/fs/sysfs/file.c linux-2.6.32.39/fs/sysfs/file.c
  	int rc;
  
  	/* need attr_sd for attr and ops, its parent for kobj */
+@@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct 
+ 		return -ENOMEM;
+ 
+ 	atomic_set(&new_od->refcnt, 0);
+-	atomic_set(&new_od->event, 1);
++	atomic_set_unchecked(&new_od->event, 1);
+ 	init_waitqueue_head(&new_od->poll);
+ 	INIT_LIST_HEAD(&new_od->buffers);
+ 	goto retry;
 @@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode 
  	struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
  	struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
@@ -35977,9 +41001,27 @@ diff -urNp linux-2.6.32.39/fs/sysfs/file.c linux-2.6.32.39/fs/sysfs/file.c
  	int error = -EACCES;
  	char *p;
  
-diff -urNp linux-2.6.32.39/fs/sysfs/mount.c linux-2.6.32.39/fs/sysfs/mount.c
---- linux-2.6.32.39/fs/sysfs/mount.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/sysfs/mount.c	2011-04-17 15:56:46.000000000 -0400
+@@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct fi
+ 
+ 	sysfs_put_active_two(attr_sd);
+ 
+-	if (buffer->event != atomic_read(&od->event))
++	if (buffer->event != atomic_read_unchecked(&od->event))
+ 		goto trigger;
+ 
+ 	return DEFAULT_POLLMASK;
+@@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_di
+ 
+ 	od = sd->s_attr.open;
+ 	if (od) {
+-		atomic_inc(&od->event);
++		atomic_inc_unchecked(&od->event);
+ 		wake_up_interruptible(&od->poll);
+ 	}
+ 
+diff -urNp linux-2.6.32.40/fs/sysfs/mount.c linux-2.6.32.40/fs/sysfs/mount.c
+--- linux-2.6.32.40/fs/sysfs/mount.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/sysfs/mount.c	2011-04-17 15:56:46.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -35992,9 +41034,9 @@ diff -urNp linux-2.6.32.39/fs/sysfs/mount.c linux-2.6.32.39/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-2.6.32.39/fs/sysfs/symlink.c linux-2.6.32.39/fs/sysfs/symlink.c
---- linux-2.6.32.39/fs/sysfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/sysfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/sysfs/symlink.c linux-2.6.32.40/fs/sysfs/symlink.c
+--- linux-2.6.32.40/fs/sysfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/sysfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -36004,9 +41046,9 @@ diff -urNp linux-2.6.32.39/fs/sysfs/symlink.c linux-2.6.32.39/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.32.39/fs/udf/balloc.c linux-2.6.32.39/fs/udf/balloc.c
---- linux-2.6.32.39/fs/udf/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/udf/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/udf/balloc.c linux-2.6.32.40/fs/udf/balloc.c
+--- linux-2.6.32.40/fs/udf/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/udf/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
  
  	mutex_lock(&sbi->s_alloc_mutex);
@@ -36029,9 +41071,9 @@ diff -urNp linux-2.6.32.39/fs/udf/balloc.c linux-2.6.32.39/fs/udf/balloc.c
  		udf_debug("%d < %d || %d + %d > %d\n",
  			  bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
  			  partmap->s_partition_len);
-diff -urNp linux-2.6.32.39/fs/udf/misc.c linux-2.6.32.39/fs/udf/misc.c
---- linux-2.6.32.39/fs/udf/misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/udf/misc.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/udf/misc.c linux-2.6.32.40/fs/udf/misc.c
+--- linux-2.6.32.40/fs/udf/misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/udf/misc.c	2011-04-23 12:56:11.000000000 -0400
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -36041,9 +41083,9 @@ diff -urNp linux-2.6.32.39/fs/udf/misc.c linux-2.6.32.39/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.32.39/fs/utimes.c linux-2.6.32.39/fs/utimes.c
---- linux-2.6.32.39/fs/utimes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/utimes.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/utimes.c linux-2.6.32.40/fs/utimes.c
+--- linux-2.6.32.40/fs/utimes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/utimes.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -36065,9 +41107,9 @@ diff -urNp linux-2.6.32.39/fs/utimes.c linux-2.6.32.39/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.32.39/fs/xattr_acl.c linux-2.6.32.39/fs/xattr_acl.c
---- linux-2.6.32.39/fs/xattr_acl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/xattr_acl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xattr_acl.c linux-2.6.32.40/fs/xattr_acl.c
+--- linux-2.6.32.40/fs/xattr_acl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/xattr_acl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -36079,9 +41121,9 @@ diff -urNp linux-2.6.32.39/fs/xattr_acl.c linux-2.6.32.39/fs/xattr_acl.c
  	int count;
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.32.39/fs/xattr.c linux-2.6.32.39/fs/xattr.c
---- linux-2.6.32.39/fs/xattr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/xattr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xattr.c linux-2.6.32.40/fs/xattr.c
+--- linux-2.6.32.40/fs/xattr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/xattr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -36144,9 +41186,9 @@ diff -urNp linux-2.6.32.39/fs/xattr.c linux-2.6.32.39/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
  	xfs_fsop_geom_t		  fsgeo;
  	int			  error;
@@ -36155,9 +41197,9 @@ diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.39/fs/xfs
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
  	if (error)
  		return -error;
-diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 20:07:09.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 20:07:09.000000000 -0400
 @@ -134,7 +134,7 @@ xfs_find_handle(
  	}
  
@@ -36185,9 +41227,9 @@ diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.39/fs/xfs/l
  	int			error;
  
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
-diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.40/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.32.40/fs/xfs/linux-2.6/xfs_iops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/xfs/linux-2.6/xfs_iops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -468,7 +468,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
@@ -36197,9 +41239,9 @@ diff -urNp linux-2.6.32.39/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.39/fs/xfs/li
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-2.6.32.39/fs/xfs/xfs_bmap.c linux-2.6.32.39/fs/xfs/xfs_bmap.c
---- linux-2.6.32.39/fs/xfs/xfs_bmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/xfs/xfs_bmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xfs/xfs_bmap.c linux-2.6.32.40/fs/xfs/xfs_bmap.c
+--- linux-2.6.32.40/fs/xfs/xfs_bmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/xfs/xfs_bmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
@@ -36209,9 +41251,9 @@ diff -urNp linux-2.6.32.39/fs/xfs/xfs_bmap.c linux-2.6.32.39/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  #if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c
---- linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c	2011-04-18 22:07:30.000000000 -0400
+diff -urNp linux-2.6.32.40/fs/xfs/xfs_dir2_sf.c linux-2.6.32.40/fs/xfs/xfs_dir2_sf.c
+--- linux-2.6.32.40/fs/xfs/xfs_dir2_sf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/fs/xfs/xfs_dir2_sf.c	2011-04-18 22:07:30.000000000 -0400
 @@ -779,7 +779,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -36229,9 +41271,9 @@ diff -urNp linux-2.6.32.39/fs/xfs/xfs_dir2_sf.c linux-2.6.32.39/fs/xfs/xfs_dir2_
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-2.6.32.39/grsecurity/gracl_alloc.c linux-2.6.32.39/grsecurity/gracl_alloc.c
---- linux-2.6.32.39/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_alloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_alloc.c linux-2.6.32.40/grsecurity/gracl_alloc.c
+--- linux-2.6.32.40/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_alloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -36338,9 +41380,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_alloc.c linux-2.6.32.39/grsecurity/g
 +	else
 +		return 1;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/gracl.c linux-2.6.32.39/grsecurity/gracl.c
---- linux-2.6.32.39/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl.c linux-2.6.32.40/grsecurity/gracl.c
+--- linux-2.6.32.40/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,4050 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -40392,9 +45434,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl.c linux-2.6.32.39/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.32.39/grsecurity/gracl_cap.c linux-2.6.32.39/grsecurity/gracl_cap.c
---- linux-2.6.32.39/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_cap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_cap.c linux-2.6.32.40/grsecurity/gracl_cap.c
+--- linux-2.6.32.40/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_cap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,138 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -40534,9 +45576,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_cap.c linux-2.6.32.39/grsecurity/gra
 +	return 0;
 +}
 +
-diff -urNp linux-2.6.32.39/grsecurity/gracl_fs.c linux-2.6.32.39/grsecurity/gracl_fs.c
---- linux-2.6.32.39/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_fs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_fs.c linux-2.6.32.40/grsecurity/gracl_fs.c
+--- linux-2.6.32.40/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_fs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -40969,9 +46011,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_fs.c linux-2.6.32.39/grsecurity/grac
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/gracl_ip.c linux-2.6.32.39/grsecurity/gracl_ip.c
---- linux-2.6.32.39/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_ip.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_ip.c linux-2.6.32.40/grsecurity/gracl_ip.c
+--- linux-2.6.32.40/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_ip.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,382 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -41355,9 +46397,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_ip.c linux-2.6.32.39/grsecurity/grac
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.32.39/grsecurity/gracl_learn.c linux-2.6.32.39/grsecurity/gracl_learn.c
---- linux-2.6.32.39/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_learn.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_learn.c linux-2.6.32.40/grsecurity/gracl_learn.c
+--- linux-2.6.32.40/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_learn.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,211 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -41570,9 +46612,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_learn.c linux-2.6.32.39/grsecurity/g
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-2.6.32.39/grsecurity/gracl_res.c linux-2.6.32.39/grsecurity/gracl_res.c
---- linux-2.6.32.39/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_res.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_res.c linux-2.6.32.40/grsecurity/gracl_res.c
+--- linux-2.6.32.40/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_res.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,67 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41641,9 +46683,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_res.c linux-2.6.32.39/grsecurity/gra
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/gracl_segv.c linux-2.6.32.39/grsecurity/gracl_segv.c
---- linux-2.6.32.39/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_segv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_segv.c linux-2.6.32.40/grsecurity/gracl_segv.c
+--- linux-2.6.32.40/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_segv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,284 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -41929,9 +46971,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_segv.c linux-2.6.32.39/grsecurity/gr
 +
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/gracl_shm.c linux-2.6.32.39/grsecurity/gracl_shm.c
---- linux-2.6.32.39/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/gracl_shm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/gracl_shm.c linux-2.6.32.40/grsecurity/gracl_shm.c
+--- linux-2.6.32.40/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/gracl_shm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -41973,9 +47015,9 @@ diff -urNp linux-2.6.32.39/grsecurity/gracl_shm.c linux-2.6.32.39/grsecurity/gra
 +
 +	return 1;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_chdir.c linux-2.6.32.39/grsecurity/grsec_chdir.c
---- linux-2.6.32.39/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_chdir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_chdir.c linux-2.6.32.40/grsecurity/grsec_chdir.c
+--- linux-2.6.32.40/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_chdir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -41996,9 +47038,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_chdir.c linux-2.6.32.39/grsecurity/g
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_chroot.c linux-2.6.32.39/grsecurity/grsec_chroot.c
---- linux-2.6.32.39/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_chroot.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_chroot.c linux-2.6.32.40/grsecurity/grsec_chroot.c
+--- linux-2.6.32.40/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_chroot.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,395 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -42395,9 +47437,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_chroot.c linux-2.6.32.39/grsecurity/
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.32.39/grsecurity/grsec_disabled.c linux-2.6.32.39/grsecurity/grsec_disabled.c
---- linux-2.6.32.39/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_disabled.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_disabled.c linux-2.6.32.40/grsecurity/grsec_disabled.c
+--- linux-2.6.32.40/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_disabled.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -42846,9 +47888,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_disabled.c linux-2.6.32.39/grsecurit
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.32.39/grsecurity/grsec_exec.c linux-2.6.32.39/grsecurity/grsec_exec.c
---- linux-2.6.32.39/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_exec.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_exec.c linux-2.6.32.40/grsecurity/grsec_exec.c
+--- linux-2.6.32.40/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_exec.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,148 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -42998,9 +48040,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_exec.c linux-2.6.32.39/grsecurity/gr
 +	return;
 +}
 +#endif
-diff -urNp linux-2.6.32.39/grsecurity/grsec_fifo.c linux-2.6.32.39/grsecurity/grsec_fifo.c
---- linux-2.6.32.39/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_fifo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_fifo.c linux-2.6.32.40/grsecurity/grsec_fifo.c
+--- linux-2.6.32.40/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_fifo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43026,9 +48068,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_fifo.c linux-2.6.32.39/grsecurity/gr
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_fork.c linux-2.6.32.39/grsecurity/grsec_fork.c
---- linux-2.6.32.39/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_fork.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_fork.c linux-2.6.32.40/grsecurity/grsec_fork.c
+--- linux-2.6.32.40/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_fork.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43053,9 +48095,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_fork.c linux-2.6.32.39/grsecurity/gr
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_init.c linux-2.6.32.39/grsecurity/grsec_init.c
---- linux-2.6.32.39/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_init.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_init.c linux-2.6.32.40/grsecurity/grsec_init.c
+--- linux-2.6.32.40/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_init.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,270 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43327,9 +48369,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_init.c linux-2.6.32.39/grsecurity/gr
 +
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_link.c linux-2.6.32.39/grsecurity/grsec_link.c
---- linux-2.6.32.39/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_link.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_link.c linux-2.6.32.40/grsecurity/grsec_link.c
+--- linux-2.6.32.40/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_link.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43374,9 +48416,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_link.c linux-2.6.32.39/grsecurity/gr
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_log.c linux-2.6.32.39/grsecurity/grsec_log.c
---- linux-2.6.32.39/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_log.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_log.c linux-2.6.32.40/grsecurity/grsec_log.c
+--- linux-2.6.32.40/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_log.c	2011-05-10 21:58:49.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43509,14 +48551,14 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_log.c linux-2.6.32.39/grsecurity/grs
 +{
 +	int logtype;
 +	char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
-+	char *str1, *str2, *str3;
-+	void *voidptr;
-+	int num1, num2;
-+	unsigned long ulong1, ulong2;
-+	struct dentry *dentry;
-+	struct vfsmount *mnt;
-+	struct file *file;
-+	struct task_struct *task;
++	char *str1 = NULL, *str2 = NULL, *str3 = NULL;
++	void *voidptr = NULL;
++	int num1 = 0, num2 = 0;
++	unsigned long ulong1 = 0, ulong2 = 0;
++	struct dentry *dentry = NULL;
++	struct vfsmount *mnt = NULL;
++	struct file *file = NULL;
++	struct task_struct *task = NULL;
 +	const struct cred *cred, *pcred;
 +	va_list ap;
 +
@@ -43688,9 +48730,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_log.c linux-2.6.32.39/grsecurity/grs
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_mem.c linux-2.6.32.39/grsecurity/grsec_mem.c
---- linux-2.6.32.39/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_mem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_mem.c linux-2.6.32.40/grsecurity/grsec_mem.c
+--- linux-2.6.32.40/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_mem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43725,9 +48767,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_mem.c linux-2.6.32.39/grsecurity/grs
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_mount.c linux-2.6.32.39/grsecurity/grsec_mount.c
---- linux-2.6.32.39/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_mount.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_mount.c linux-2.6.32.40/grsecurity/grsec_mount.c
+--- linux-2.6.32.40/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_mount.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43791,9 +48833,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_mount.c linux-2.6.32.39/grsecurity/g
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_pax.c linux-2.6.32.39/grsecurity/grsec_pax.c
---- linux-2.6.32.39/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_pax.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_pax.c linux-2.6.32.40/grsecurity/grsec_pax.c
+--- linux-2.6.32.40/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_pax.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43831,9 +48873,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_pax.c linux-2.6.32.39/grsecurity/grs
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_ptrace.c linux-2.6.32.39/grsecurity/grsec_ptrace.c
---- linux-2.6.32.39/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_ptrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_ptrace.c linux-2.6.32.40/grsecurity/grsec_ptrace.c
+--- linux-2.6.32.40/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_ptrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -43849,9 +48891,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_ptrace.c linux-2.6.32.39/grsecurity/
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_sig.c linux-2.6.32.39/grsecurity/grsec_sig.c
---- linux-2.6.32.39/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_sig.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_sig.c linux-2.6.32.40/grsecurity/grsec_sig.c
+--- linux-2.6.32.40/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_sig.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,196 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -44049,9 +49091,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_sig.c linux-2.6.32.39/grsecurity/grs
 +	return 0;
 +}
 +
-diff -urNp linux-2.6.32.39/grsecurity/grsec_sock.c linux-2.6.32.39/grsecurity/grsec_sock.c
---- linux-2.6.32.39/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_sock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_sock.c linux-2.6.32.40/grsecurity/grsec_sock.c
+--- linux-2.6.32.40/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_sock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,275 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -44328,9 +49370,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_sock.c linux-2.6.32.39/grsecurity/gr
 +	return current_cap();
 +#endif
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsec_sysctl.c linux-2.6.32.39/grsecurity/grsec_sysctl.c
---- linux-2.6.32.39/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_sysctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_sysctl.c linux-2.6.32.40/grsecurity/grsec_sysctl.c
+--- linux-2.6.32.40/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_sysctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,479 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -44811,9 +49853,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_sysctl.c linux-2.6.32.39/grsecurity/
 +	{ .ctl_name = 0 }
 +};
 +#endif
-diff -urNp linux-2.6.32.39/grsecurity/grsec_time.c linux-2.6.32.39/grsecurity/grsec_time.c
---- linux-2.6.32.39/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_time.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_time.c linux-2.6.32.40/grsecurity/grsec_time.c
+--- linux-2.6.32.40/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_time.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -44831,9 +49873,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_time.c linux-2.6.32.39/grsecurity/gr
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.32.39/grsecurity/grsec_tpe.c linux-2.6.32.39/grsecurity/grsec_tpe.c
---- linux-2.6.32.39/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsec_tpe.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsec_tpe.c linux-2.6.32.40/grsecurity/grsec_tpe.c
+--- linux-2.6.32.40/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsec_tpe.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -44874,9 +49916,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsec_tpe.c linux-2.6.32.39/grsecurity/grs
 +#endif
 +	return 1;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/grsum.c linux-2.6.32.39/grsecurity/grsum.c
---- linux-2.6.32.39/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/grsum.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/grsum.c linux-2.6.32.40/grsecurity/grsum.c
+--- linux-2.6.32.40/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/grsum.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -44939,9 +49981,9 @@ diff -urNp linux-2.6.32.39/grsecurity/grsum.c linux-2.6.32.39/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-2.6.32.39/grsecurity/Kconfig linux-2.6.32.39/grsecurity/Kconfig
---- linux-2.6.32.39/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/Kconfig linux-2.6.32.40/grsecurity/Kconfig
+--- linux-2.6.32.40/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,1045 @@
 +#
 +# grecurity configuration
@@ -45988,9 +51030,9 @@ diff -urNp linux-2.6.32.39/grsecurity/Kconfig linux-2.6.32.39/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-2.6.32.39/grsecurity/Makefile linux-2.6.32.39/grsecurity/Makefile
---- linux-2.6.32.39/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/grsecurity/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/grsecurity/Makefile linux-2.6.32.40/grsecurity/Makefile
+--- linux-2.6.32.40/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/grsecurity/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,29 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -46021,9 +51063,9 @@ diff -urNp linux-2.6.32.39/grsecurity/Makefile linux-2.6.32.39/grsecurity/Makefi
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-2.6.32.39/include/acpi/acpi_drivers.h linux-2.6.32.39/include/acpi/acpi_drivers.h
---- linux-2.6.32.39/include/acpi/acpi_drivers.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/acpi/acpi_drivers.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/acpi/acpi_drivers.h linux-2.6.32.40/include/acpi/acpi_drivers.h
+--- linux-2.6.32.40/include/acpi/acpi_drivers.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/acpi/acpi_drivers.h	2011-04-17 15:56:46.000000000 -0400
 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
                                    Dock Station
    -------------------------------------------------------------------------- */
@@ -46053,9 +51095,9 @@ diff -urNp linux-2.6.32.39/include/acpi/acpi_drivers.h linux-2.6.32.39/include/a
  					       void *context)
  {
  	return -ENODEV;
-diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.32.39/include/asm-generic/atomic-long.h
---- linux-2.6.32.39/include/asm-generic/atomic-long.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/atomic-long.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/atomic-long.h linux-2.6.32.40/include/asm-generic/atomic-long.h
+--- linux-2.6.32.40/include/asm-generic/atomic-long.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/atomic-long.h	2011-05-04 17:56:20.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -46274,7 +51316,7 @@ diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.32.39/inc
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -255,4 +375,37 @@ static inline long atomic_long_add_unles
+@@ -255,4 +375,47 @@ static inline long atomic_long_add_unles
  
  #endif  /*  BITS_PER_LONG == 64  */
  
@@ -46286,7 +51328,12 @@ diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.32.39/inc
 +	atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_inc_unchecked((atomic_unchecked_t *)NULL);
++	atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
++	atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
++	atomic_dec_unchecked((atomic_unchecked_t *)NULL);
++	atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
++	atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
 +
 +	atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
 +	atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
@@ -46301,7 +51348,12 @@ diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.32.39/inc
 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
 +#define atomic_inc_unchecked(v) atomic_inc(v)
++#define atomic_inc_and_test_unchecked(v) atomic_inc(v)
 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
++#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
++#define atomic_dec_unchecked(v) atomic_dec(v)
++#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
++#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
 +
 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
@@ -46312,9 +51364,22 @@ diff -urNp linux-2.6.32.39/include/asm-generic/atomic-long.h linux-2.6.32.39/inc
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.32.39/include/asm-generic/dma-mapping-common.h linux-2.6.32.39/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.39/include/asm-generic/dma-mapping-common.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/dma-mapping-common.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/cache.h linux-2.6.32.40/include/asm-generic/cache.h
+--- linux-2.6.32.40/include/asm-generic/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/cache.h	2011-05-04 17:56:28.000000000 -0400
+@@ -6,7 +6,7 @@
+  * cache lines need to provide their own cache.h.
+  */
+ 
+-#define L1_CACHE_SHIFT		5
+-#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
++#define L1_CACHE_SHIFT		5U
++#define L1_CACHE_BYTES		(1U << L1_CACHE_SHIFT)
+ 
+ #endif /* __ASM_GENERIC_CACHE_H */
+diff -urNp linux-2.6.32.40/include/asm-generic/dma-mapping-common.h linux-2.6.32.40/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.32.40/include/asm-generic/dma-mapping-common.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/dma-mapping-common.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
  					      enum dma_data_direction dir,
  					      struct dma_attrs *attrs)
@@ -46423,9 +51488,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.32.39/include/asm-generic/futex.h linux-2.6.32.39/include/asm-generic/futex.h
---- linux-2.6.32.39/include/asm-generic/futex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/futex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/futex.h linux-2.6.32.40/include/asm-generic/futex.h
+--- linux-2.6.32.40/include/asm-generic/futex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/futex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <asm/errno.h>
  
@@ -46444,9 +51509,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/futex.h linux-2.6.32.39/include/a
  {
  	return -ENOSYS;
  }
-diff -urNp linux-2.6.32.39/include/asm-generic/int-l64.h linux-2.6.32.39/include/asm-generic/int-l64.h
---- linux-2.6.32.39/include/asm-generic/int-l64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/int-l64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/int-l64.h linux-2.6.32.40/include/asm-generic/int-l64.h
+--- linux-2.6.32.40/include/asm-generic/int-l64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/int-l64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -46456,9 +51521,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/int-l64.h linux-2.6.32.39/include
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.32.39/include/asm-generic/int-ll64.h linux-2.6.32.39/include/asm-generic/int-ll64.h
---- linux-2.6.32.39/include/asm-generic/int-ll64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/int-ll64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/int-ll64.h linux-2.6.32.40/include/asm-generic/int-ll64.h
+--- linux-2.6.32.40/include/asm-generic/int-ll64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/int-ll64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -46468,9 +51533,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/int-ll64.h linux-2.6.32.39/includ
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.32.39/include/asm-generic/kmap_types.h linux-2.6.32.39/include/asm-generic/kmap_types.h
---- linux-2.6.32.39/include/asm-generic/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/kmap_types.h linux-2.6.32.40/include/asm-generic/kmap_types.h
+--- linux-2.6.32.40/include/asm-generic/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -28,7 +28,8 @@ KMAP_D(15)	KM_UML_USERCOPY,
  KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
@@ -46481,9 +51546,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/kmap_types.h linux-2.6.32.39/incl
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.32.39/include/asm-generic/pgtable.h linux-2.6.32.39/include/asm-generic/pgtable.h
---- linux-2.6.32.39/include/asm-generic/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/pgtable.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/pgtable.h linux-2.6.32.40/include/asm-generic/pgtable.h
+--- linux-2.6.32.40/include/asm-generic/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/pgtable.h	2011-04-17 15:56:46.000000000 -0400
 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
  				unsigned long size);
  #endif
@@ -46499,9 +51564,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/pgtable.h linux-2.6.32.39/include
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/pgtable-nopmd.h linux-2.6.32.40/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.32.40/include/asm-generic/pgtable-nopmd.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/pgtable-nopmd.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -46538,9 +51603,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopmd.h linux-2.6.32.39/i
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopud.h linux-2.6.32.39/include/asm-generic/pgtable-nopud.h
---- linux-2.6.32.39/include/asm-generic/pgtable-nopud.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/pgtable-nopud.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/pgtable-nopud.h linux-2.6.32.40/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.32.40/include/asm-generic/pgtable-nopud.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/pgtable-nopud.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -46571,9 +51636,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/pgtable-nopud.h linux-2.6.32.39/i
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.32.39/include/asm-generic/vmlinux.lds.h linux-2.6.32.39/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.39/include/asm-generic/vmlinux.lds.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/asm-generic/vmlinux.lds.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/asm-generic/vmlinux.lds.h linux-2.6.32.40/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.32.40/include/asm-generic/vmlinux.lds.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/asm-generic/vmlinux.lds.h	2011-04-17 15:56:46.000000000 -0400
 @@ -199,6 +199,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
@@ -46612,9 +51677,9 @@ diff -urNp linux-2.6.32.39/include/asm-generic/vmlinux.lds.h linux-2.6.32.39/inc
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.32.39/include/drm/drmP.h linux-2.6.32.39/include/drm/drmP.h
---- linux-2.6.32.39/include/drm/drmP.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/drm/drmP.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/drm/drmP.h linux-2.6.32.40/include/drm/drmP.h
+--- linux-2.6.32.40/include/drm/drmP.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/drm/drmP.h	2011-04-17 15:56:46.000000000 -0400
 @@ -71,6 +71,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -46674,9 +51739,9 @@ diff -urNp linux-2.6.32.39/include/drm/drmP.h linux-2.6.32.39/include/drm/drmP.h
  	uint32_t gtt_total;
  	uint32_t invalidate_domains;    /* domains pending invalidation */
  	uint32_t flush_domains;         /* domains pending flush */
-diff -urNp linux-2.6.32.39/include/linux/a.out.h linux-2.6.32.39/include/linux/a.out.h
---- linux-2.6.32.39/include/linux/a.out.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/a.out.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/a.out.h linux-2.6.32.40/include/linux/a.out.h
+--- linux-2.6.32.40/include/linux/a.out.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/a.out.h	2011-04-17 15:56:46.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -46692,9 +51757,9 @@ diff -urNp linux-2.6.32.39/include/linux/a.out.h linux-2.6.32.39/include/linux/a
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.32.39/include/linux/atmdev.h linux-2.6.32.39/include/linux/atmdev.h
---- linux-2.6.32.39/include/linux/atmdev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/atmdev.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/atmdev.h linux-2.6.32.40/include/linux/atmdev.h
+--- linux-2.6.32.40/include/linux/atmdev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/atmdev.h	2011-04-17 15:56:46.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -46704,9 +51769,9 @@ diff -urNp linux-2.6.32.39/include/linux/atmdev.h linux-2.6.32.39/include/linux/
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.32.39/include/linux/backlight.h linux-2.6.32.39/include/linux/backlight.h
---- linux-2.6.32.39/include/linux/backlight.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/backlight.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/backlight.h linux-2.6.32.40/include/linux/backlight.h
+--- linux-2.6.32.40/include/linux/backlight.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/backlight.h	2011-04-17 15:56:46.000000000 -0400
 @@ -36,18 +36,18 @@ struct backlight_device;
  struct fb_info;
  
@@ -46748,9 +51813,9 @@ diff -urNp linux-2.6.32.39/include/linux/backlight.h linux-2.6.32.39/include/lin
  extern void backlight_device_unregister(struct backlight_device *bd);
  extern void backlight_force_update(struct backlight_device *bd,
  				   enum backlight_update_reason reason);
-diff -urNp linux-2.6.32.39/include/linux/binfmts.h linux-2.6.32.39/include/linux/binfmts.h
---- linux-2.6.32.39/include/linux/binfmts.h	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/include/linux/binfmts.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/binfmts.h linux-2.6.32.40/include/linux/binfmts.h
+--- linux-2.6.32.40/include/linux/binfmts.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/include/linux/binfmts.h	2011-04-17 15:56:46.000000000 -0400
 @@ -83,6 +83,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
@@ -46759,9 +51824,9 @@ diff -urNp linux-2.6.32.39/include/linux/binfmts.h linux-2.6.32.39/include/linux
  	unsigned long min_coredump;	/* minimal dump size */
  	int hasvdso;
  };
-diff -urNp linux-2.6.32.39/include/linux/blkdev.h linux-2.6.32.39/include/linux/blkdev.h
---- linux-2.6.32.39/include/linux/blkdev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/blkdev.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/blkdev.h linux-2.6.32.40/include/linux/blkdev.h
+--- linux-2.6.32.40/include/linux/blkdev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/blkdev.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1265,19 +1265,19 @@ static inline int blk_integrity_rq(struc
  #endif /* CONFIG_BLK_DEV_INTEGRITY */
  
@@ -46793,9 +51858,21 @@ diff -urNp linux-2.6.32.39/include/linux/blkdev.h linux-2.6.32.39/include/linux/
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.32.39/include/linux/byteorder/little_endian.h linux-2.6.32.39/include/linux/byteorder/little_endian.h
---- linux-2.6.32.39/include/linux/byteorder/little_endian.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/byteorder/little_endian.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/blktrace_api.h linux-2.6.32.40/include/linux/blktrace_api.h
+--- linux-2.6.32.40/include/linux/blktrace_api.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/blktrace_api.h	2011-05-04 17:56:28.000000000 -0400
+@@ -160,7 +160,7 @@ struct blk_trace {
+ 	struct dentry *dir;
+ 	struct dentry *dropped_file;
+ 	struct dentry *msg_file;
+-	atomic_t dropped;
++	atomic_unchecked_t dropped;
+ };
+ 
+ extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
+diff -urNp linux-2.6.32.40/include/linux/byteorder/little_endian.h linux-2.6.32.40/include/linux/byteorder/little_endian.h
+--- linux-2.6.32.40/include/linux/byteorder/little_endian.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/byteorder/little_endian.h	2011-04-17 15:56:46.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -46860,9 +51937,9 @@ diff -urNp linux-2.6.32.39/include/linux/byteorder/little_endian.h linux-2.6.32.
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-2.6.32.39/include/linux/cache.h linux-2.6.32.39/include/linux/cache.h
---- linux-2.6.32.39/include/linux/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/cache.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/cache.h linux-2.6.32.40/include/linux/cache.h
+--- linux-2.6.32.40/include/linux/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/cache.h	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -46874,9 +51951,9 @@ diff -urNp linux-2.6.32.39/include/linux/cache.h linux-2.6.32.39/include/linux/c
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.32.39/include/linux/capability.h linux-2.6.32.39/include/linux/capability.h
---- linux-2.6.32.39/include/linux/capability.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/capability.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/capability.h linux-2.6.32.40/include/linux/capability.h
+--- linux-2.6.32.40/include/linux/capability.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/capability.h	2011-04-17 15:56:46.000000000 -0400
 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
  	(security_real_capable_noaudit((t), (cap)) == 0)
  
@@ -46885,9 +51962,9 @@ diff -urNp linux-2.6.32.39/include/linux/capability.h linux-2.6.32.39/include/li
  
  /* audit system wants to get cap info from files as well */
  struct dentry;
-diff -urNp linux-2.6.32.39/include/linux/compiler-gcc4.h linux-2.6.32.39/include/linux/compiler-gcc4.h
---- linux-2.6.32.39/include/linux/compiler-gcc4.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/compiler-gcc4.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/compiler-gcc4.h linux-2.6.32.40/include/linux/compiler-gcc4.h
+--- linux-2.6.32.40/include/linux/compiler-gcc4.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/compiler-gcc4.h	2011-04-17 15:56:46.000000000 -0400
 @@ -36,4 +36,8 @@
     the kernel context */
  #define __cold			__attribute__((__cold__))
@@ -46897,9 +51974,9 @@ diff -urNp linux-2.6.32.39/include/linux/compiler-gcc4.h linux-2.6.32.39/include
 +#define __bos0(ptr)		__bos((ptr), 0)
 +#define __bos1(ptr)		__bos((ptr), 1)
  #endif
-diff -urNp linux-2.6.32.39/include/linux/compiler.h linux-2.6.32.39/include/linux/compiler.h
---- linux-2.6.32.39/include/linux/compiler.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/compiler.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/compiler.h linux-2.6.32.40/include/linux/compiler.h
+--- linux-2.6.32.40/include/linux/compiler.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/compiler.h	2011-04-17 15:56:46.000000000 -0400
 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
@@ -46932,9 +52009,9 @@ diff -urNp linux-2.6.32.39/include/linux/compiler.h linux-2.6.32.39/include/linu
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.32.39/include/linux/dcache.h linux-2.6.32.39/include/linux/dcache.h
---- linux-2.6.32.39/include/linux/dcache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/dcache.h	2011-04-23 13:34:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/dcache.h linux-2.6.32.40/include/linux/dcache.h
+--- linux-2.6.32.40/include/linux/dcache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/dcache.h	2011-04-23 13:34:46.000000000 -0400
 @@ -119,6 +119,8 @@ struct dentry {
  	unsigned char d_iname[DNAME_INLINE_LEN_MIN];	/* small names */
  };
@@ -46944,9 +52021,9 @@ diff -urNp linux-2.6.32.39/include/linux/dcache.h linux-2.6.32.39/include/linux/
  /*
   * dentry->d_lock spinlock nesting subclasses:
   *
-diff -urNp linux-2.6.32.39/include/linux/decompress/mm.h linux-2.6.32.39/include/linux/decompress/mm.h
---- linux-2.6.32.39/include/linux/decompress/mm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/decompress/mm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/decompress/mm.h linux-2.6.32.40/include/linux/decompress/mm.h
+--- linux-2.6.32.40/include/linux/decompress/mm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/decompress/mm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -78,7 +78,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -46956,9 +52033,9 @@ diff -urNp linux-2.6.32.39/include/linux/decompress/mm.h linux-2.6.32.39/include
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.32.39/include/linux/dma-mapping.h linux-2.6.32.39/include/linux/dma-mapping.h
---- linux-2.6.32.39/include/linux/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/dma-mapping.h linux-2.6.32.40/include/linux/dma-mapping.h
+--- linux-2.6.32.40/include/linux/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
 @@ -16,50 +16,50 @@ enum dma_data_direction {
  };
  
@@ -47025,9 +52102,9 @@ diff -urNp linux-2.6.32.39/include/linux/dma-mapping.h linux-2.6.32.39/include/l
  };
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.32.39/include/linux/dst.h linux-2.6.32.39/include/linux/dst.h
---- linux-2.6.32.39/include/linux/dst.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/dst.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/dst.h linux-2.6.32.40/include/linux/dst.h
+--- linux-2.6.32.40/include/linux/dst.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/dst.h	2011-04-17 15:56:46.000000000 -0400
 @@ -380,7 +380,7 @@ struct dst_node
  	struct thread_pool	*pool;
  
@@ -47037,9 +52114,9 @@ diff -urNp linux-2.6.32.39/include/linux/dst.h linux-2.6.32.39/include/linux/dst
  
  	/*
  	 * How frequently and how many times transaction
-diff -urNp linux-2.6.32.39/include/linux/elf.h linux-2.6.32.39/include/linux/elf.h
---- linux-2.6.32.39/include/linux/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/elf.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/elf.h linux-2.6.32.40/include/linux/elf.h
+--- linux-2.6.32.40/include/linux/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/elf.h	2011-04-17 15:56:46.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -47112,9 +52189,30 @@ diff -urNp linux-2.6.32.39/include/linux/elf.h linux-2.6.32.39/include/linux/elf
  
  #endif
  
-diff -urNp linux-2.6.32.39/include/linux/fs.h linux-2.6.32.39/include/linux/fs.h
---- linux-2.6.32.39/include/linux/fs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/fs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/fscache-cache.h linux-2.6.32.40/include/linux/fscache-cache.h
+--- linux-2.6.32.40/include/linux/fscache-cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/fscache-cache.h	2011-05-04 17:56:28.000000000 -0400
+@@ -116,7 +116,7 @@ struct fscache_operation {
+ #endif
+ };
+ 
+-extern atomic_t fscache_op_debug_id;
++extern atomic_unchecked_t fscache_op_debug_id;
+ extern const struct slow_work_ops fscache_op_slow_work_ops;
+ 
+ extern void fscache_enqueue_operation(struct fscache_operation *);
+@@ -134,7 +134,7 @@ static inline void fscache_operation_ini
+ 					  fscache_operation_release_t release)
+ {
+ 	atomic_set(&op->usage, 1);
+-	op->debug_id = atomic_inc_return(&fscache_op_debug_id);
++	op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
+ 	op->release = release;
+ 	INIT_LIST_HEAD(&op->pend_link);
+ 	fscache_set_op_state(op, "Init");
+diff -urNp linux-2.6.32.40/include/linux/fs.h linux-2.6.32.40/include/linux/fs.h
+--- linux-2.6.32.40/include/linux/fs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/fs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -90,6 +90,11 @@ struct inodes_stat_t {
  /* Expect random access pattern */
  #define FMODE_RANDOM		((__force fmode_t)4096)
@@ -47276,9 +52374,9 @@ diff -urNp linux-2.6.32.39/include/linux/fs.h linux-2.6.32.39/include/linux/fs.h
  };
  
  /*
-diff -urNp linux-2.6.32.39/include/linux/fs_struct.h linux-2.6.32.39/include/linux/fs_struct.h
---- linux-2.6.32.39/include/linux/fs_struct.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/fs_struct.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/fs_struct.h linux-2.6.32.40/include/linux/fs_struct.h
+--- linux-2.6.32.40/include/linux/fs_struct.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/fs_struct.h	2011-04-17 15:56:46.000000000 -0400
 @@ -4,7 +4,7 @@
  #include <linux/path.h>
  
@@ -47288,9 +52386,21 @@ diff -urNp linux-2.6.32.39/include/linux/fs_struct.h linux-2.6.32.39/include/lin
  	rwlock_t lock;
  	int umask;
  	int in_exec;
-diff -urNp linux-2.6.32.39/include/linux/genhd.h linux-2.6.32.39/include/linux/genhd.h
---- linux-2.6.32.39/include/linux/genhd.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/genhd.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/ftrace_event.h linux-2.6.32.40/include/linux/ftrace_event.h
+--- linux-2.6.32.40/include/linux/ftrace_event.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/ftrace_event.h	2011-05-04 17:56:28.000000000 -0400
+@@ -163,7 +163,7 @@ extern int trace_define_field(struct ftr
+ 			      int filter_type);
+ extern int trace_define_common_fields(struct ftrace_event_call *call);
+ 
+-#define is_signed_type(type)	(((type)(-1)) < 0)
++#define is_signed_type(type)	(((type)(-1)) < (type)1)
+ 
+ int trace_set_clr_event(const char *system, const char *event, int set);
+ 
+diff -urNp linux-2.6.32.40/include/linux/genhd.h linux-2.6.32.40/include/linux/genhd.h
+--- linux-2.6.32.40/include/linux/genhd.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/genhd.h	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ struct gendisk {
  
  	struct timer_rand_state *random;
@@ -47300,9 +52410,9 @@ diff -urNp linux-2.6.32.39/include/linux/genhd.h linux-2.6.32.39/include/linux/g
  	struct work_struct async_notify;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-2.6.32.39/include/linux/gracl.h linux-2.6.32.39/include/linux/gracl.h
---- linux-2.6.32.39/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/gracl.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/gracl.h linux-2.6.32.40/include/linux/gracl.h
+--- linux-2.6.32.40/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/gracl.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -47621,9 +52731,9 @@ diff -urNp linux-2.6.32.39/include/linux/gracl.h linux-2.6.32.39/include/linux/g
 +
 +#endif
 +
-diff -urNp linux-2.6.32.39/include/linux/gralloc.h linux-2.6.32.39/include/linux/gralloc.h
---- linux-2.6.32.39/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/gralloc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/gralloc.h linux-2.6.32.40/include/linux/gralloc.h
+--- linux-2.6.32.40/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/gralloc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -47634,9 +52744,9 @@ diff -urNp linux-2.6.32.39/include/linux/gralloc.h linux-2.6.32.39/include/linux
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.32.39/include/linux/grdefs.h linux-2.6.32.39/include/linux/grdefs.h
---- linux-2.6.32.39/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/grdefs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/grdefs.h linux-2.6.32.40/include/linux/grdefs.h
+--- linux-2.6.32.40/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/grdefs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,139 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -47777,9 +52887,9 @@ diff -urNp linux-2.6.32.39/include/linux/grdefs.h linux-2.6.32.39/include/linux/
 +};
 +
 +#endif
-diff -urNp linux-2.6.32.39/include/linux/grinternal.h linux-2.6.32.39/include/linux/grinternal.h
---- linux-2.6.32.39/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/grinternal.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/grinternal.h linux-2.6.32.40/include/linux/grinternal.h
+--- linux-2.6.32.40/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/grinternal.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,218 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -47999,9 +53109,9 @@ diff -urNp linux-2.6.32.39/include/linux/grinternal.h linux-2.6.32.39/include/li
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.32.39/include/linux/grmsg.h linux-2.6.32.39/include/linux/grmsg.h
---- linux-2.6.32.39/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/grmsg.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/grmsg.h linux-2.6.32.40/include/linux/grmsg.h
+--- linux-2.6.32.40/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/grmsg.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,108 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -48111,9 +53221,9 @@ diff -urNp linux-2.6.32.39/include/linux/grmsg.h linux-2.6.32.39/include/linux/g
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-2.6.32.39/include/linux/grsecurity.h linux-2.6.32.39/include/linux/grsecurity.h
---- linux-2.6.32.39/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/grsecurity.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/grsecurity.h linux-2.6.32.40/include/linux/grsecurity.h
+--- linux-2.6.32.40/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/grsecurity.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,212 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
@@ -48327,9 +53437,9 @@ diff -urNp linux-2.6.32.39/include/linux/grsecurity.h linux-2.6.32.39/include/li
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.32.39/include/linux/hdpu_features.h linux-2.6.32.39/include/linux/hdpu_features.h
---- linux-2.6.32.39/include/linux/hdpu_features.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/hdpu_features.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/hdpu_features.h linux-2.6.32.40/include/linux/hdpu_features.h
+--- linux-2.6.32.40/include/linux/hdpu_features.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/hdpu_features.h	2011-04-17 15:56:46.000000000 -0400
 @@ -3,7 +3,7 @@
  struct cpustate_t {
  	spinlock_t lock;
@@ -48339,9 +53449,9 @@ diff -urNp linux-2.6.32.39/include/linux/hdpu_features.h linux-2.6.32.39/include
  	unsigned char cached_val;
  	int inited;
  	unsigned long *set_addr;
-diff -urNp linux-2.6.32.39/include/linux/highmem.h linux-2.6.32.39/include/linux/highmem.h
---- linux-2.6.32.39/include/linux/highmem.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/highmem.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/highmem.h linux-2.6.32.40/include/linux/highmem.h
+--- linux-2.6.32.40/include/linux/highmem.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/highmem.h	2011-04-17 15:56:46.000000000 -0400
 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
@@ -48361,9 +53471,21 @@ diff -urNp linux-2.6.32.39/include/linux/highmem.h linux-2.6.32.39/include/linux
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-2.6.32.39/include/linux/init_task.h linux-2.6.32.39/include/linux/init_task.h
---- linux-2.6.32.39/include/linux/init_task.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/init_task.h	2011-04-30 17:52:14.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/i2o.h linux-2.6.32.40/include/linux/i2o.h
+--- linux-2.6.32.40/include/linux/i2o.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/i2o.h	2011-05-04 17:56:28.000000000 -0400
+@@ -564,7 +564,7 @@ struct i2o_controller {
+ 	struct i2o_device *exec;	/* Executive */
+ #if BITS_PER_LONG == 64
+ 	spinlock_t context_list_lock;	/* lock for context_list */
+-	atomic_t context_list_counter;	/* needed for unique contexts */
++	atomic_unchecked_t context_list_counter;	/* needed for unique contexts */
+ 	struct list_head context_list;	/* list of context id's
+ 					   and pointers */
+ #endif
+diff -urNp linux-2.6.32.40/include/linux/init_task.h linux-2.6.32.40/include/linux/init_task.h
+--- linux-2.6.32.40/include/linux/init_task.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/init_task.h	2011-04-30 17:52:14.000000000 -0400
 @@ -83,6 +83,14 @@ extern struct group_info init_groups;
  #define INIT_IDS
  #endif
@@ -48396,9 +53518,9 @@ diff -urNp linux-2.6.32.39/include/linux/init_task.h linux-2.6.32.39/include/lin
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-2.6.32.39/include/linux/interrupt.h linux-2.6.32.39/include/linux/interrupt.h
---- linux-2.6.32.39/include/linux/interrupt.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/interrupt.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/interrupt.h linux-2.6.32.40/include/linux/interrupt.h
+--- linux-2.6.32.40/include/linux/interrupt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/interrupt.h	2011-04-17 15:56:46.000000000 -0400
 @@ -362,7 +362,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -48423,9 +53545,9 @@ diff -urNp linux-2.6.32.39/include/linux/interrupt.h linux-2.6.32.39/include/lin
  extern void softirq_init(void);
  #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
  extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.32.39/include/linux/irq.h linux-2.6.32.39/include/linux/irq.h
---- linux-2.6.32.39/include/linux/irq.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/irq.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/irq.h linux-2.6.32.40/include/linux/irq.h
+--- linux-2.6.32.40/include/linux/irq.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/irq.h	2011-04-17 15:56:46.000000000 -0400
 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq,
  static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
  							bool boot)
@@ -48440,9 +53562,9 @@ diff -urNp linux-2.6.32.39/include/linux/irq.h linux-2.6.32.39/include/linux/irq
  	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
  		return false;
  
-diff -urNp linux-2.6.32.39/include/linux/kallsyms.h linux-2.6.32.39/include/linux/kallsyms.h
---- linux-2.6.32.39/include/linux/kallsyms.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/kallsyms.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/kallsyms.h linux-2.6.32.40/include/linux/kallsyms.h
+--- linux-2.6.32.40/include/linux/kallsyms.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/kallsyms.h	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -48469,9 +53591,20 @@ diff -urNp linux-2.6.32.39/include/linux/kallsyms.h linux-2.6.32.39/include/linu
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.32.39/include/linux/kgdb.h linux-2.6.32.39/include/linux/kgdb.h
---- linux-2.6.32.39/include/linux/kgdb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/kgdb.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/kgdb.h linux-2.6.32.40/include/linux/kgdb.h
+--- linux-2.6.32.40/include/linux/kgdb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/kgdb.h	2011-05-04 17:56:20.000000000 -0400
+@@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
+ 
+ extern int kgdb_connected;
+ 
+-extern atomic_t			kgdb_setting_breakpoint;
+-extern atomic_t			kgdb_cpu_doing_single_step;
++extern atomic_unchecked_t	kgdb_setting_breakpoint;
++extern atomic_unchecked_t	kgdb_cpu_doing_single_step;
+ 
+ extern struct task_struct	*kgdb_usethread;
+ extern struct task_struct	*kgdb_contthread;
 @@ -251,20 +251,20 @@ struct kgdb_arch {
   */
  struct kgdb_io {
@@ -48502,9 +53635,9 @@ diff -urNp linux-2.6.32.39/include/linux/kgdb.h linux-2.6.32.39/include/linux/kg
  
  extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
  extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.32.39/include/linux/kmod.h linux-2.6.32.39/include/linux/kmod.h
---- linux-2.6.32.39/include/linux/kmod.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/kmod.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/kmod.h linux-2.6.32.40/include/linux/kmod.h
+--- linux-2.6.32.40/include/linux/kmod.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/kmod.h	2011-04-17 15:56:46.000000000 -0400
 @@ -31,6 +31,8 @@
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -48514,9 +53647,9 @@ diff -urNp linux-2.6.32.39/include/linux/kmod.h linux-2.6.32.39/include/linux/km
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff -urNp linux-2.6.32.39/include/linux/kobject.h linux-2.6.32.39/include/linux/kobject.h
---- linux-2.6.32.39/include/linux/kobject.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/kobject.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/kobject.h linux-2.6.32.40/include/linux/kobject.h
+--- linux-2.6.32.40/include/linux/kobject.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/kobject.h	2011-04-17 15:56:46.000000000 -0400
 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
  
  struct kobj_type {
@@ -48565,9 +53698,9 @@ diff -urNp linux-2.6.32.39/include/linux/kobject.h linux-2.6.32.39/include/linux
  						struct kobject *parent_kobj);
  
  static inline struct kset *to_kset(struct kobject *kobj)
-diff -urNp linux-2.6.32.39/include/linux/kvm_host.h linux-2.6.32.39/include/linux/kvm_host.h
---- linux-2.6.32.39/include/linux/kvm_host.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/kvm_host.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/kvm_host.h linux-2.6.32.40/include/linux/kvm_host.h
+--- linux-2.6.32.40/include/linux/kvm_host.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/kvm_host.h	2011-04-17 15:56:46.000000000 -0400
 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
@@ -48586,9 +53719,9 @@ diff -urNp linux-2.6.32.39/include/linux/kvm_host.h linux-2.6.32.39/include/linu
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.32.39/include/linux/libata.h linux-2.6.32.39/include/linux/libata.h
---- linux-2.6.32.39/include/linux/libata.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/libata.h	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/libata.h linux-2.6.32.40/include/linux/libata.h
+--- linux-2.6.32.40/include/linux/libata.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/libata.h	2011-04-23 12:56:11.000000000 -0400
 @@ -525,11 +525,11 @@ struct ata_ioports {
  
  struct ata_host {
@@ -48639,9 +53772,9 @@ diff -urNp linux-2.6.32.39/include/linux/libata.h linux-2.6.32.39/include/linux/
  extern int ata_scsi_detect(struct scsi_host_template *sht);
  extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
  extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.32.39/include/linux/lockd/bind.h linux-2.6.32.39/include/linux/lockd/bind.h
---- linux-2.6.32.39/include/linux/lockd/bind.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/lockd/bind.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/lockd/bind.h linux-2.6.32.40/include/linux/lockd/bind.h
+--- linux-2.6.32.40/include/linux/lockd/bind.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/lockd/bind.h	2011-04-17 15:56:46.000000000 -0400
 @@ -23,13 +23,13 @@ struct svc_rqst;
   * This is the set of functions for lockd->nfsd communication
   */
@@ -48659,9 +53792,9 @@ diff -urNp linux-2.6.32.39/include/linux/lockd/bind.h linux-2.6.32.39/include/li
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.32.39/include/linux/mm.h linux-2.6.32.39/include/linux/mm.h
---- linux-2.6.32.39/include/linux/mm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/mm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/mm.h linux-2.6.32.40/include/linux/mm.h
+--- linux-2.6.32.40/include/linux/mm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/mm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
@@ -48741,9 +53874,9 @@ diff -urNp linux-2.6.32.39/include/linux/mm.h linux-2.6.32.39/include/linux/mm.h
  
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.32.39/include/linux/mm_types.h linux-2.6.32.39/include/linux/mm_types.h
---- linux-2.6.32.39/include/linux/mm_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/mm_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/mm_types.h linux-2.6.32.40/include/linux/mm_types.h
+--- linux-2.6.32.40/include/linux/mm_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/mm_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -186,6 +186,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
@@ -48778,9 +53911,9 @@ diff -urNp linux-2.6.32.39/include/linux/mm_types.h linux-2.6.32.39/include/linu
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.32.39/include/linux/mmu_notifier.h linux-2.6.32.39/include/linux/mmu_notifier.h
---- linux-2.6.32.39/include/linux/mmu_notifier.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/mmu_notifier.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/mmu_notifier.h linux-2.6.32.40/include/linux/mmu_notifier.h
+--- linux-2.6.32.40/include/linux/mmu_notifier.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/mmu_notifier.h	2011-04-17 15:56:46.000000000 -0400
 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
@@ -48797,9 +53930,9 @@ diff -urNp linux-2.6.32.39/include/linux/mmu_notifier.h linux-2.6.32.39/include/
  })
  
  #define ptep_clear_flush_young_notify(__vma, __address, __ptep)		\
-diff -urNp linux-2.6.32.39/include/linux/mmzone.h linux-2.6.32.39/include/linux/mmzone.h
---- linux-2.6.32.39/include/linux/mmzone.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/mmzone.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/mmzone.h linux-2.6.32.40/include/linux/mmzone.h
+--- linux-2.6.32.40/include/linux/mmzone.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/mmzone.h	2011-04-17 15:56:46.000000000 -0400
 @@ -350,7 +350,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
@@ -48809,9 +53942,9 @@ diff -urNp linux-2.6.32.39/include/linux/mmzone.h linux-2.6.32.39/include/linux/
  
  	/*
  	 * prev_priority holds the scanning priority for this zone.  It is
-diff -urNp linux-2.6.32.39/include/linux/mod_devicetable.h linux-2.6.32.39/include/linux/mod_devicetable.h
---- linux-2.6.32.39/include/linux/mod_devicetable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/mod_devicetable.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/mod_devicetable.h linux-2.6.32.40/include/linux/mod_devicetable.h
+--- linux-2.6.32.40/include/linux/mod_devicetable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/mod_devicetable.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -48830,9 +53963,9 @@ diff -urNp linux-2.6.32.39/include/linux/mod_devicetable.h linux-2.6.32.39/inclu
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-2.6.32.39/include/linux/module.h linux-2.6.32.39/include/linux/module.h
---- linux-2.6.32.39/include/linux/module.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/module.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/module.h linux-2.6.32.40/include/linux/module.h
+--- linux-2.6.32.40/include/linux/module.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/module.h	2011-04-17 15:56:46.000000000 -0400
 @@ -287,16 +287,16 @@ struct module
  	int (*init)(void);
  
@@ -48905,9 +54038,9 @@ diff -urNp linux-2.6.32.39/include/linux/module.h linux-2.6.32.39/include/linux/
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.32.39/include/linux/moduleloader.h linux-2.6.32.39/include/linux/moduleloader.h
---- linux-2.6.32.39/include/linux/moduleloader.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/moduleloader.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/moduleloader.h linux-2.6.32.40/include/linux/moduleloader.h
+--- linux-2.6.32.40/include/linux/moduleloader.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/moduleloader.h	2011-04-17 15:56:46.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -48930,9 +54063,9 @@ diff -urNp linux-2.6.32.39/include/linux/moduleloader.h linux-2.6.32.39/include/
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.32.39/include/linux/moduleparam.h linux-2.6.32.39/include/linux/moduleparam.h
---- linux-2.6.32.39/include/linux/moduleparam.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/moduleparam.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/moduleparam.h linux-2.6.32.40/include/linux/moduleparam.h
+--- linux-2.6.32.40/include/linux/moduleparam.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/moduleparam.h	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ struct kparam_array
  
  /* Actually copy string: maxlen param is usually sizeof(string). */
@@ -48951,9 +54084,9 @@ diff -urNp linux-2.6.32.39/include/linux/moduleparam.h linux-2.6.32.39/include/l
  	= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
  	    sizeof(array[0]), array };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
-diff -urNp linux-2.6.32.39/include/linux/mutex.h linux-2.6.32.39/include/linux/mutex.h
---- linux-2.6.32.39/include/linux/mutex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/mutex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/mutex.h linux-2.6.32.40/include/linux/mutex.h
+--- linux-2.6.32.40/include/linux/mutex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/mutex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -51,7 +51,7 @@ struct mutex {
  	spinlock_t		wait_lock;
  	struct list_head	wait_list;
@@ -48963,9 +54096,9 @@ diff -urNp linux-2.6.32.39/include/linux/mutex.h linux-2.6.32.39/include/linux/m
  #endif
  #ifdef CONFIG_DEBUG_MUTEXES
  	const char 		*name;
-diff -urNp linux-2.6.32.39/include/linux/namei.h linux-2.6.32.39/include/linux/namei.h
---- linux-2.6.32.39/include/linux/namei.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/namei.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/namei.h linux-2.6.32.40/include/linux/namei.h
+--- linux-2.6.32.40/include/linux/namei.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/namei.h	2011-04-17 15:56:46.000000000 -0400
 @@ -22,7 +22,7 @@ struct nameidata {
  	unsigned int	flags;
  	int		last_type;
@@ -48990,9 +54123,9 @@ diff -urNp linux-2.6.32.39/include/linux/namei.h linux-2.6.32.39/include/linux/n
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.32.39/include/linux/netfilter/xt_gradm.h linux-2.6.32.39/include/linux/netfilter/xt_gradm.h
---- linux-2.6.32.39/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/include/linux/netfilter/xt_gradm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/netfilter/xt_gradm.h linux-2.6.32.40/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.32.40/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/include/linux/netfilter/xt_gradm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -49003,9 +54136,9 @@ diff -urNp linux-2.6.32.39/include/linux/netfilter/xt_gradm.h linux-2.6.32.39/in
 +};
 +
 +#endif
-diff -urNp linux-2.6.32.39/include/linux/nodemask.h linux-2.6.32.39/include/linux/nodemask.h
---- linux-2.6.32.39/include/linux/nodemask.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/nodemask.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/nodemask.h linux-2.6.32.40/include/linux/nodemask.h
+--- linux-2.6.32.40/include/linux/nodemask.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/nodemask.h	2011-04-17 15:56:46.000000000 -0400
 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no
  
  #define any_online_node(mask)			\
@@ -49022,9 +54155,9 @@ diff -urNp linux-2.6.32.39/include/linux/nodemask.h linux-2.6.32.39/include/linu
  })
  
  #define num_online_nodes()	num_node_state(N_ONLINE)
-diff -urNp linux-2.6.32.39/include/linux/oprofile.h linux-2.6.32.39/include/linux/oprofile.h
---- linux-2.6.32.39/include/linux/oprofile.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/oprofile.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/oprofile.h linux-2.6.32.40/include/linux/oprofile.h
+--- linux-2.6.32.40/include/linux/oprofile.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/oprofile.h	2011-04-17 15:56:46.000000000 -0400
 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
  	char const * name, ulong * val);
@@ -49037,9 +54170,41 @@ diff -urNp linux-2.6.32.39/include/linux/oprofile.h linux-2.6.32.39/include/linu
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.32.39/include/linux/pipe_fs_i.h linux-2.6.32.39/include/linux/pipe_fs_i.h
---- linux-2.6.32.39/include/linux/pipe_fs_i.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/pipe_fs_i.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/perf_event.h linux-2.6.32.40/include/linux/perf_event.h
+--- linux-2.6.32.40/include/linux/perf_event.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/perf_event.h	2011-05-04 17:56:28.000000000 -0400
+@@ -476,7 +476,7 @@ struct hw_perf_event {
+ 			struct hrtimer	hrtimer;
+ 		};
+ 	};
+-	atomic64_t			prev_count;
++	atomic64_unchecked_t		prev_count;
+ 	u64				sample_period;
+ 	u64				last_period;
+ 	atomic64_t			period_left;
+@@ -557,7 +557,7 @@ struct perf_event {
+ 	const struct pmu		*pmu;
+ 
+ 	enum perf_event_active_state	state;
+-	atomic64_t			count;
++	atomic64_unchecked_t		count;
+ 
+ 	/*
+ 	 * These are the total time in nanoseconds that the event
+@@ -595,8 +595,8 @@ struct perf_event {
+ 	 * These accumulate total time (in nanoseconds) that children
+ 	 * events have been enabled and running, respectively.
+ 	 */
+-	atomic64_t			child_total_time_enabled;
+-	atomic64_t			child_total_time_running;
++	atomic64_unchecked_t		child_total_time_enabled;
++	atomic64_unchecked_t		child_total_time_running;
+ 
+ 	/*
+ 	 * Protect attach/detach and child_list:
+diff -urNp linux-2.6.32.40/include/linux/pipe_fs_i.h linux-2.6.32.40/include/linux/pipe_fs_i.h
+--- linux-2.6.32.40/include/linux/pipe_fs_i.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/pipe_fs_i.h	2011-04-17 15:56:46.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_inode_info {
  	wait_queue_head_t wait;
  	unsigned int nrbufs, curbuf;
@@ -49053,9 +54218,9 @@ diff -urNp linux-2.6.32.39/include/linux/pipe_fs_i.h linux-2.6.32.39/include/lin
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.32.39/include/linux/poison.h linux-2.6.32.39/include/linux/poison.h
---- linux-2.6.32.39/include/linux/poison.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/poison.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/poison.h linux-2.6.32.40/include/linux/poison.h
+--- linux-2.6.32.40/include/linux/poison.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/poison.h	2011-04-17 15:56:46.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -49067,9 +54232,9 @@ diff -urNp linux-2.6.32.39/include/linux/poison.h linux-2.6.32.39/include/linux/
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.32.39/include/linux/proc_fs.h linux-2.6.32.39/include/linux/proc_fs.h
---- linux-2.6.32.39/include/linux/proc_fs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/proc_fs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/proc_fs.h linux-2.6.32.40/include/linux/proc_fs.h
+--- linux-2.6.32.40/include/linux/proc_fs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/proc_fs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -49090,9 +54255,9 @@ diff -urNp linux-2.6.32.39/include/linux/proc_fs.h linux-2.6.32.39/include/linux
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
  	mode_t mode, struct proc_dir_entry *base, 
  	read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.32.39/include/linux/ptrace.h linux-2.6.32.39/include/linux/ptrace.h
---- linux-2.6.32.39/include/linux/ptrace.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/ptrace.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/ptrace.h linux-2.6.32.40/include/linux/ptrace.h
+--- linux-2.6.32.40/include/linux/ptrace.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/ptrace.h	2011-04-17 15:56:46.000000000 -0400
 @@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
@@ -49106,9 +54271,9 @@ diff -urNp linux-2.6.32.39/include/linux/ptrace.h linux-2.6.32.39/include/linux/
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-2.6.32.39/include/linux/random.h linux-2.6.32.39/include/linux/random.h
---- linux-2.6.32.39/include/linux/random.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/random.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/random.h linux-2.6.32.40/include/linux/random.h
+--- linux-2.6.32.40/include/linux/random.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/random.h	2011-04-17 15:56:46.000000000 -0400
 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
  u32 random32(void);
  void srandom32(u32 seed);
@@ -49121,9 +54286,9 @@ diff -urNp linux-2.6.32.39/include/linux/random.h linux-2.6.32.39/include/linux/
  #endif /* __KERNEL___ */
  
  #endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs.h linux-2.6.32.39/include/linux/reiserfs_fs.h
---- linux-2.6.32.39/include/linux/reiserfs_fs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/reiserfs_fs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/reiserfs_fs.h linux-2.6.32.40/include/linux/reiserfs_fs.h
+--- linux-2.6.32.40/include/linux/reiserfs_fs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/reiserfs_fs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
@@ -49170,9 +54335,9 @@ diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs.h linux-2.6.32.39/include/l
  
  #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
  #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs_sb.h linux-2.6.32.39/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.39/include/linux/reiserfs_fs_sb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/reiserfs_fs_sb.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/reiserfs_fs_sb.h linux-2.6.32.40/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.32.40/include/linux/reiserfs_fs_sb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/reiserfs_fs_sb.h	2011-04-17 15:56:46.000000000 -0400
 @@ -377,7 +377,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -49182,9 +54347,9 @@ diff -urNp linux-2.6.32.39/include/linux/reiserfs_fs_sb.h linux-2.6.32.39/includ
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/sched.h
---- linux-2.6.32.39/include/linux/sched.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/sched.h	2011-04-18 22:03:00.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/sched.h linux-2.6.32.40/include/linux/sched.h
+--- linux-2.6.32.40/include/linux/sched.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/sched.h	2011-05-11 18:38:56.000000000 -0400
 @@ -101,6 +101,7 @@ struct bio;
  struct fs_struct;
  struct bts_context;
@@ -49331,7 +54496,7 @@ diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/s
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
  	/* Index of current stored adress in ret_stack */
  	int curr_ret_stack;
-@@ -1542,6 +1582,51 @@ struct task_struct {
+@@ -1542,6 +1582,67 @@ struct task_struct {
  #endif /* CONFIG_TRACING */
  };
  
@@ -49380,10 +54545,26 @@ diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/s
 +void pax_report_refcount_overflow(struct pt_regs *regs);
 +void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
 +
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++#define stackleak_probe(var)					\
++	do {							\
++		size_t maxidx = sizeof(var) / sizeof(long);	\
++		long *p = (long *)&var;				\
++		unsigned int i;					\
++								\
++		BUILD_BUG_ON(sizeof(var) < 64);			\
++								\
++		for (i = 0; i < maxidx; i += 64 / sizeof(long))	\
++			p[i] = 0;				\
++	} while (0)
++#else
++#define stackleak_probe(var)	do { } while (0)
++#endif
++
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
  
-@@ -1978,7 +2063,9 @@ void yield(void);
+@@ -1978,7 +2079,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -49393,7 +54574,7 @@ diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/s
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2155,7 +2242,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2155,7 +2258,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -49402,7 +54583,7 @@ diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/s
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2284,13 +2371,17 @@ static inline unsigned long *end_of_stac
+@@ -2284,13 +2387,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -49422,9 +54603,9 @@ diff -urNp linux-2.6.32.39/include/linux/sched.h linux-2.6.32.39/include/linux/s
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.32.39/include/linux/screen_info.h linux-2.6.32.39/include/linux/screen_info.h
---- linux-2.6.32.39/include/linux/screen_info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/screen_info.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/screen_info.h linux-2.6.32.40/include/linux/screen_info.h
+--- linux-2.6.32.40/include/linux/screen_info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/screen_info.h	2011-04-17 15:56:46.000000000 -0400
 @@ -42,7 +42,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -49435,9 +54616,9 @@ diff -urNp linux-2.6.32.39/include/linux/screen_info.h linux-2.6.32.39/include/l
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-2.6.32.39/include/linux/security.h linux-2.6.32.39/include/linux/security.h
---- linux-2.6.32.39/include/linux/security.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/security.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/security.h linux-2.6.32.40/include/linux/security.h
+--- linux-2.6.32.40/include/linux/security.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/security.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -49446,9 +54627,9 @@ diff -urNp linux-2.6.32.39/include/linux/security.h linux-2.6.32.39/include/linu
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.32.39/include/linux/shm.h linux-2.6.32.39/include/linux/shm.h
---- linux-2.6.32.39/include/linux/shm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/shm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/shm.h linux-2.6.32.40/include/linux/shm.h
+--- linux-2.6.32.40/include/linux/shm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/shm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
@@ -49460,9 +54641,9 @@ diff -urNp linux-2.6.32.39/include/linux/shm.h linux-2.6.32.39/include/linux/shm
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.32.39/include/linux/skbuff.h linux-2.6.32.39/include/linux/skbuff.h
---- linux-2.6.32.39/include/linux/skbuff.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/skbuff.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/skbuff.h linux-2.6.32.40/include/linux/skbuff.h
+--- linux-2.6.32.40/include/linux/skbuff.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/skbuff.h	2011-05-04 17:56:20.000000000 -0400
 @@ -544,7 +544,7 @@ static inline union skb_shared_tx *skb_t
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -49490,9 +54671,36 @@ diff -urNp linux-2.6.32.39/include/linux/skbuff.h linux-2.6.32.39/include/linux/
  }
  
  /**
-diff -urNp linux-2.6.32.39/include/linux/slab.h linux-2.6.32.39/include/linux/slab.h
---- linux-2.6.32.39/include/linux/slab.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/slab.h	2011-04-17 15:56:46.000000000 -0400
+@@ -1367,7 +1367,7 @@ static inline int skb_network_offset(con
+  * headroom, you should not reduce this.
+  */
+ #ifndef NET_SKB_PAD
+-#define NET_SKB_PAD	32
++#define NET_SKB_PAD	(_AC(32,U))
+ #endif
+ 
+ extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
+diff -urNp linux-2.6.32.40/include/linux/slab_def.h linux-2.6.32.40/include/linux/slab_def.h
+--- linux-2.6.32.40/include/linux/slab_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/slab_def.h	2011-05-04 17:56:28.000000000 -0400
+@@ -69,10 +69,10 @@ struct kmem_cache {
+ 	unsigned long node_allocs;
+ 	unsigned long node_frees;
+ 	unsigned long node_overflow;
+-	atomic_t allochit;
+-	atomic_t allocmiss;
+-	atomic_t freehit;
+-	atomic_t freemiss;
++	atomic_unchecked_t allochit;
++	atomic_unchecked_t allocmiss;
++	atomic_unchecked_t freehit;
++	atomic_unchecked_t freemiss;
+ 
+ 	/*
+ 	 * If debugging is enabled, then the allocator can add additional
+diff -urNp linux-2.6.32.40/include/linux/slab.h linux-2.6.32.40/include/linux/slab.h
+--- linux-2.6.32.40/include/linux/slab.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/slab.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -49577,9 +54785,9 @@ diff -urNp linux-2.6.32.39/include/linux/slab.h linux-2.6.32.39/include/linux/sl
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-2.6.32.39/include/linux/slub_def.h linux-2.6.32.39/include/linux/slub_def.h
---- linux-2.6.32.39/include/linux/slub_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/slub_def.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/slub_def.h linux-2.6.32.40/include/linux/slub_def.h
+--- linux-2.6.32.40/include/linux/slub_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/slub_def.h	2011-04-17 15:56:46.000000000 -0400
 @@ -86,7 +86,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
@@ -49589,9 +54797,9 @@ diff -urNp linux-2.6.32.39/include/linux/slub_def.h linux-2.6.32.39/include/linu
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-diff -urNp linux-2.6.32.39/include/linux/sonet.h linux-2.6.32.39/include/linux/sonet.h
---- linux-2.6.32.39/include/linux/sonet.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/sonet.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/sonet.h linux-2.6.32.40/include/linux/sonet.h
+--- linux-2.6.32.40/include/linux/sonet.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/sonet.h	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -49601,9 +54809,9 @@ diff -urNp linux-2.6.32.39/include/linux/sonet.h linux-2.6.32.39/include/linux/s
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.32.39/include/linux/sunrpc/clnt.h linux-2.6.32.39/include/linux/sunrpc/clnt.h
---- linux-2.6.32.39/include/linux/sunrpc/clnt.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/sunrpc/clnt.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/sunrpc/clnt.h linux-2.6.32.40/include/linux/sunrpc/clnt.h
+--- linux-2.6.32.40/include/linux/sunrpc/clnt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/sunrpc/clnt.h	2011-04-17 15:56:46.000000000 -0400
 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
@@ -49634,9 +54842,37 @@ diff -urNp linux-2.6.32.39/include/linux/sunrpc/clnt.h linux-2.6.32.39/include/l
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-2.6.32.39/include/linux/suspend.h linux-2.6.32.39/include/linux/suspend.h
---- linux-2.6.32.39/include/linux/suspend.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/suspend.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/sunrpc/svc_rdma.h linux-2.6.32.40/include/linux/sunrpc/svc_rdma.h
+--- linux-2.6.32.40/include/linux/sunrpc/svc_rdma.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/sunrpc/svc_rdma.h	2011-05-04 17:56:28.000000000 -0400
+@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
+ extern unsigned int svcrdma_max_requests;
+ extern unsigned int svcrdma_max_req_size;
+ 
+-extern atomic_t rdma_stat_recv;
+-extern atomic_t rdma_stat_read;
+-extern atomic_t rdma_stat_write;
+-extern atomic_t rdma_stat_sq_starve;
+-extern atomic_t rdma_stat_rq_starve;
+-extern atomic_t rdma_stat_rq_poll;
+-extern atomic_t rdma_stat_rq_prod;
+-extern atomic_t rdma_stat_sq_poll;
+-extern atomic_t rdma_stat_sq_prod;
++extern atomic_unchecked_t rdma_stat_recv;
++extern atomic_unchecked_t rdma_stat_read;
++extern atomic_unchecked_t rdma_stat_write;
++extern atomic_unchecked_t rdma_stat_sq_starve;
++extern atomic_unchecked_t rdma_stat_rq_starve;
++extern atomic_unchecked_t rdma_stat_rq_poll;
++extern atomic_unchecked_t rdma_stat_rq_prod;
++extern atomic_unchecked_t rdma_stat_sq_poll;
++extern atomic_unchecked_t rdma_stat_sq_prod;
+ 
+ #define RPCRDMA_VERSION 1
+ 
+diff -urNp linux-2.6.32.40/include/linux/suspend.h linux-2.6.32.40/include/linux/suspend.h
+--- linux-2.6.32.40/include/linux/suspend.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/suspend.h	2011-04-17 15:56:46.000000000 -0400
 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
   *	which require special recovery actions in that situation.
   */
@@ -49725,9 +54961,9 @@ diff -urNp linux-2.6.32.39/include/linux/suspend.h linux-2.6.32.39/include/linux
  static inline int hibernate(void) { return -ENOSYS; }
  static inline bool system_entering_hibernation(void) { return false; }
  #endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.32.39/include/linux/sysctl.h linux-2.6.32.39/include/linux/sysctl.h
---- linux-2.6.32.39/include/linux/sysctl.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/sysctl.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/sysctl.h linux-2.6.32.40/include/linux/sysctl.h
+--- linux-2.6.32.40/include/linux/sysctl.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/sysctl.h	2011-04-17 15:56:46.000000000 -0400
 @@ -164,7 +164,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -49758,9 +54994,9 @@ diff -urNp linux-2.6.32.39/include/linux/sysctl.h linux-2.6.32.39/include/linux/
  extern ctl_handler sysctl_intvec;
  extern ctl_handler sysctl_jiffies;
  extern ctl_handler sysctl_ms_jiffies;
-diff -urNp linux-2.6.32.39/include/linux/sysfs.h linux-2.6.32.39/include/linux/sysfs.h
---- linux-2.6.32.39/include/linux/sysfs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/sysfs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/sysfs.h linux-2.6.32.40/include/linux/sysfs.h
+--- linux-2.6.32.40/include/linux/sysfs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/sysfs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -75,8 +75,8 @@ struct bin_attribute {
  };
  
@@ -49772,9 +55008,9 @@ diff -urNp linux-2.6.32.39/include/linux/sysfs.h linux-2.6.32.39/include/linux/s
  };
  
  struct sysfs_dirent;
-diff -urNp linux-2.6.32.39/include/linux/thread_info.h linux-2.6.32.39/include/linux/thread_info.h
---- linux-2.6.32.39/include/linux/thread_info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/thread_info.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/thread_info.h linux-2.6.32.40/include/linux/thread_info.h
+--- linux-2.6.32.40/include/linux/thread_info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/thread_info.h	2011-04-17 15:56:46.000000000 -0400
 @@ -23,7 +23,7 @@ struct restart_block {
  		};
  		/* For futex_wait and futex_wait_requeue_pi */
@@ -49784,9 +55020,9 @@ diff -urNp linux-2.6.32.39/include/linux/thread_info.h linux-2.6.32.39/include/l
  			u32 val;
  			u32 flags;
  			u32 bitset;
-diff -urNp linux-2.6.32.39/include/linux/tty.h linux-2.6.32.39/include/linux/tty.h
---- linux-2.6.32.39/include/linux/tty.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/tty.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/tty.h linux-2.6.32.40/include/linux/tty.h
+--- linux-2.6.32.40/include/linux/tty.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/tty.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_ldisc.h>
@@ -49822,9 +55058,9 @@ diff -urNp linux-2.6.32.39/include/linux/tty.h linux-2.6.32.39/include/linux/tty
  
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.32.39/include/linux/tty_ldisc.h linux-2.6.32.39/include/linux/tty_ldisc.h
---- linux-2.6.32.39/include/linux/tty_ldisc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/tty_ldisc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/tty_ldisc.h linux-2.6.32.40/include/linux/tty_ldisc.h
+--- linux-2.6.32.40/include/linux/tty_ldisc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/tty_ldisc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -139,7 +139,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -49834,9 +55070,9 @@ diff -urNp linux-2.6.32.39/include/linux/tty_ldisc.h linux-2.6.32.39/include/lin
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.32.39/include/linux/types.h linux-2.6.32.39/include/linux/types.h
---- linux-2.6.32.39/include/linux/types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/types.h linux-2.6.32.40/include/linux/types.h
+--- linux-2.6.32.40/include/linux/types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -191,10 +191,26 @@ typedef struct {
  	volatile int counter;
  } atomic_t;
@@ -49864,9 +55100,9 @@ diff -urNp linux-2.6.32.39/include/linux/types.h linux-2.6.32.39/include/linux/t
  #endif
  
  struct ustat {
-diff -urNp linux-2.6.32.39/include/linux/uaccess.h linux-2.6.32.39/include/linux/uaccess.h
---- linux-2.6.32.39/include/linux/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/uaccess.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/uaccess.h linux-2.6.32.40/include/linux/uaccess.h
+--- linux-2.6.32.40/include/linux/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/uaccess.h	2011-04-17 15:56:46.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -49898,9 +55134,9 @@ diff -urNp linux-2.6.32.39/include/linux/uaccess.h linux-2.6.32.39/include/linux
 +extern long probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif		/* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.32.39/include/linux/unaligned/access_ok.h linux-2.6.32.39/include/linux/unaligned/access_ok.h
---- linux-2.6.32.39/include/linux/unaligned/access_ok.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/unaligned/access_ok.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/unaligned/access_ok.h linux-2.6.32.40/include/linux/unaligned/access_ok.h
+--- linux-2.6.32.40/include/linux/unaligned/access_ok.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/unaligned/access_ok.h	2011-04-17 15:56:46.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -49940,9 +55176,9 @@ diff -urNp linux-2.6.32.39/include/linux/unaligned/access_ok.h linux-2.6.32.39/i
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.32.39/include/linux/vmalloc.h linux-2.6.32.39/include/linux/vmalloc.h
---- linux-2.6.32.39/include/linux/vmalloc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/vmalloc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/vmalloc.h linux-2.6.32.40/include/linux/vmalloc.h
+--- linux-2.6.32.40/include/linux/vmalloc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/vmalloc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_MAP		0x00000004	/* vmap()ed pages */
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
@@ -50037,9 +55273,9 @@ diff -urNp linux-2.6.32.39/include/linux/vmalloc.h linux-2.6.32.39/include/linux
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.32.39/include/linux/vmstat.h linux-2.6.32.39/include/linux/vmstat.h
---- linux-2.6.32.39/include/linux/vmstat.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/linux/vmstat.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/linux/vmstat.h linux-2.6.32.40/include/linux/vmstat.h
+--- linux-2.6.32.40/include/linux/vmstat.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/linux/vmstat.h	2011-04-17 15:56:46.000000000 -0400
 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -50103,9 +55339,33 @@ diff -urNp linux-2.6.32.39/include/linux/vmstat.h linux-2.6.32.39/include/linux/
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.32.39/include/net/inetpeer.h linux-2.6.32.39/include/net/inetpeer.h
---- linux-2.6.32.39/include/net/inetpeer.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/inetpeer.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/media/v4l2-device.h linux-2.6.32.40/include/media/v4l2-device.h
+--- linux-2.6.32.40/include/media/v4l2-device.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/media/v4l2-device.h	2011-05-04 17:56:28.000000000 -0400
+@@ -71,7 +71,7 @@ int __must_check v4l2_device_register(st
+    this function returns 0. If the name ends with a digit (e.g. cx18),
+    then the name will be set to cx18-0 since cx180 looks really odd. */
+ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
+-						atomic_t *instance);
++						atomic_unchecked_t *instance);
+ 
+ /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
+    Since the parent disappears this ensures that v4l2_dev doesn't have an
+diff -urNp linux-2.6.32.40/include/net/flow.h linux-2.6.32.40/include/net/flow.h
+--- linux-2.6.32.40/include/net/flow.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/flow.h	2011-05-04 17:56:28.000000000 -0400
+@@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net
+ extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
+ 			       u8 dir, flow_resolve_t resolver);
+ extern void flow_cache_flush(void);
+-extern atomic_t flow_cache_genid;
++extern atomic_unchecked_t flow_cache_genid;
+ 
+ static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
+ {
+diff -urNp linux-2.6.32.40/include/net/inetpeer.h linux-2.6.32.40/include/net/inetpeer.h
+--- linux-2.6.32.40/include/net/inetpeer.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/inetpeer.h	2011-04-17 15:56:46.000000000 -0400
 @@ -24,7 +24,7 @@ struct inet_peer
  	__u32			dtime;		/* the time of last use of not
  						 * referenced entries */
@@ -50115,9 +55375,30 @@ diff -urNp linux-2.6.32.39/include/net/inetpeer.h linux-2.6.32.39/include/net/in
  	__u32			tcp_ts;
  	unsigned long		tcp_ts_stamp;
  };
-diff -urNp linux-2.6.32.39/include/net/irda/ircomm_tty.h linux-2.6.32.39/include/net/irda/ircomm_tty.h
---- linux-2.6.32.39/include/net/irda/ircomm_tty.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/irda/ircomm_tty.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/net/ip_vs.h linux-2.6.32.40/include/net/ip_vs.h
+--- linux-2.6.32.40/include/net/ip_vs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/ip_vs.h	2011-05-04 17:56:28.000000000 -0400
+@@ -365,7 +365,7 @@ struct ip_vs_conn {
+ 	struct ip_vs_conn       *control;       /* Master control connection */
+ 	atomic_t                n_control;      /* Number of controlled ones */
+ 	struct ip_vs_dest       *dest;          /* real server */
+-	atomic_t                in_pkts;        /* incoming packet counter */
++	atomic_unchecked_t      in_pkts;        /* incoming packet counter */
+ 
+ 	/* packet transmitter for different forwarding methods.  If it
+ 	   mangles the packet, it must return NF_DROP or better NF_STOLEN,
+@@ -466,7 +466,7 @@ struct ip_vs_dest {
+ 	union nf_inet_addr	addr;		/* IP address of the server */
+ 	__be16			port;		/* port number of the server */
+ 	volatile unsigned	flags;		/* dest status flags */
+-	atomic_t		conn_flags;	/* flags to copy to conn */
++	atomic_unchecked_t	conn_flags;	/* flags to copy to conn */
+ 	atomic_t		weight;		/* server weight */
+ 
+ 	atomic_t		refcnt;		/* reference counter */
+diff -urNp linux-2.6.32.40/include/net/irda/ircomm_tty.h linux-2.6.32.40/include/net/irda/ircomm_tty.h
+--- linux-2.6.32.40/include/net/irda/ircomm_tty.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/irda/ircomm_tty.h	2011-04-17 15:56:46.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -50137,9 +55418,21 @@ diff -urNp linux-2.6.32.39/include/net/irda/ircomm_tty.h linux-2.6.32.39/include
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-2.6.32.39/include/net/neighbour.h linux-2.6.32.39/include/net/neighbour.h
---- linux-2.6.32.39/include/net/neighbour.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/neighbour.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/net/iucv/af_iucv.h linux-2.6.32.40/include/net/iucv/af_iucv.h
+--- linux-2.6.32.40/include/net/iucv/af_iucv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/iucv/af_iucv.h	2011-05-04 17:56:28.000000000 -0400
+@@ -87,7 +87,7 @@ struct iucv_sock {
+ struct iucv_sock_list {
+ 	struct hlist_head head;
+ 	rwlock_t	  lock;
+-	atomic_t	  autobind_name;
++	atomic_unchecked_t autobind_name;
+ };
+ 
+ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
+diff -urNp linux-2.6.32.40/include/net/neighbour.h linux-2.6.32.40/include/net/neighbour.h
+--- linux-2.6.32.40/include/net/neighbour.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/neighbour.h	2011-04-17 15:56:46.000000000 -0400
 @@ -125,12 +125,12 @@ struct neighbour
  struct neigh_ops
  {
@@ -50159,9 +55452,9 @@ diff -urNp linux-2.6.32.39/include/net/neighbour.h linux-2.6.32.39/include/net/n
  };
  
  struct pneigh_entry
-diff -urNp linux-2.6.32.39/include/net/netlink.h linux-2.6.32.39/include/net/netlink.h
---- linux-2.6.32.39/include/net/netlink.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/netlink.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/net/netlink.h linux-2.6.32.40/include/net/netlink.h
+--- linux-2.6.32.40/include/net/netlink.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/netlink.h	2011-04-17 15:56:46.000000000 -0400
 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
@@ -50171,9 +55464,21 @@ diff -urNp linux-2.6.32.39/include/net/netlink.h linux-2.6.32.39/include/net/net
  }
  
  /**
-diff -urNp linux-2.6.32.39/include/net/sctp/sctp.h linux-2.6.32.39/include/net/sctp/sctp.h
---- linux-2.6.32.39/include/net/sctp/sctp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/sctp/sctp.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/net/netns/ipv4.h linux-2.6.32.40/include/net/netns/ipv4.h
+--- linux-2.6.32.40/include/net/netns/ipv4.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/netns/ipv4.h	2011-05-04 17:56:28.000000000 -0400
+@@ -54,7 +54,7 @@ struct netns_ipv4 {
+ 	int current_rt_cache_rebuild_count;
+ 
+ 	struct timer_list rt_secret_timer;
+-	atomic_t rt_genid;
++	atomic_unchecked_t rt_genid;
+ 
+ #ifdef CONFIG_IP_MROUTE
+ 	struct sock		*mroute_sk;
+diff -urNp linux-2.6.32.40/include/net/sctp/sctp.h linux-2.6.32.40/include/net/sctp/sctp.h
+--- linux-2.6.32.40/include/net/sctp/sctp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/sctp/sctp.h	2011-04-17 15:56:46.000000000 -0400
 @@ -305,8 +305,8 @@ extern int sctp_debug_flag;
  
  #else	/* SCTP_DEBUG */
@@ -50185,9 +55490,21 @@ diff -urNp linux-2.6.32.39/include/net/sctp/sctp.h linux-2.6.32.39/include/net/s
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.32.39/include/net/tcp.h linux-2.6.32.39/include/net/tcp.h
---- linux-2.6.32.39/include/net/tcp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/tcp.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/net/sock.h linux-2.6.32.40/include/net/sock.h
+--- linux-2.6.32.40/include/net/sock.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/sock.h	2011-05-04 17:56:28.000000000 -0400
+@@ -272,7 +272,7 @@ struct sock {
+ 	rwlock_t		sk_callback_lock;
+ 	int			sk_err,
+ 				sk_err_soft;
+-	atomic_t		sk_drops;
++	atomic_unchecked_t	sk_drops;
+ 	unsigned short		sk_ack_backlog;
+ 	unsigned short		sk_max_ack_backlog;
+ 	__u32			sk_priority;
+diff -urNp linux-2.6.32.40/include/net/tcp.h linux-2.6.32.40/include/net/tcp.h
+--- linux-2.6.32.40/include/net/tcp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/tcp.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1444,6 +1444,7 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
@@ -50196,9 +55513,9 @@ diff -urNp linux-2.6.32.39/include/net/tcp.h linux-2.6.32.39/include/net/tcp.h
  	struct file_operations	seq_fops;
  	struct seq_operations	seq_ops;
  };
-diff -urNp linux-2.6.32.39/include/net/udp.h linux-2.6.32.39/include/net/udp.h
---- linux-2.6.32.39/include/net/udp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/net/udp.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/net/udp.h linux-2.6.32.40/include/net/udp.h
+--- linux-2.6.32.40/include/net/udp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/net/udp.h	2011-04-17 15:56:46.000000000 -0400
 @@ -187,6 +187,7 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -50207,9 +55524,25 @@ diff -urNp linux-2.6.32.39/include/net/udp.h linux-2.6.32.39/include/net/udp.h
  	struct file_operations	seq_fops;
  	struct seq_operations	seq_ops;
  };
-diff -urNp linux-2.6.32.39/include/sound/ac97_codec.h linux-2.6.32.39/include/sound/ac97_codec.h
---- linux-2.6.32.39/include/sound/ac97_codec.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/sound/ac97_codec.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/scsi/scsi_device.h linux-2.6.32.40/include/scsi/scsi_device.h
+--- linux-2.6.32.40/include/scsi/scsi_device.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/include/scsi/scsi_device.h	2011-05-04 17:56:28.000000000 -0400
+@@ -156,9 +156,9 @@ struct scsi_device {
+ 	unsigned int max_device_blocked; /* what device_blocked counts down from  */
+ #define SCSI_DEFAULT_DEVICE_BLOCKED	3
+ 
+-	atomic_t iorequest_cnt;
+-	atomic_t iodone_cnt;
+-	atomic_t ioerr_cnt;
++	atomic_unchecked_t iorequest_cnt;
++	atomic_unchecked_t iodone_cnt;
++	atomic_unchecked_t ioerr_cnt;
+ 
+ 	struct device		sdev_gendev,
+ 				sdev_dev;
+diff -urNp linux-2.6.32.40/include/sound/ac97_codec.h linux-2.6.32.40/include/sound/ac97_codec.h
+--- linux-2.6.32.40/include/sound/ac97_codec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/sound/ac97_codec.h	2011-04-17 15:56:46.000000000 -0400
 @@ -419,15 +419,15 @@
  struct snd_ac97;
  
@@ -50242,9 +55575,21 @@ diff -urNp linux-2.6.32.39/include/sound/ac97_codec.h linux-2.6.32.39/include/so
  	void *private_data;
  	void (*private_free) (struct snd_ac97 *ac97);
  	/* --- */
-diff -urNp linux-2.6.32.39/include/trace/events/irq.h linux-2.6.32.39/include/trace/events/irq.h
---- linux-2.6.32.39/include/trace/events/irq.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/trace/events/irq.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/sound/ymfpci.h linux-2.6.32.40/include/sound/ymfpci.h
+--- linux-2.6.32.40/include/sound/ymfpci.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/sound/ymfpci.h	2011-05-04 17:56:28.000000000 -0400
+@@ -358,7 +358,7 @@ struct snd_ymfpci {
+ 	spinlock_t reg_lock;
+ 	spinlock_t voice_lock;
+ 	wait_queue_head_t interrupt_sleep;
+-	atomic_t interrupt_sleep_count;
++	atomic_unchecked_t interrupt_sleep_count;
+ 	struct snd_info_entry *proc_entry;
+ 	const struct firmware *dsp_microcode;
+ 	const struct firmware *controller_microcode;
+diff -urNp linux-2.6.32.40/include/trace/events/irq.h linux-2.6.32.40/include/trace/events/irq.h
+--- linux-2.6.32.40/include/trace/events/irq.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/trace/events/irq.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@
   */
  TRACE_EVENT(irq_handler_entry,
@@ -50281,9 +55626,9 @@ diff -urNp linux-2.6.32.39/include/trace/events/irq.h linux-2.6.32.39/include/tr
  
  	TP_ARGS(h, vec),
  
-diff -urNp linux-2.6.32.39/include/video/uvesafb.h linux-2.6.32.39/include/video/uvesafb.h
---- linux-2.6.32.39/include/video/uvesafb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/include/video/uvesafb.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/include/video/uvesafb.h linux-2.6.32.40/include/video/uvesafb.h
+--- linux-2.6.32.40/include/video/uvesafb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/include/video/uvesafb.h	2011-04-17 15:56:46.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -50292,9 +55637,9 @@ diff -urNp linux-2.6.32.39/include/video/uvesafb.h linux-2.6.32.39/include/video
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-2.6.32.39/init/do_mounts.c linux-2.6.32.39/init/do_mounts.c
---- linux-2.6.32.39/init/do_mounts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/do_mounts.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/do_mounts.c linux-2.6.32.40/init/do_mounts.c
+--- linux-2.6.32.40/init/do_mounts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/init/do_mounts.c	2011-04-17 15:56:46.000000000 -0400
 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -50340,9 +55685,9 @@ diff -urNp linux-2.6.32.39/init/do_mounts.c linux-2.6.32.39/init/do_mounts.c
 +	sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
 +	sys_chroot((__force char __user *)".");
  }
-diff -urNp linux-2.6.32.39/init/do_mounts.h linux-2.6.32.39/init/do_mounts.h
---- linux-2.6.32.39/init/do_mounts.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/do_mounts.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/do_mounts.h linux-2.6.32.40/init/do_mounts.h
+--- linux-2.6.32.40/init/do_mounts.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/init/do_mounts.h	2011-04-17 15:56:46.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -50362,9 +55707,9 @@ diff -urNp linux-2.6.32.39/init/do_mounts.h linux-2.6.32.39/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-2.6.32.39/init/do_mounts_initrd.c linux-2.6.32.39/init/do_mounts_initrd.c
---- linux-2.6.32.39/init/do_mounts_initrd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/do_mounts_initrd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/do_mounts_initrd.c linux-2.6.32.40/init/do_mounts_initrd.c
+--- linux-2.6.32.40/init/do_mounts_initrd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/init/do_mounts_initrd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
  	sys_close(old_fd);sys_close(root_fd);
  	sys_close(0);sys_close(1);sys_close(2);
@@ -50448,9 +55793,9 @@ diff -urNp linux-2.6.32.39/init/do_mounts_initrd.c linux-2.6.32.39/init/do_mount
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-2.6.32.39/init/do_mounts_md.c linux-2.6.32.39/init/do_mounts_md.c
---- linux-2.6.32.39/init/do_mounts_md.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/do_mounts_md.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/do_mounts_md.c linux-2.6.32.40/init/do_mounts_md.c
+--- linux-2.6.32.40/init/do_mounts_md.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/init/do_mounts_md.c	2011-04-17 15:56:46.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -50478,9 +55823,9 @@ diff -urNp linux-2.6.32.39/init/do_mounts_md.c linux-2.6.32.39/init/do_mounts_md
  	if (fd >= 0) {
  		sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
  		sys_close(fd);
-diff -urNp linux-2.6.32.39/init/initramfs.c linux-2.6.32.39/init/initramfs.c
---- linux-2.6.32.39/init/initramfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/initramfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/initramfs.c linux-2.6.32.40/init/initramfs.c
+--- linux-2.6.32.40/init/initramfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/init/initramfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -50589,9 +55934,9 @@ diff -urNp linux-2.6.32.39/init/initramfs.c linux-2.6.32.39/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-2.6.32.39/init/Kconfig linux-2.6.32.39/init/Kconfig
---- linux-2.6.32.39/init/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/Kconfig linux-2.6.32.40/init/Kconfig
+--- linux-2.6.32.40/init/Kconfig	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/init/Kconfig	2011-05-10 22:12:34.000000000 -0400
 @@ -1004,7 +1004,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
@@ -50601,9 +55946,9 @@ diff -urNp linux-2.6.32.39/init/Kconfig linux-2.6.32.39/init/Kconfig
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.32.39/init/main.c linux-2.6.32.39/init/main.c
---- linux-2.6.32.39/init/main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/main.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/main.c linux-2.6.32.40/init/main.c
+--- linux-2.6.32.40/init/main.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/init/main.c	2011-05-10 22:12:34.000000000 -0400
 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 
  #ifdef CONFIG_TC
  extern void tc_init(void);
@@ -50660,7 +56005,7 @@ diff -urNp linux-2.6.32.39/init/main.c linux-2.6.32.39/init/main.c
  static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -697,52 +739,53 @@ int initcall_debug;
+@@ -705,52 +747,53 @@ int initcall_debug;
  core_param(initcall_debug, initcall_debug, bool, 0644);
  
  static char msgbuf[64];
@@ -50730,7 +56075,7 @@ diff -urNp linux-2.6.32.39/init/main.c linux-2.6.32.39/init/main.c
  }
  
  
-@@ -881,11 +924,13 @@ static int __init kernel_init(void * unu
+@@ -893,11 +936,13 @@ static int __init kernel_init(void * unu
  	if (!ramdisk_execute_command)
  		ramdisk_execute_command = "/init";
  
@@ -50745,9 +56090,9 @@ diff -urNp linux-2.6.32.39/init/main.c linux-2.6.32.39/init/main.c
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.32.39/init/noinitramfs.c linux-2.6.32.39/init/noinitramfs.c
---- linux-2.6.32.39/init/noinitramfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/init/noinitramfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/init/noinitramfs.c linux-2.6.32.40/init/noinitramfs.c
+--- linux-2.6.32.40/init/noinitramfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/init/noinitramfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,7 +29,7 @@ static int __init default_rootfs(void)
  {
  	int err;
@@ -50766,9 +56111,9 @@ diff -urNp linux-2.6.32.39/init/noinitramfs.c linux-2.6.32.39/init/noinitramfs.c
  	if (err < 0)
  		goto out;
  
-diff -urNp linux-2.6.32.39/ipc/mqueue.c linux-2.6.32.39/ipc/mqueue.c
---- linux-2.6.32.39/ipc/mqueue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/ipc/mqueue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/ipc/mqueue.c linux-2.6.32.40/ipc/mqueue.c
+--- linux-2.6.32.40/ipc/mqueue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/ipc/mqueue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -50777,9 +56122,30 @@ diff -urNp linux-2.6.32.39/ipc/mqueue.c linux-2.6.32.39/ipc/mqueue.c
  			spin_lock(&mq_lock);
  			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		 	    u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.32.39/ipc/shm.c linux-2.6.32.39/ipc/shm.c
---- linux-2.6.32.39/ipc/shm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/ipc/shm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/ipc/sem.c linux-2.6.32.40/ipc/sem.c
+--- linux-2.6.32.40/ipc/sem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/ipc/sem.c	2011-05-11 18:25:15.000000000 -0400
+@@ -671,6 +671,8 @@ static int semctl_main(struct ipc_namesp
+ 	ushort* sem_io = fast_sem_io;
+ 	int nsems;
+ 
++	stackleak_probe(fast_sem_io);
++
+ 	sma = sem_lock_check(ns, semid);
+ 	if (IS_ERR(sma))
+ 		return PTR_ERR(sma);
+@@ -1071,6 +1073,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
+ 	unsigned long jiffies_left = 0;
+ 	struct ipc_namespace *ns;
+ 
++	stackleak_probe(fast_sops);
++
+ 	ns = current->nsproxy->ipc_ns;
+ 
+ 	if (nsops < 1 || semid < 0)
+diff -urNp linux-2.6.32.40/ipc/shm.c linux-2.6.32.40/ipc/shm.c
+--- linux-2.6.32.40/ipc/shm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/ipc/shm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -50832,9 +56198,9 @@ diff -urNp linux-2.6.32.39/ipc/shm.c linux-2.6.32.39/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-2.6.32.39/kernel/acct.c linux-2.6.32.39/kernel/acct.c
---- linux-2.6.32.39/kernel/acct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/acct.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/acct.c linux-2.6.32.40/kernel/acct.c
+--- linux-2.6.32.40/kernel/acct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/acct.c	2011-04-17 15:56:46.000000000 -0400
 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -50844,9 +56210,45 @@ diff -urNp linux-2.6.32.39/kernel/acct.c linux-2.6.32.39/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-2.6.32.39/kernel/audit.c linux-2.6.32.39/kernel/audit.c
---- linux-2.6.32.39/kernel/audit.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/audit.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/audit.c linux-2.6.32.40/kernel/audit.c
+--- linux-2.6.32.40/kernel/audit.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/audit.c	2011-05-04 17:56:28.000000000 -0400
+@@ -110,7 +110,7 @@ u32		audit_sig_sid = 0;
+    3) suppressed due to audit_rate_limit
+    4) suppressed due to audit_backlog_limit
+ */
+-static atomic_t    audit_lost = ATOMIC_INIT(0);
++static atomic_unchecked_t    audit_lost = ATOMIC_INIT(0);
+ 
+ /* The netlink socket. */
+ static struct sock *audit_sock;
+@@ -232,7 +232,7 @@ void audit_log_lost(const char *message)
+ 	unsigned long		now;
+ 	int			print;
+ 
+-	atomic_inc(&audit_lost);
++	atomic_inc_unchecked(&audit_lost);
+ 
+ 	print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
+ 
+@@ -251,7 +251,7 @@ void audit_log_lost(const char *message)
+ 			printk(KERN_WARNING
+ 				"audit: audit_lost=%d audit_rate_limit=%d "
+ 				"audit_backlog_limit=%d\n",
+-				atomic_read(&audit_lost),
++				atomic_read_unchecked(&audit_lost),
+ 				audit_rate_limit,
+ 				audit_backlog_limit);
+ 		audit_panic(message);
+@@ -691,7 +691,7 @@ static int audit_receive_msg(struct sk_b
+ 		status_set.pid		 = audit_pid;
+ 		status_set.rate_limit	 = audit_rate_limit;
+ 		status_set.backlog_limit = audit_backlog_limit;
+-		status_set.lost		 = atomic_read(&audit_lost);
++		status_set.lost		 = atomic_read_unchecked(&audit_lost);
+ 		status_set.backlog	 = skb_queue_len(&audit_skb_queue);
+ 		audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
+ 				 &status_set, sizeof(status_set));
 @@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_b
  			spin_unlock_irq(&tsk->sighand->siglock);
  		}
@@ -50860,9 +56262,30 @@ diff -urNp linux-2.6.32.39/kernel/audit.c linux-2.6.32.39/kernel/audit.c
  		break;
  	}
  	case AUDIT_TTY_SET: {
-diff -urNp linux-2.6.32.39/kernel/capability.c linux-2.6.32.39/kernel/capability.c
---- linux-2.6.32.39/kernel/capability.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/capability.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/auditsc.c linux-2.6.32.40/kernel/auditsc.c
+--- linux-2.6.32.40/kernel/auditsc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/auditsc.c	2011-05-04 17:56:28.000000000 -0400
+@@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_conte
+ }
+ 
+ /* global counter which is incremented every time something logs in */
+-static atomic_t session_id = ATOMIC_INIT(0);
++static atomic_unchecked_t session_id = ATOMIC_INIT(0);
+ 
+ /**
+  * audit_set_loginuid - set a task's audit_context loginuid
+@@ -2126,7 +2126,7 @@ static atomic_t session_id = ATOMIC_INIT
+  */
+ int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
+ {
+-	unsigned int sessionid = atomic_inc_return(&session_id);
++	unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
+ 	struct audit_context *context = task->audit_context;
+ 
+ 	if (context && context->in_syscall) {
+diff -urNp linux-2.6.32.40/kernel/capability.c linux-2.6.32.40/kernel/capability.c
+--- linux-2.6.32.40/kernel/capability.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/capability.c	2011-04-17 15:56:46.000000000 -0400
 @@ -305,10 +305,26 @@ int capable(int cap)
  		BUG();
  	}
@@ -50891,9 +56314,9 @@ diff -urNp linux-2.6.32.39/kernel/capability.c linux-2.6.32.39/kernel/capability
 +
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.32.39/kernel/configs.c linux-2.6.32.39/kernel/configs.c
---- linux-2.6.32.39/kernel/configs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/configs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/configs.c linux-2.6.32.40/kernel/configs.c
+--- linux-2.6.32.40/kernel/configs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/configs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -50914,9 +56337,9 @@ diff -urNp linux-2.6.32.39/kernel/configs.c linux-2.6.32.39/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.39/kernel/cpu.c linux-2.6.32.39/kernel/cpu.c
---- linux-2.6.32.39/kernel/cpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/cpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/cpu.c linux-2.6.32.40/kernel/cpu.c
+--- linux-2.6.32.40/kernel/cpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/cpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@
  /* Serializes the updates to cpu_online_mask, cpu_present_mask */
  static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -50926,9 +56349,9 @@ diff -urNp linux-2.6.32.39/kernel/cpu.c linux-2.6.32.39/kernel/cpu.c
  
  /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
   * Should always be manipulated under cpu_add_remove_lock
-diff -urNp linux-2.6.32.39/kernel/cred.c linux-2.6.32.39/kernel/cred.c
---- linux-2.6.32.39/kernel/cred.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/cred.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/cred.c linux-2.6.32.40/kernel/cred.c
+--- linux-2.6.32.40/kernel/cred.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/cred.c	2011-04-17 15:56:46.000000000 -0400
 @@ -544,6 +544,8 @@ int commit_creds(struct cred *new)
  
  	get_cred(new); /* we will require a ref for the subj creds too */
@@ -50938,9 +56361,9 @@ diff -urNp linux-2.6.32.39/kernel/cred.c linux-2.6.32.39/kernel/cred.c
  	/* dumpability changes */
  	if (old->euid != new->euid ||
  	    old->egid != new->egid ||
-diff -urNp linux-2.6.32.39/kernel/exit.c linux-2.6.32.39/kernel/exit.c
---- linux-2.6.32.39/kernel/exit.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/exit.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/exit.c linux-2.6.32.40/kernel/exit.c
+--- linux-2.6.32.40/kernel/exit.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/exit.c	2011-04-17 15:56:46.000000000 -0400
 @@ -55,6 +55,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -51069,9 +56492,9 @@ diff -urNp linux-2.6.32.39/kernel/exit.c linux-2.6.32.39/kernel/exit.c
  
  		get_task_struct(p);
  		read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.32.39/kernel/fork.c linux-2.6.32.39/kernel/fork.c
---- linux-2.6.32.39/kernel/fork.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/fork.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/fork.c linux-2.6.32.40/kernel/fork.c
+--- linux-2.6.32.40/kernel/fork.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/fork.c	2011-04-17 15:56:46.000000000 -0400
 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
@@ -51210,9 +56633,9 @@ diff -urNp linux-2.6.32.39/kernel/fork.c linux-2.6.32.39/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-2.6.32.39/kernel/futex.c linux-2.6.32.39/kernel/futex.c
---- linux-2.6.32.39/kernel/futex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/futex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/futex.c linux-2.6.32.40/kernel/futex.c
+--- linux-2.6.32.40/kernel/futex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/futex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -51297,9 +56720,9 @@ diff -urNp linux-2.6.32.39/kernel/futex.c linux-2.6.32.39/kernel/futex.c
  	if (curval == -EFAULT)
  		futex_cmpxchg_enabled = 1;
  
-diff -urNp linux-2.6.32.39/kernel/futex_compat.c linux-2.6.32.39/kernel/futex_compat.c
---- linux-2.6.32.39/kernel/futex_compat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/futex_compat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/futex_compat.c linux-2.6.32.40/kernel/futex_compat.c
+--- linux-2.6.32.40/kernel/futex_compat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/futex_compat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -51337,9 +56760,9 @@ diff -urNp linux-2.6.32.39/kernel/futex_compat.c linux-2.6.32.39/kernel/futex_co
  		head = p->compat_robust_list;
  		read_unlock(&tasklist_lock);
  	}
-diff -urNp linux-2.6.32.39/kernel/gcov/base.c linux-2.6.32.39/kernel/gcov/base.c
---- linux-2.6.32.39/kernel/gcov/base.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/gcov/base.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/gcov/base.c linux-2.6.32.40/kernel/gcov/base.c
+--- linux-2.6.32.40/kernel/gcov/base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/gcov/base.c	2011-04-17 15:56:46.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -51361,9 +56784,9 @@ diff -urNp linux-2.6.32.39/kernel/gcov/base.c linux-2.6.32.39/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-2.6.32.39/kernel/hrtimer.c linux-2.6.32.39/kernel/hrtimer.c
---- linux-2.6.32.39/kernel/hrtimer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/hrtimer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/hrtimer.c linux-2.6.32.40/kernel/hrtimer.c
+--- linux-2.6.32.40/kernel/hrtimer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/hrtimer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
@@ -51373,9 +56796,9 @@ diff -urNp linux-2.6.32.39/kernel/hrtimer.c linux-2.6.32.39/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.32.39/kernel/kallsyms.c linux-2.6.32.39/kernel/kallsyms.c
---- linux-2.6.32.39/kernel/kallsyms.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/kallsyms.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/kallsyms.c linux-2.6.32.40/kernel/kallsyms.c
+--- linux-2.6.32.40/kernel/kallsyms.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/kallsyms.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -51478,9 +56901,9 @@ diff -urNp linux-2.6.32.39/kernel/kallsyms.c linux-2.6.32.39/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-2.6.32.39/kernel/kgdb.c linux-2.6.32.39/kernel/kgdb.c
---- linux-2.6.32.39/kernel/kgdb.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/kernel/kgdb.c	2011-04-17 17:03:58.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/kgdb.c linux-2.6.32.40/kernel/kgdb.c
+--- linux-2.6.32.40/kernel/kgdb.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
 @@ -86,7 +86,7 @@ static int			kgdb_io_module_registered;
  /* Guard for recursive entry */
  static int			exception_level;
@@ -51490,6 +56913,44 @@ diff -urNp linux-2.6.32.39/kernel/kgdb.c linux-2.6.32.39/kernel/kgdb.c
  static DEFINE_SPINLOCK(kgdb_registration_lock);
  
  /* kgdb console driver is loaded */
+@@ -123,7 +123,7 @@ atomic_t			kgdb_active = ATOMIC_INIT(-1)
+  */
+ static atomic_t			passive_cpu_wait[NR_CPUS];
+ static atomic_t			cpu_in_kgdb[NR_CPUS];
+-atomic_t			kgdb_setting_breakpoint;
++atomic_unchecked_t		kgdb_setting_breakpoint;
+ 
+ struct task_struct		*kgdb_usethread;
+ struct task_struct		*kgdb_contthread;
+@@ -140,7 +140,7 @@ static unsigned long		gdb_regs[(NUMREGBY
+ 					sizeof(unsigned long)];
+ 
+ /* to keep track of the CPU which is doing the single stepping*/
+-atomic_t			kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
++atomic_unchecked_t		kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
+ 
+ /*
+  * If you are debugging a problem where roundup (the collection of
+@@ -815,7 +815,7 @@ static int kgdb_io_ready(int print_wait)
+ 		return 0;
+ 	if (kgdb_connected)
+ 		return 1;
+-	if (atomic_read(&kgdb_setting_breakpoint))
++	if (atomic_read_unchecked(&kgdb_setting_breakpoint))
+ 		return 1;
+ 	if (print_wait)
+ 		printk(KERN_CRIT "KGDB: Waiting for remote debugger\n");
+@@ -1426,8 +1426,8 @@ acquirelock:
+ 	 * instance of the exception handler wanted to come into the
+ 	 * debugger on a different CPU via a single step
+ 	 */
+-	if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
+-	    atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
++	if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
++	    atomic_read_unchecked(&kgdb_cpu_doing_single_step) != cpu) {
+ 
+ 		atomic_set(&kgdb_active, -1);
+ 		touch_softlockup_watchdog();
 @@ -1634,7 +1634,7 @@ static void kgdb_initial_breakpoint(void
   *
   *	Register it with the KGDB core.
@@ -51508,9 +56969,23 @@ diff -urNp linux-2.6.32.39/kernel/kgdb.c linux-2.6.32.39/kernel/kgdb.c
  {
  	BUG_ON(kgdb_connected);
  
-diff -urNp linux-2.6.32.39/kernel/kmod.c linux-2.6.32.39/kernel/kmod.c
---- linux-2.6.32.39/kernel/kmod.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/kmod.c	2011-04-17 15:56:46.000000000 -0400
+@@ -1712,11 +1712,11 @@ EXPORT_SYMBOL_GPL(kgdb_unregister_io_mod
+  */
+ void kgdb_breakpoint(void)
+ {
+-	atomic_set(&kgdb_setting_breakpoint, 1);
++	atomic_set_unchecked(&kgdb_setting_breakpoint, 1);
+ 	wmb(); /* Sync point before breakpoint */
+ 	arch_kgdb_breakpoint();
+ 	wmb(); /* Sync point after breakpoint */
+-	atomic_set(&kgdb_setting_breakpoint, 0);
++	atomic_set_unchecked(&kgdb_setting_breakpoint, 0);
+ }
+ EXPORT_SYMBOL_GPL(kgdb_breakpoint);
+ 
+diff -urNp linux-2.6.32.40/kernel/kmod.c linux-2.6.32.40/kernel/kmod.c
+--- linux-2.6.32.40/kernel/kmod.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/kmod.c	2011-04-17 15:56:46.000000000 -0400
 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -51604,9 +57079,9 @@ diff -urNp linux-2.6.32.39/kernel/kmod.c linux-2.6.32.39/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-2.6.32.39/kernel/kprobes.c linux-2.6.32.39/kernel/kprobes.c
---- linux-2.6.32.39/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/kprobes.c linux-2.6.32.40/kernel/kprobes.c
+--- linux-2.6.32.40/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
  	 * kernel image and loaded module images reside. This is required
  	 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -51643,9 +57118,9 @@ diff -urNp linux-2.6.32.39/kernel/kprobes.c linux-2.6.32.39/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-2.6.32.39/kernel/lockdep.c linux-2.6.32.39/kernel/lockdep.c
---- linux-2.6.32.39/kernel/lockdep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/lockdep.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/lockdep.c linux-2.6.32.40/kernel/lockdep.c
+--- linux-2.6.32.40/kernel/lockdep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/lockdep.c	2011-04-17 15:56:46.000000000 -0400
 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
  /*
   * Various lockdep statistics:
@@ -51719,9 +57194,9 @@ diff -urNp linux-2.6.32.39/kernel/lockdep.c linux-2.6.32.39/kernel/lockdep.c
  	if (very_verbose(class)) {
  		printk("\nacquire class [%p] %s", class->key, class->name);
  		if (class->name_version > 1)
-diff -urNp linux-2.6.32.39/kernel/lockdep_internals.h linux-2.6.32.39/kernel/lockdep_internals.h
---- linux-2.6.32.39/kernel/lockdep_internals.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/lockdep_internals.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/lockdep_internals.h linux-2.6.32.40/kernel/lockdep_internals.h
+--- linux-2.6.32.40/kernel/lockdep_internals.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/lockdep_internals.h	2011-04-17 15:56:46.000000000 -0400
 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
  /*
   * Various lockdep statistics:
@@ -51769,9 +57244,9 @@ diff -urNp linux-2.6.32.39/kernel/lockdep_internals.h linux-2.6.32.39/kernel/loc
  #else
  # define debug_atomic_inc(ptr)		do { } while (0)
  # define debug_atomic_dec(ptr)		do { } while (0)
-diff -urNp linux-2.6.32.39/kernel/lockdep_proc.c linux-2.6.32.39/kernel/lockdep_proc.c
---- linux-2.6.32.39/kernel/lockdep_proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/lockdep_proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/lockdep_proc.c linux-2.6.32.40/kernel/lockdep_proc.c
+--- linux-2.6.32.40/kernel/lockdep_proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/lockdep_proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -51781,9 +57256,9 @@ diff -urNp linux-2.6.32.39/kernel/lockdep_proc.c linux-2.6.32.39/kernel/lockdep_
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-2.6.32.39/kernel/module.c linux-2.6.32.39/kernel/module.c
---- linux-2.6.32.39/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/module.c	2011-04-29 18:52:40.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/module.c linux-2.6.32.40/kernel/module.c
+--- linux-2.6.32.40/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/module.c	2011-04-29 18:52:40.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <linux/async.h>
  #include <linux/percpu.h>
@@ -52424,9 +57899,9 @@ diff -urNp linux-2.6.32.39/kernel/module.c linux-2.6.32.39/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-2.6.32.39/kernel/mutex.c linux-2.6.32.39/kernel/mutex.c
---- linux-2.6.32.39/kernel/mutex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/mutex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/mutex.c linux-2.6.32.40/kernel/mutex.c
+--- linux-2.6.32.40/kernel/mutex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/mutex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, 
  	 */
  
@@ -52464,9 +57939,9 @@ diff -urNp linux-2.6.32.39/kernel/mutex.c linux-2.6.32.39/kernel/mutex.c
  	mutex_set_owner(lock);
  
  	/* set it to 0 if there are no waiters left: */
-diff -urNp linux-2.6.32.39/kernel/mutex-debug.c linux-2.6.32.39/kernel/mutex-debug.c
---- linux-2.6.32.39/kernel/mutex-debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/mutex-debug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/mutex-debug.c linux-2.6.32.40/kernel/mutex-debug.c
+--- linux-2.6.32.40/kernel/mutex-debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/mutex-debug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -52504,9 +57979,9 @@ diff -urNp linux-2.6.32.39/kernel/mutex-debug.c linux-2.6.32.39/kernel/mutex-deb
  	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
  	mutex_clear_owner(lock);
  }
-diff -urNp linux-2.6.32.39/kernel/mutex-debug.h linux-2.6.32.39/kernel/mutex-debug.h
---- linux-2.6.32.39/kernel/mutex-debug.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/mutex-debug.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/mutex-debug.h linux-2.6.32.40/kernel/mutex-debug.h
+--- linux-2.6.32.40/kernel/mutex-debug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/mutex-debug.h	2011-04-17 15:56:46.000000000 -0400
 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -52527,9 +58002,9 @@ diff -urNp linux-2.6.32.39/kernel/mutex-debug.h linux-2.6.32.39/kernel/mutex-deb
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.32.39/kernel/mutex.h linux-2.6.32.39/kernel/mutex.h
---- linux-2.6.32.39/kernel/mutex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/mutex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/mutex.h linux-2.6.32.40/kernel/mutex.h
+--- linux-2.6.32.40/kernel/mutex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/mutex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@
  #ifdef CONFIG_SMP
  static inline void mutex_set_owner(struct mutex *lock)
@@ -52539,9 +58014,9 @@ diff -urNp linux-2.6.32.39/kernel/mutex.h linux-2.6.32.39/kernel/mutex.h
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.32.39/kernel/panic.c linux-2.6.32.39/kernel/panic.c
---- linux-2.6.32.39/kernel/panic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/panic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/panic.c linux-2.6.32.40/kernel/panic.c
+--- linux-2.6.32.40/kernel/panic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/panic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
@@ -52561,9 +58036,9 @@ diff -urNp linux-2.6.32.39/kernel/panic.c linux-2.6.32.39/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.32.39/kernel/params.c linux-2.6.32.39/kernel/params.c
---- linux-2.6.32.39/kernel/params.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/params.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/params.c linux-2.6.32.40/kernel/params.c
+--- linux-2.6.32.40/kernel/params.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/params.c	2011-04-17 15:56:46.000000000 -0400
 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 
  	return ret;
  }
@@ -52582,9 +58057,217 @@ diff -urNp linux-2.6.32.39/kernel/params.c linux-2.6.32.39/kernel/params.c
  	.filter = uevent_filter,
  };
  
-diff -urNp linux-2.6.32.39/kernel/pid.c linux-2.6.32.39/kernel/pid.c
---- linux-2.6.32.39/kernel/pid.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.39/kernel/pid.c	2011-04-18 19:22:38.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/perf_event.c linux-2.6.32.40/kernel/perf_event.c
+--- linux-2.6.32.40/kernel/perf_event.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/kernel/perf_event.c	2011-05-04 17:56:28.000000000 -0400
+@@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostl
+  */
+ int sysctl_perf_event_sample_rate __read_mostly = 100000;
+ 
+-static atomic64_t perf_event_id;
++static atomic64_unchecked_t perf_event_id;
+ 
+ /*
+  * Lock for (sysadmin-configurable) event reservations:
+@@ -1094,9 +1094,9 @@ static void __perf_event_sync_stat(struc
+ 	 * In order to keep per-task stats reliable we need to flip the event
+ 	 * values when we flip the contexts.
+ 	 */
+-	value = atomic64_read(&next_event->count);
+-	value = atomic64_xchg(&event->count, value);
+-	atomic64_set(&next_event->count, value);
++	value = atomic64_read_unchecked(&next_event->count);
++	value = atomic64_xchg_unchecked(&event->count, value);
++	atomic64_set_unchecked(&next_event->count, value);
+ 
+ 	swap(event->total_time_enabled, next_event->total_time_enabled);
+ 	swap(event->total_time_running, next_event->total_time_running);
+@@ -1552,7 +1552,7 @@ static u64 perf_event_read(struct perf_e
+ 		update_event_times(event);
+ 	}
+ 
+-	return atomic64_read(&event->count);
++	return atomic64_read_unchecked(&event->count);
+ }
+ 
+ /*
+@@ -1790,11 +1790,11 @@ static int perf_event_read_group(struct 
+ 	values[n++] = 1 + leader->nr_siblings;
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+ 		values[n++] = leader->total_time_enabled +
+-			atomic64_read(&leader->child_total_time_enabled);
++			atomic64_read_unchecked(&leader->child_total_time_enabled);
+ 	}
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+ 		values[n++] = leader->total_time_running +
+-			atomic64_read(&leader->child_total_time_running);
++			atomic64_read_unchecked(&leader->child_total_time_running);
+ 	}
+ 
+ 	size = n * sizeof(u64);
+@@ -1829,11 +1829,11 @@ static int perf_event_read_one(struct pe
+ 	values[n++] = perf_event_read_value(event);
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+ 		values[n++] = event->total_time_enabled +
+-			atomic64_read(&event->child_total_time_enabled);
++			atomic64_read_unchecked(&event->child_total_time_enabled);
+ 	}
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+ 		values[n++] = event->total_time_running +
+-			atomic64_read(&event->child_total_time_running);
++			atomic64_read_unchecked(&event->child_total_time_running);
+ 	}
+ 	if (read_format & PERF_FORMAT_ID)
+ 		values[n++] = primary_event_id(event);
+@@ -1903,7 +1903,7 @@ static unsigned int perf_poll(struct fil
+ static void perf_event_reset(struct perf_event *event)
+ {
+ 	(void)perf_event_read(event);
+-	atomic64_set(&event->count, 0);
++	atomic64_set_unchecked(&event->count, 0);
+ 	perf_event_update_userpage(event);
+ }
+ 
+@@ -2079,15 +2079,15 @@ void perf_event_update_userpage(struct p
+ 	++userpg->lock;
+ 	barrier();
+ 	userpg->index = perf_event_index(event);
+-	userpg->offset = atomic64_read(&event->count);
++	userpg->offset = atomic64_read_unchecked(&event->count);
+ 	if (event->state == PERF_EVENT_STATE_ACTIVE)
+-		userpg->offset -= atomic64_read(&event->hw.prev_count);
++		userpg->offset -= atomic64_read_unchecked(&event->hw.prev_count);
+ 
+ 	userpg->time_enabled = event->total_time_enabled +
+-			atomic64_read(&event->child_total_time_enabled);
++			atomic64_read_unchecked(&event->child_total_time_enabled);
+ 
+ 	userpg->time_running = event->total_time_running +
+-			atomic64_read(&event->child_total_time_running);
++			atomic64_read_unchecked(&event->child_total_time_running);
+ 
+ 	barrier();
+ 	++userpg->lock;
+@@ -2903,14 +2903,14 @@ static void perf_output_read_one(struct 
+ 	u64 values[4];
+ 	int n = 0;
+ 
+-	values[n++] = atomic64_read(&event->count);
++	values[n++] = atomic64_read_unchecked(&event->count);
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+ 		values[n++] = event->total_time_enabled +
+-			atomic64_read(&event->child_total_time_enabled);
++			atomic64_read_unchecked(&event->child_total_time_enabled);
+ 	}
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+ 		values[n++] = event->total_time_running +
+-			atomic64_read(&event->child_total_time_running);
++			atomic64_read_unchecked(&event->child_total_time_running);
+ 	}
+ 	if (read_format & PERF_FORMAT_ID)
+ 		values[n++] = primary_event_id(event);
+@@ -2940,7 +2940,7 @@ static void perf_output_read_group(struc
+ 	if (leader != event)
+ 		leader->pmu->read(leader);
+ 
+-	values[n++] = atomic64_read(&leader->count);
++	values[n++] = atomic64_read_unchecked(&leader->count);
+ 	if (read_format & PERF_FORMAT_ID)
+ 		values[n++] = primary_event_id(leader);
+ 
+@@ -2952,7 +2952,7 @@ static void perf_output_read_group(struc
+ 		if (sub != event)
+ 			sub->pmu->read(sub);
+ 
+-		values[n++] = atomic64_read(&sub->count);
++		values[n++] = atomic64_read_unchecked(&sub->count);
+ 		if (read_format & PERF_FORMAT_ID)
+ 			values[n++] = primary_event_id(sub);
+ 
+@@ -3787,7 +3787,7 @@ static void perf_swevent_add(struct perf
+ {
+ 	struct hw_perf_event *hwc = &event->hw;
+ 
+-	atomic64_add(nr, &event->count);
++	atomic64_add_unchecked(nr, &event->count);
+ 
+ 	if (!hwc->sample_period)
+ 		return;
+@@ -4044,9 +4044,9 @@ static void cpu_clock_perf_event_update(
+ 	u64 now;
+ 
+ 	now = cpu_clock(cpu);
+-	prev = atomic64_read(&event->hw.prev_count);
+-	atomic64_set(&event->hw.prev_count, now);
+-	atomic64_add(now - prev, &event->count);
++	prev = atomic64_read_unchecked(&event->hw.prev_count);
++	atomic64_set_unchecked(&event->hw.prev_count, now);
++	atomic64_add_unchecked(now - prev, &event->count);
+ }
+ 
+ static int cpu_clock_perf_event_enable(struct perf_event *event)
+@@ -4054,7 +4054,7 @@ static int cpu_clock_perf_event_enable(s
+ 	struct hw_perf_event *hwc = &event->hw;
+ 	int cpu = raw_smp_processor_id();
+ 
+-	atomic64_set(&hwc->prev_count, cpu_clock(cpu));
++	atomic64_set_unchecked(&hwc->prev_count, cpu_clock(cpu));
+ 	perf_swevent_start_hrtimer(event);
+ 
+ 	return 0;
+@@ -4086,9 +4086,9 @@ static void task_clock_perf_event_update
+ 	u64 prev;
+ 	s64 delta;
+ 
+-	prev = atomic64_xchg(&event->hw.prev_count, now);
++	prev = atomic64_xchg_unchecked(&event->hw.prev_count, now);
+ 	delta = now - prev;
+-	atomic64_add(delta, &event->count);
++	atomic64_add_unchecked(delta, &event->count);
+ }
+ 
+ static int task_clock_perf_event_enable(struct perf_event *event)
+@@ -4098,7 +4098,7 @@ static int task_clock_perf_event_enable(
+ 
+ 	now = event->ctx->time;
+ 
+-	atomic64_set(&hwc->prev_count, now);
++	atomic64_set_unchecked(&hwc->prev_count, now);
+ 
+ 	perf_swevent_start_hrtimer(event);
+ 
+@@ -4293,7 +4293,7 @@ perf_event_alloc(struct perf_event_attr 
+ 	event->parent		= parent_event;
+ 
+ 	event->ns		= get_pid_ns(current->nsproxy->pid_ns);
+-	event->id		= atomic64_inc_return(&perf_event_id);
++	event->id		= atomic64_inc_return_unchecked(&perf_event_id);
+ 
+ 	event->state		= PERF_EVENT_STATE_INACTIVE;
+ 
+@@ -4724,15 +4724,15 @@ static void sync_child_event(struct perf
+ 	if (child_event->attr.inherit_stat)
+ 		perf_event_read_event(child_event, child);
+ 
+-	child_val = atomic64_read(&child_event->count);
++	child_val = atomic64_read_unchecked(&child_event->count);
+ 
+ 	/*
+ 	 * Add back the child's count to the parent's count:
+ 	 */
+-	atomic64_add(child_val, &parent_event->count);
+-	atomic64_add(child_event->total_time_enabled,
++	atomic64_add_unchecked(child_val, &parent_event->count);
++	atomic64_add_unchecked(child_event->total_time_enabled,
+ 		     &parent_event->child_total_time_enabled);
+-	atomic64_add(child_event->total_time_running,
++	atomic64_add_unchecked(child_event->total_time_running,
+ 		     &parent_event->child_total_time_running);
+ 
+ 	/*
+diff -urNp linux-2.6.32.40/kernel/pid.c linux-2.6.32.40/kernel/pid.c
+--- linux-2.6.32.40/kernel/pid.c	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.40/kernel/pid.c	2011-04-18 19:22:38.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -52618,9 +58301,9 @@ diff -urNp linux-2.6.32.39/kernel/pid.c linux-2.6.32.39/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.32.39/kernel/posix-cpu-timers.c linux-2.6.32.39/kernel/posix-cpu-timers.c
---- linux-2.6.32.39/kernel/posix-cpu-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/posix-cpu-timers.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/posix-cpu-timers.c linux-2.6.32.40/kernel/posix-cpu-timers.c
+--- linux-2.6.32.40/kernel/posix-cpu-timers.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/posix-cpu-timers.c	2011-04-17 15:56:46.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -52629,9 +58312,9 @@ diff -urNp linux-2.6.32.39/kernel/posix-cpu-timers.c linux-2.6.32.39/kernel/posi
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-diff -urNp linux-2.6.32.39/kernel/posix-timers.c linux-2.6.32.39/kernel/posix-timers.c
---- linux-2.6.32.39/kernel/posix-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/posix-timers.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/posix-timers.c linux-2.6.32.40/kernel/posix-timers.c
+--- linux-2.6.32.40/kernel/posix-timers.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/posix-timers.c	2011-04-17 15:56:46.000000000 -0400
 @@ -42,6 +42,7 @@
  #include <linux/compiler.h>
  #include <linux/idr.h>
@@ -52654,9 +58337,9 @@ diff -urNp linux-2.6.32.39/kernel/posix-timers.c linux-2.6.32.39/kernel/posix-ti
  	return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
  }
  
-diff -urNp linux-2.6.32.39/kernel/power/hibernate.c linux-2.6.32.39/kernel/power/hibernate.c
---- linux-2.6.32.39/kernel/power/hibernate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/power/hibernate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/power/hibernate.c linux-2.6.32.40/kernel/power/hibernate.c
+--- linux-2.6.32.40/kernel/power/hibernate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/power/hibernate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -48,14 +48,14 @@ enum {
  
  static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -52674,9 +58357,9 @@ diff -urNp linux-2.6.32.39/kernel/power/hibernate.c linux-2.6.32.39/kernel/power
  {
  	if (ops && !(ops->begin && ops->end &&  ops->pre_snapshot
  	    && ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.32.39/kernel/power/poweroff.c linux-2.6.32.39/kernel/power/poweroff.c
---- linux-2.6.32.39/kernel/power/poweroff.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/power/poweroff.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/power/poweroff.c linux-2.6.32.40/kernel/power/poweroff.c
+--- linux-2.6.32.40/kernel/power/poweroff.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/power/poweroff.c	2011-04-17 15:56:46.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
@@ -52686,9 +58369,9 @@ diff -urNp linux-2.6.32.39/kernel/power/poweroff.c linux-2.6.32.39/kernel/power/
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-2.6.32.39/kernel/power/process.c linux-2.6.32.39/kernel/power/process.c
---- linux-2.6.32.39/kernel/power/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/power/process.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/power/process.c linux-2.6.32.40/kernel/power/process.c
+--- linux-2.6.32.40/kernel/power/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/power/process.c	2011-04-17 15:56:46.000000000 -0400
 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
  	struct timeval start, end;
  	u64 elapsed_csecs64;
@@ -52728,9 +58411,9 @@ diff -urNp linux-2.6.32.39/kernel/power/process.c linux-2.6.32.39/kernel/power/p
  
  	do_gettimeofday(&end);
  	elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-diff -urNp linux-2.6.32.39/kernel/power/suspend.c linux-2.6.32.39/kernel/power/suspend.c
---- linux-2.6.32.39/kernel/power/suspend.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/power/suspend.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/power/suspend.c linux-2.6.32.40/kernel/power/suspend.c
+--- linux-2.6.32.40/kernel/power/suspend.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/power/suspend.c	2011-04-17 15:56:46.000000000 -0400
 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
  	[PM_SUSPEND_MEM]	= "mem",
  };
@@ -52747,9 +58430,9 @@ diff -urNp linux-2.6.32.39/kernel/power/suspend.c linux-2.6.32.39/kernel/power/s
  {
  	mutex_lock(&pm_mutex);
  	suspend_ops = ops;
-diff -urNp linux-2.6.32.39/kernel/printk.c linux-2.6.32.39/kernel/printk.c
---- linux-2.6.32.39/kernel/printk.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/printk.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/printk.c linux-2.6.32.40/kernel/printk.c
+--- linux-2.6.32.40/kernel/printk.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/printk.c	2011-04-17 15:56:46.000000000 -0400
 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
  	char c;
  	int error = 0;
@@ -52762,9 +58445,69 @@ diff -urNp linux-2.6.32.39/kernel/printk.c linux-2.6.32.39/kernel/printk.c
  	error = security_syslog(type);
  	if (error)
  		return error;
-diff -urNp linux-2.6.32.39/kernel/ptrace.c linux-2.6.32.39/kernel/ptrace.c
---- linux-2.6.32.39/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/profile.c linux-2.6.32.40/kernel/profile.c
+--- linux-2.6.32.40/kernel/profile.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/profile.c	2011-05-04 17:56:28.000000000 -0400
+@@ -39,7 +39,7 @@ struct profile_hit {
+ /* Oprofile timer tick hook */
+ static int (*timer_hook)(struct pt_regs *) __read_mostly;
+ 
+-static atomic_t *prof_buffer;
++static atomic_unchecked_t *prof_buffer;
+ static unsigned long prof_len, prof_shift;
+ 
+ int prof_on __read_mostly;
+@@ -283,7 +283,7 @@ static void profile_flip_buffers(void)
+ 					hits[i].pc = 0;
+ 				continue;
+ 			}
+-			atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
++			atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
+ 			hits[i].hits = hits[i].pc = 0;
+ 		}
+ 	}
+@@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc, 
+ 	 * Add the current hit(s) and flush the write-queue out
+ 	 * to the global buffer:
+ 	 */
+-	atomic_add(nr_hits, &prof_buffer[pc]);
++	atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
+ 	for (i = 0; i < NR_PROFILE_HIT; ++i) {
+-		atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
++		atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
+ 		hits[i].pc = hits[i].hits = 0;
+ 	}
+ out:
+@@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc, 
+ 	if (prof_on != type || !prof_buffer)
+ 		return;
+ 	pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
+-	atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
++	atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
+ }
+ #endif /* !CONFIG_SMP */
+ EXPORT_SYMBOL_GPL(profile_hits);
+@@ -517,7 +517,7 @@ read_profile(struct file *file, char __u
+ 			return -EFAULT;
+ 		buf++; p++; count--; read++;
+ 	}
+-	pnt = (char *)prof_buffer + p - sizeof(atomic_t);
++	pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
+ 	if (copy_to_user(buf, (void *)pnt, count))
+ 		return -EFAULT;
+ 	read += count;
+@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file
+ 	}
+ #endif
+ 	profile_discard_flip_buffers();
+-	memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
++	memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
+ 	return count;
+ }
+ 
+diff -urNp linux-2.6.32.40/kernel/ptrace.c linux-2.6.32.40/kernel/ptrace.c
+--- linux-2.6.32.40/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
@@ -52910,9 +58653,161 @@ diff -urNp linux-2.6.32.39/kernel/ptrace.c linux-2.6.32.39/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-2.6.32.39/kernel/rcutree.c linux-2.6.32.39/kernel/rcutree.c
---- linux-2.6.32.39/kernel/rcutree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/rcutree.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/rcutorture.c linux-2.6.32.40/kernel/rcutorture.c
+--- linux-2.6.32.40/kernel/rcutorture.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/rcutorture.c	2011-05-04 17:56:28.000000000 -0400
+@@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
+ 	{ 0 };
+ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
+ 	{ 0 };
+-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
+-static atomic_t n_rcu_torture_alloc;
+-static atomic_t n_rcu_torture_alloc_fail;
+-static atomic_t n_rcu_torture_free;
+-static atomic_t n_rcu_torture_mberror;
+-static atomic_t n_rcu_torture_error;
++static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
++static atomic_unchecked_t n_rcu_torture_alloc;
++static atomic_unchecked_t n_rcu_torture_alloc_fail;
++static atomic_unchecked_t n_rcu_torture_free;
++static atomic_unchecked_t n_rcu_torture_mberror;
++static atomic_unchecked_t n_rcu_torture_error;
+ static long n_rcu_torture_timers;
+ static struct list_head rcu_torture_removed;
+ static cpumask_var_t shuffle_tmp_mask;
+@@ -187,11 +187,11 @@ rcu_torture_alloc(void)
+ 
+ 	spin_lock_bh(&rcu_torture_lock);
+ 	if (list_empty(&rcu_torture_freelist)) {
+-		atomic_inc(&n_rcu_torture_alloc_fail);
++		atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
+ 		spin_unlock_bh(&rcu_torture_lock);
+ 		return NULL;
+ 	}
+-	atomic_inc(&n_rcu_torture_alloc);
++	atomic_inc_unchecked(&n_rcu_torture_alloc);
+ 	p = rcu_torture_freelist.next;
+ 	list_del_init(p);
+ 	spin_unlock_bh(&rcu_torture_lock);
+@@ -204,7 +204,7 @@ rcu_torture_alloc(void)
+ static void
+ rcu_torture_free(struct rcu_torture *p)
+ {
+-	atomic_inc(&n_rcu_torture_free);
++	atomic_inc_unchecked(&n_rcu_torture_free);
+ 	spin_lock_bh(&rcu_torture_lock);
+ 	list_add_tail(&p->rtort_free, &rcu_torture_freelist);
+ 	spin_unlock_bh(&rcu_torture_lock);
+@@ -319,7 +319,7 @@ rcu_torture_cb(struct rcu_head *p)
+ 	i = rp->rtort_pipe_count;
+ 	if (i > RCU_TORTURE_PIPE_LEN)
+ 		i = RCU_TORTURE_PIPE_LEN;
+-	atomic_inc(&rcu_torture_wcount[i]);
++	atomic_inc_unchecked(&rcu_torture_wcount[i]);
+ 	if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
+ 		rp->rtort_mbtest = 0;
+ 		rcu_torture_free(rp);
+@@ -359,7 +359,7 @@ static void rcu_sync_torture_deferred_fr
+ 		i = rp->rtort_pipe_count;
+ 		if (i > RCU_TORTURE_PIPE_LEN)
+ 			i = RCU_TORTURE_PIPE_LEN;
+-		atomic_inc(&rcu_torture_wcount[i]);
++		atomic_inc_unchecked(&rcu_torture_wcount[i]);
+ 		if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
+ 			rp->rtort_mbtest = 0;
+ 			list_del(&rp->rtort_free);
+@@ -653,7 +653,7 @@ rcu_torture_writer(void *arg)
+ 			i = old_rp->rtort_pipe_count;
+ 			if (i > RCU_TORTURE_PIPE_LEN)
+ 				i = RCU_TORTURE_PIPE_LEN;
+-			atomic_inc(&rcu_torture_wcount[i]);
++			atomic_inc_unchecked(&rcu_torture_wcount[i]);
+ 			old_rp->rtort_pipe_count++;
+ 			cur_ops->deferred_free(old_rp);
+ 		}
+@@ -718,7 +718,7 @@ static void rcu_torture_timer(unsigned l
+ 		return;
+ 	}
+ 	if (p->rtort_mbtest == 0)
+-		atomic_inc(&n_rcu_torture_mberror);
++		atomic_inc_unchecked(&n_rcu_torture_mberror);
+ 	spin_lock(&rand_lock);
+ 	cur_ops->read_delay(&rand);
+ 	n_rcu_torture_timers++;
+@@ -776,7 +776,7 @@ rcu_torture_reader(void *arg)
+ 			continue;
+ 		}
+ 		if (p->rtort_mbtest == 0)
+-			atomic_inc(&n_rcu_torture_mberror);
++			atomic_inc_unchecked(&n_rcu_torture_mberror);
+ 		cur_ops->read_delay(&rand);
+ 		preempt_disable();
+ 		pipe_count = p->rtort_pipe_count;
+@@ -834,17 +834,17 @@ rcu_torture_printk(char *page)
+ 		       rcu_torture_current,
+ 		       rcu_torture_current_version,
+ 		       list_empty(&rcu_torture_freelist),
+-		       atomic_read(&n_rcu_torture_alloc),
+-		       atomic_read(&n_rcu_torture_alloc_fail),
+-		       atomic_read(&n_rcu_torture_free),
+-		       atomic_read(&n_rcu_torture_mberror),
++		       atomic_read_unchecked(&n_rcu_torture_alloc),
++		       atomic_read_unchecked(&n_rcu_torture_alloc_fail),
++		       atomic_read_unchecked(&n_rcu_torture_free),
++		       atomic_read_unchecked(&n_rcu_torture_mberror),
+ 		       n_rcu_torture_timers);
+-	if (atomic_read(&n_rcu_torture_mberror) != 0)
++	if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0)
+ 		cnt += sprintf(&page[cnt], " !!!");
+ 	cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
+ 	if (i > 1) {
+ 		cnt += sprintf(&page[cnt], "!!! ");
+-		atomic_inc(&n_rcu_torture_error);
++		atomic_inc_unchecked(&n_rcu_torture_error);
+ 		WARN_ON_ONCE(1);
+ 	}
+ 	cnt += sprintf(&page[cnt], "Reader Pipe: ");
+@@ -858,7 +858,7 @@ rcu_torture_printk(char *page)
+ 	cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
+ 	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
+ 		cnt += sprintf(&page[cnt], " %d",
+-			       atomic_read(&rcu_torture_wcount[i]));
++			       atomic_read_unchecked(&rcu_torture_wcount[i]));
+ 	}
+ 	cnt += sprintf(&page[cnt], "\n");
+ 	if (cur_ops->stats)
+@@ -1084,7 +1084,7 @@ rcu_torture_cleanup(void)
+ 
+ 	if (cur_ops->cleanup)
+ 		cur_ops->cleanup();
+-	if (atomic_read(&n_rcu_torture_error))
++	if (atomic_read_unchecked(&n_rcu_torture_error))
+ 		rcu_torture_print_module_parms("End of test: FAILURE");
+ 	else
+ 		rcu_torture_print_module_parms("End of test: SUCCESS");
+@@ -1138,13 +1138,13 @@ rcu_torture_init(void)
+ 
+ 	rcu_torture_current = NULL;
+ 	rcu_torture_current_version = 0;
+-	atomic_set(&n_rcu_torture_alloc, 0);
+-	atomic_set(&n_rcu_torture_alloc_fail, 0);
+-	atomic_set(&n_rcu_torture_free, 0);
+-	atomic_set(&n_rcu_torture_mberror, 0);
+-	atomic_set(&n_rcu_torture_error, 0);
++	atomic_set_unchecked(&n_rcu_torture_alloc, 0);
++	atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
++	atomic_set_unchecked(&n_rcu_torture_free, 0);
++	atomic_set_unchecked(&n_rcu_torture_mberror, 0);
++	atomic_set_unchecked(&n_rcu_torture_error, 0);
+ 	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
+-		atomic_set(&rcu_torture_wcount[i], 0);
++		atomic_set_unchecked(&rcu_torture_wcount[i], 0);
+ 	for_each_possible_cpu(cpu) {
+ 		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
+ 			per_cpu(rcu_torture_count, cpu)[i] = 0;
+diff -urNp linux-2.6.32.40/kernel/rcutree.c linux-2.6.32.40/kernel/rcutree.c
+--- linux-2.6.32.40/kernel/rcutree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/rcutree.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
@@ -52922,9 +58817,9 @@ diff -urNp linux-2.6.32.39/kernel/rcutree.c linux-2.6.32.39/kernel/rcutree.c
  {
  	/*
  	 * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.32.39/kernel/rcutree_plugin.h linux-2.6.32.39/kernel/rcutree_plugin.h
---- linux-2.6.32.39/kernel/rcutree_plugin.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/rcutree_plugin.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/rcutree_plugin.h linux-2.6.32.40/kernel/rcutree_plugin.h
+--- linux-2.6.32.40/kernel/rcutree_plugin.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/rcutree_plugin.h	2011-04-17 15:56:46.000000000 -0400
 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
   */
  void __rcu_read_lock(void)
@@ -52943,9 +58838,9 @@ diff -urNp linux-2.6.32.39/kernel/rcutree_plugin.h linux-2.6.32.39/kernel/rcutre
  	    unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
  		rcu_read_unlock_special(t);
  }
-diff -urNp linux-2.6.32.39/kernel/relay.c linux-2.6.32.39/kernel/relay.c
---- linux-2.6.32.39/kernel/relay.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/relay.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/relay.c linux-2.6.32.40/kernel/relay.c
+--- linux-2.6.32.40/kernel/relay.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/relay.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
  			       unsigned int flags,
  			       int *nonpad_ret)
@@ -52963,9 +58858,9 @@ diff -urNp linux-2.6.32.39/kernel/relay.c linux-2.6.32.39/kernel/relay.c
  
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
-diff -urNp linux-2.6.32.39/kernel/resource.c linux-2.6.32.39/kernel/resource.c
---- linux-2.6.32.39/kernel/resource.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/resource.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/resource.c linux-2.6.32.40/kernel/resource.c
+--- linux-2.6.32.40/kernel/resource.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/resource.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,8 +132,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -52985,9 +58880,9 @@ diff -urNp linux-2.6.32.39/kernel/resource.c linux-2.6.32.39/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.32.39/kernel/rtmutex.c linux-2.6.32.39/kernel/rtmutex.c
---- linux-2.6.32.39/kernel/rtmutex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/rtmutex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/rtmutex.c linux-2.6.32.40/kernel/rtmutex.c
+--- linux-2.6.32.40/kernel/rtmutex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/rtmutex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
  	 */
  	spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -52997,9 +58892,102 @@ diff -urNp linux-2.6.32.39/kernel/rtmutex.c linux-2.6.32.39/kernel/rtmutex.c
  	WARN_ON(pendowner->pi_blocked_on != waiter);
  	WARN_ON(pendowner->pi_blocked_on->lock != lock);
  
-diff -urNp linux-2.6.32.39/kernel/sched.c linux-2.6.32.39/kernel/sched.c
---- linux-2.6.32.39/kernel/sched.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/sched.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/rtmutex-tester.c linux-2.6.32.40/kernel/rtmutex-tester.c
+--- linux-2.6.32.40/kernel/rtmutex-tester.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/rtmutex-tester.c	2011-05-04 17:56:28.000000000 -0400
+@@ -21,7 +21,7 @@
+ #define MAX_RT_TEST_MUTEXES	8
+ 
+ static spinlock_t rttest_lock;
+-static atomic_t rttest_event;
++static atomic_unchecked_t rttest_event;
+ 
+ struct test_thread_data {
+ 	int			opcode;
+@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_
+ 
+ 	case RTTEST_LOCKCONT:
+ 		td->mutexes[td->opdata] = 1;
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		return 0;
+ 
+ 	case RTTEST_RESET:
+@@ -82,7 +82,7 @@ static int handle_op(struct test_thread_
+ 		return 0;
+ 
+ 	case RTTEST_RESETEVENT:
+-		atomic_set(&rttest_event, 0);
++		atomic_set_unchecked(&rttest_event, 0);
+ 		return 0;
+ 
+ 	default:
+@@ -99,9 +99,9 @@ static int handle_op(struct test_thread_
+ 			return ret;
+ 
+ 		td->mutexes[id] = 1;
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		rt_mutex_lock(&mutexes[id]);
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		td->mutexes[id] = 4;
+ 		return 0;
+ 
+@@ -112,9 +112,9 @@ static int handle_op(struct test_thread_
+ 			return ret;
+ 
+ 		td->mutexes[id] = 1;
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		td->mutexes[id] = ret ? 0 : 4;
+ 		return ret ? -EINTR : 0;
+ 
+@@ -123,9 +123,9 @@ static int handle_op(struct test_thread_
+ 		if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
+ 			return ret;
+ 
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		rt_mutex_unlock(&mutexes[id]);
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		td->mutexes[id] = 0;
+ 		return 0;
+ 
+@@ -187,7 +187,7 @@ void schedule_rt_mutex_test(struct rt_mu
+ 			break;
+ 
+ 		td->mutexes[dat] = 2;
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		break;
+ 
+ 	case RTTEST_LOCKBKL:
+@@ -208,7 +208,7 @@ void schedule_rt_mutex_test(struct rt_mu
+ 			return;
+ 
+ 		td->mutexes[dat] = 3;
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		break;
+ 
+ 	case RTTEST_LOCKNOWAIT:
+@@ -220,7 +220,7 @@ void schedule_rt_mutex_test(struct rt_mu
+ 			return;
+ 
+ 		td->mutexes[dat] = 1;
+-		td->event = atomic_add_return(1, &rttest_event);
++		td->event = atomic_add_return_unchecked(1, &rttest_event);
+ 		return;
+ 
+ 	case RTTEST_LOCKBKL:
+diff -urNp linux-2.6.32.40/kernel/sched.c linux-2.6.32.40/kernel/sched.c
+--- linux-2.6.32.40/kernel/sched.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/sched.c	2011-04-23 12:56:11.000000000 -0400
 @@ -5043,7 +5043,7 @@ out:
   * In CONFIG_NO_HZ case, the idle load balance owner will do the
   * rebalancing for all the cpus for whom scheduler ticks are stopped.
@@ -53068,9 +59056,9 @@ diff -urNp linux-2.6.32.39/kernel/sched.c linux-2.6.32.39/kernel/sched.c
  
  	if (cpu != group_first_cpu(sd->groups))
  		return;
-diff -urNp linux-2.6.32.39/kernel/signal.c linux-2.6.32.39/kernel/signal.c
---- linux-2.6.32.39/kernel/signal.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/kernel/signal.c	2011-04-17 17:03:58.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/signal.c linux-2.6.32.40/kernel/signal.c
+--- linux-2.6.32.40/kernel/signal.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/kernel/signal.c	2011-04-17 17:03:58.000000000 -0400
 @@ -41,12 +41,12 @@
  
  static struct kmem_cache *sigqueue_cachep;
@@ -53173,9 +59161,9 @@ diff -urNp linux-2.6.32.39/kernel/signal.c linux-2.6.32.39/kernel/signal.c
  
  	return ret;
  }
-diff -urNp linux-2.6.32.39/kernel/smp.c linux-2.6.32.39/kernel/smp.c
---- linux-2.6.32.39/kernel/smp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/smp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/smp.c linux-2.6.32.40/kernel/smp.c
+--- linux-2.6.32.40/kernel/smp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/smp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void 
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -53203,9 +59191,9 @@ diff -urNp linux-2.6.32.39/kernel/smp.c linux-2.6.32.39/kernel/smp.c
  {
  	spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.32.39/kernel/softirq.c linux-2.6.32.39/kernel/softirq.c
---- linux-2.6.32.39/kernel/softirq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/softirq.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/softirq.c linux-2.6.32.40/kernel/softirq.c
+--- linux-2.6.32.40/kernel/softirq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/softirq.c	2011-04-17 15:56:46.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -53260,9 +59248,9 @@ diff -urNp linux-2.6.32.39/kernel/softirq.c linux-2.6.32.39/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-2.6.32.39/kernel/sys.c linux-2.6.32.39/kernel/sys.c
---- linux-2.6.32.39/kernel/sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/sys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/sys.c linux-2.6.32.40/kernel/sys.c
+--- linux-2.6.32.40/kernel/sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/sys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
@@ -53398,9 +59386,9 @@ diff -urNp linux-2.6.32.39/kernel/sys.c linux-2.6.32.39/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-2.6.32.39/kernel/sysctl.c linux-2.6.32.39/kernel/sysctl.c
---- linux-2.6.32.39/kernel/sysctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/sysctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/sysctl.c linux-2.6.32.40/kernel/sysctl.c
+--- linux-2.6.32.40/kernel/sysctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/sysctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -63,6 +63,13 @@
  static int deprecated_sysctl_warning(struct __sysctl_args *args);
  
@@ -53632,9 +59620,9 @@ diff -urNp linux-2.6.32.39/kernel/sysctl.c linux-2.6.32.39/kernel/sysctl.c
 +EXPORT_SYMBOL(sysctl_string_modpriv);
  EXPORT_SYMBOL(sysctl_data);
  EXPORT_SYMBOL(unregister_sysctl_table);
-diff -urNp linux-2.6.32.39/kernel/sysctl_check.c linux-2.6.32.39/kernel/sysctl_check.c
---- linux-2.6.32.39/kernel/sysctl_check.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/sysctl_check.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/sysctl_check.c linux-2.6.32.40/kernel/sysctl_check.c
+--- linux-2.6.32.40/kernel/sysctl_check.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/sysctl_check.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
  		} else {
  			if ((table->strategy == sysctl_data) ||
@@ -53648,9 +59636,9 @@ diff -urNp linux-2.6.32.39/kernel/sysctl_check.c linux-2.6.32.39/kernel/sysctl_c
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.32.39/kernel/taskstats.c linux-2.6.32.39/kernel/taskstats.c
---- linux-2.6.32.39/kernel/taskstats.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/taskstats.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/taskstats.c linux-2.6.32.40/kernel/taskstats.c
+--- linux-2.6.32.40/kernel/taskstats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/taskstats.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,9 +26,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -53674,9 +59662,9 @@ diff -urNp linux-2.6.32.39/kernel/taskstats.c linux-2.6.32.39/kernel/taskstats.c
  	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.39/kernel/time/tick-broadcast.c linux-2.6.32.39/kernel/time/tick-broadcast.c
---- linux-2.6.32.39/kernel/time/tick-broadcast.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/time/tick-broadcast.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/time/tick-broadcast.c linux-2.6.32.40/kernel/time/tick-broadcast.c
+--- linux-2.6.32.40/kernel/time/tick-broadcast.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/time/tick-broadcast.c	2011-04-17 15:56:46.000000000 -0400
 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
@@ -53686,9 +59674,9 @@ diff -urNp linux-2.6.32.39/kernel/time/tick-broadcast.c linux-2.6.32.39/kernel/t
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.32.39/kernel/time/timekeeping.c linux-2.6.32.39/kernel/time/timekeeping.c
---- linux-2.6.32.39/kernel/time/timekeeping.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/time/timekeeping.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/time/timekeeping.c linux-2.6.32.40/kernel/time/timekeeping.c
+--- linux-2.6.32.40/kernel/time/timekeeping.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/time/timekeeping.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -53706,9 +59694,9 @@ diff -urNp linux-2.6.32.39/kernel/time/timekeeping.c linux-2.6.32.39/kernel/time
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-2.6.32.39/kernel/time/timer_list.c linux-2.6.32.39/kernel/time/timer_list.c
---- linux-2.6.32.39/kernel/time/timer_list.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/time/timer_list.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/time/timer_list.c linux-2.6.32.40/kernel/time/timer_list.c
+--- linux-2.6.32.40/kernel/time/timer_list.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/time/timer_list.c	2011-04-17 15:56:46.000000000 -0400
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -53750,9 +59738,36 @@ diff -urNp linux-2.6.32.39/kernel/time/timer_list.c linux-2.6.32.39/kernel/time/
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.32.39/kernel/time/timer_stats.c linux-2.6.32.39/kernel/time/timer_stats.c
---- linux-2.6.32.39/kernel/time/timer_stats.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/time/timer_stats.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/time/timer_stats.c linux-2.6.32.40/kernel/time/timer_stats.c
+--- linux-2.6.32.40/kernel/time/timer_stats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/time/timer_stats.c	2011-05-04 17:56:28.000000000 -0400
+@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
+ static unsigned long nr_entries;
+ static struct entry entries[MAX_ENTRIES];
+ 
+-static atomic_t overflow_count;
++static atomic_unchecked_t overflow_count;
+ 
+ /*
+  * The entries are in a hash-table, for fast lookup:
+@@ -140,7 +140,7 @@ static void reset_entries(void)
+ 	nr_entries = 0;
+ 	memset(entries, 0, sizeof(entries));
+ 	memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
+-	atomic_set(&overflow_count, 0);
++	atomic_set_unchecked(&overflow_count, 0);
+ }
+ 
+ static struct entry *alloc_entry(void)
+@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *time
+ 	if (likely(entry))
+ 		entry->count++;
+ 	else
+-		atomic_inc(&overflow_count);
++		atomic_inc_unchecked(&overflow_count);
+ 
+  out_unlock:
+ 	spin_unlock_irqrestore(lock, flags);
 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
  
  static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -53770,6 +59785,18 @@ diff -urNp linux-2.6.32.39/kernel/time/timer_stats.c linux-2.6.32.39/kernel/time
  }
  
  static int tstats_show(struct seq_file *m, void *v)
+@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *
+ 
+ 	seq_puts(m, "Timer Stats Version: v0.2\n");
+ 	seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
+-	if (atomic_read(&overflow_count))
++	if (atomic_read_unchecked(&overflow_count))
+ 		seq_printf(m, "Overflow: %d entries\n",
+-			atomic_read(&overflow_count));
++			atomic_read_unchecked(&overflow_count));
+ 
+ 	for (i = 0; i < nr_entries; i++) {
+ 		entry = entries + i;
 @@ -415,7 +419,11 @@ static int __init init_tstats_procfs(voi
  {
  	struct proc_dir_entry *pe;
@@ -53782,9 +59809,9 @@ diff -urNp linux-2.6.32.39/kernel/time/timer_stats.c linux-2.6.32.39/kernel/time
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.32.39/kernel/time.c linux-2.6.32.39/kernel/time.c
---- linux-2.6.32.39/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/time.c linux-2.6.32.40/kernel/time.c
+--- linux-2.6.32.40/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec 
  		return error;
  
@@ -53815,9 +59842,9 @@ diff -urNp linux-2.6.32.39/kernel/time.c linux-2.6.32.39/kernel/time.c
  {
  #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
  	return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.32.39/kernel/timer.c linux-2.6.32.39/kernel/timer.c
---- linux-2.6.32.39/kernel/timer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/timer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/timer.c linux-2.6.32.40/kernel/timer.c
+--- linux-2.6.32.40/kernel/timer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/timer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -53827,9 +59854,39 @@ diff -urNp linux-2.6.32.39/kernel/timer.c linux-2.6.32.39/kernel/timer.c
  {
  	struct tvec_base *base = __get_cpu_var(tvec_bases);
  
-diff -urNp linux-2.6.32.39/kernel/trace/ftrace.c linux-2.6.32.39/kernel/trace/ftrace.c
---- linux-2.6.32.39/kernel/trace/ftrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/ftrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/blktrace.c linux-2.6.32.40/kernel/trace/blktrace.c
+--- linux-2.6.32.40/kernel/trace/blktrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/blktrace.c	2011-05-04 17:56:28.000000000 -0400
+@@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct f
+ 	struct blk_trace *bt = filp->private_data;
+ 	char buf[16];
+ 
+-	snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
++	snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
+ 
+ 	return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
+ }
+@@ -376,7 +376,7 @@ static int blk_subbuf_start_callback(str
+ 		return 1;
+ 
+ 	bt = buf->chan->private_data;
+-	atomic_inc(&bt->dropped);
++	atomic_inc_unchecked(&bt->dropped);
+ 	return 0;
+ }
+ 
+@@ -477,7 +477,7 @@ int do_blk_trace_setup(struct request_qu
+ 
+ 	bt->dir = dir;
+ 	bt->dev = dev;
+-	atomic_set(&bt->dropped, 0);
++	atomic_set_unchecked(&bt->dropped, 0);
+ 
+ 	ret = -EIO;
+ 	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
+diff -urNp linux-2.6.32.40/kernel/trace/ftrace.c linux-2.6.32.40/kernel/trace/ftrace.c
+--- linux-2.6.32.40/kernel/trace/ftrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/ftrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, 
  
  	ip = rec->ip;
@@ -53851,9 +59908,9 @@ diff -urNp linux-2.6.32.39/kernel/trace/ftrace.c linux-2.6.32.39/kernel/trace/ft
  }
  
  /*
-diff -urNp linux-2.6.32.39/kernel/trace/ring_buffer.c linux-2.6.32.39/kernel/trace/ring_buffer.c
---- linux-2.6.32.39/kernel/trace/ring_buffer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/ring_buffer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/ring_buffer.c linux-2.6.32.40/kernel/trace/ring_buffer.c
+--- linux-2.6.32.40/kernel/trace/ring_buffer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/ring_buffer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
   * the reader page). But if the next page is a header page,
   * its flags will be non zero.
@@ -53863,9 +59920,9 @@ diff -urNp linux-2.6.32.39/kernel/trace/ring_buffer.c linux-2.6.32.39/kernel/tra
  rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
  		struct buffer_page *page, struct list_head *list)
  {
-diff -urNp linux-2.6.32.39/kernel/trace/trace.c linux-2.6.32.39/kernel/trace/trace.c
---- linux-2.6.32.39/kernel/trace/trace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/trace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/trace.c linux-2.6.32.40/kernel/trace/trace.c
+--- linux-2.6.32.40/kernel/trace/trace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/trace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3816,10 +3816,9 @@ static const struct file_operations trac
  };
  #endif
@@ -53890,9 +59947,9 @@ diff -urNp linux-2.6.32.39/kernel/trace/trace.c linux-2.6.32.39/kernel/trace/tra
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-2.6.32.39/kernel/trace/trace_events.c linux-2.6.32.39/kernel/trace/trace_events.c
---- linux-2.6.32.39/kernel/trace/trace_events.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/trace_events.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/trace_events.c linux-2.6.32.40/kernel/trace/trace_events.c
+--- linux-2.6.32.40/kernel/trace/trace_events.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/trace_events.c	2011-04-17 15:56:46.000000000 -0400
 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
   * Modules must own their file_operations to keep up with
   * reference counting.
@@ -53902,9 +59959,48 @@ diff -urNp linux-2.6.32.39/kernel/trace/trace_events.c linux-2.6.32.39/kernel/tr
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
-diff -urNp linux-2.6.32.39/kernel/trace/trace_output.c linux-2.6.32.39/kernel/trace/trace_output.c
---- linux-2.6.32.39/kernel/trace/trace_output.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/trace_output.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/trace_mmiotrace.c linux-2.6.32.40/kernel/trace/trace_mmiotrace.c
+--- linux-2.6.32.40/kernel/trace/trace_mmiotrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/trace_mmiotrace.c	2011-05-04 17:56:28.000000000 -0400
+@@ -23,7 +23,7 @@ struct header_iter {
+ static struct trace_array *mmio_trace_array;
+ static bool overrun_detected;
+ static unsigned long prev_overruns;
+-static atomic_t dropped_count;
++static atomic_unchecked_t dropped_count;
+ 
+ static void mmio_reset_data(struct trace_array *tr)
+ {
+@@ -126,7 +126,7 @@ static void mmio_close(struct trace_iter
+ 
+ static unsigned long count_overruns(struct trace_iterator *iter)
+ {
+-	unsigned long cnt = atomic_xchg(&dropped_count, 0);
++	unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
+ 	unsigned long over = ring_buffer_overruns(iter->tr->buffer);
+ 
+ 	if (over > prev_overruns)
+@@ -316,7 +316,7 @@ static void __trace_mmiotrace_rw(struct 
+ 	event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
+ 					  sizeof(*entry), 0, pc);
+ 	if (!event) {
+-		atomic_inc(&dropped_count);
++		atomic_inc_unchecked(&dropped_count);
+ 		return;
+ 	}
+ 	entry	= ring_buffer_event_data(event);
+@@ -346,7 +346,7 @@ static void __trace_mmiotrace_map(struct
+ 	event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
+ 					  sizeof(*entry), 0, pc);
+ 	if (!event) {
+-		atomic_inc(&dropped_count);
++		atomic_inc_unchecked(&dropped_count);
+ 		return;
+ 	}
+ 	entry	= ring_buffer_event_data(event);
+diff -urNp linux-2.6.32.40/kernel/trace/trace_output.c linux-2.6.32.40/kernel/trace/trace_output.c
+--- linux-2.6.32.40/kernel/trace/trace_output.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/trace_output.c	2011-04-17 15:56:46.000000000 -0400
 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 
  		return 0;
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -53914,9 +60010,9 @@ diff -urNp linux-2.6.32.39/kernel/trace/trace_output.c linux-2.6.32.39/kernel/tr
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-2.6.32.39/kernel/trace/trace_stack.c linux-2.6.32.39/kernel/trace/trace_stack.c
---- linux-2.6.32.39/kernel/trace/trace_stack.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/trace_stack.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/trace_stack.c linux-2.6.32.40/kernel/trace/trace_stack.c
+--- linux-2.6.32.40/kernel/trace/trace_stack.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/trace_stack.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -53926,9 +60022,9 @@ diff -urNp linux-2.6.32.39/kernel/trace/trace_stack.c linux-2.6.32.39/kernel/tra
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.32.39/kernel/trace/trace_workqueue.c linux-2.6.32.39/kernel/trace/trace_workqueue.c
---- linux-2.6.32.39/kernel/trace/trace_workqueue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/trace/trace_workqueue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/trace/trace_workqueue.c linux-2.6.32.40/kernel/trace/trace_workqueue.c
+--- linux-2.6.32.40/kernel/trace/trace_workqueue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/trace/trace_workqueue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -21,7 +21,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -53956,9 +60052,9 @@ diff -urNp linux-2.6.32.39/kernel/trace/trace_workqueue.c linux-2.6.32.39/kernel
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-2.6.32.39/kernel/user.c linux-2.6.32.39/kernel/user.c
---- linux-2.6.32.39/kernel/user.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/kernel/user.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/kernel/user.c linux-2.6.32.40/kernel/user.c
+--- linux-2.6.32.40/kernel/user.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/kernel/user.c	2011-04-17 15:56:46.000000000 -0400
 @@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
  		spin_lock_irq(&uidhash_lock);
  		up = uid_hash_find(uid, hashent);
@@ -53967,9 +60063,9 @@ diff -urNp linux-2.6.32.39/kernel/user.c linux-2.6.32.39/kernel/user.c
  			key_put(new->uid_keyring);
  			key_put(new->session_keyring);
  			kmem_cache_free(uid_cachep, new);
-diff -urNp linux-2.6.32.39/lib/bug.c linux-2.6.32.39/lib/bug.c
---- linux-2.6.32.39/lib/bug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/bug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/bug.c linux-2.6.32.40/lib/bug.c
+--- linux-2.6.32.40/lib/bug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/bug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
@@ -53979,9 +60075,9 @@ diff -urNp linux-2.6.32.39/lib/bug.c linux-2.6.32.39/lib/bug.c
  
  	printk(KERN_EMERG "------------[ cut here ]------------\n");
  
-diff -urNp linux-2.6.32.39/lib/debugobjects.c linux-2.6.32.39/lib/debugobjects.c
---- linux-2.6.32.39/lib/debugobjects.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/debugobjects.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/debugobjects.c linux-2.6.32.40/lib/debugobjects.c
+--- linux-2.6.32.40/lib/debugobjects.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/debugobjects.c	2011-04-17 15:56:46.000000000 -0400
 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
@@ -53991,9 +60087,9 @@ diff -urNp linux-2.6.32.39/lib/debugobjects.c linux-2.6.32.39/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-2.6.32.39/lib/dma-debug.c linux-2.6.32.39/lib/dma-debug.c
---- linux-2.6.32.39/lib/dma-debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/dma-debug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/dma-debug.c linux-2.6.32.40/lib/dma-debug.c
+--- linux-2.6.32.40/lib/dma-debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/dma-debug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -861,7 +861,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -54003,9 +60099,9 @@ diff -urNp linux-2.6.32.39/lib/dma-debug.c linux-2.6.32.39/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.32.39/lib/idr.c linux-2.6.32.39/lib/idr.c
---- linux-2.6.32.39/lib/idr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/idr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/idr.c linux-2.6.32.40/lib/idr.c
+--- linux-2.6.32.40/lib/idr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/idr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
  			id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
  
@@ -54015,9 +60111,9 @@ diff -urNp linux-2.6.32.39/lib/idr.c linux-2.6.32.39/lib/idr.c
  				*starting_id = id;
  				return IDR_NEED_TO_GROW;
  			}
-diff -urNp linux-2.6.32.39/lib/inflate.c linux-2.6.32.39/lib/inflate.c
---- linux-2.6.32.39/lib/inflate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/inflate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/inflate.c linux-2.6.32.40/lib/inflate.c
+--- linux-2.6.32.40/lib/inflate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/inflate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -266,7 +266,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -54027,9 +60123,9 @@ diff -urNp linux-2.6.32.39/lib/inflate.c linux-2.6.32.39/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.32.39/lib/Kconfig.debug linux-2.6.32.39/lib/Kconfig.debug
---- linux-2.6.32.39/lib/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/Kconfig.debug linux-2.6.32.40/lib/Kconfig.debug
+--- linux-2.6.32.40/lib/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
 @@ -905,7 +905,7 @@ config LATENCYTOP
  	select STACKTRACE
  	select SCHEDSTATS
@@ -54039,9 +60135,9 @@ diff -urNp linux-2.6.32.39/lib/Kconfig.debug linux-2.6.32.39/lib/Kconfig.debug
  	help
  	  Enable this option if you want to use the LatencyTOP tool
  	  to find out which userspace is blocking on what kernel operations.
-diff -urNp linux-2.6.32.39/lib/kobject.c linux-2.6.32.39/lib/kobject.c
---- linux-2.6.32.39/lib/kobject.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/kobject.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/kobject.c linux-2.6.32.40/lib/kobject.c
+--- linux-2.6.32.40/lib/kobject.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/kobject.c	2011-04-17 15:56:46.000000000 -0400
 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
  	return ret;
  }
@@ -54069,9 +60165,9 @@ diff -urNp linux-2.6.32.39/lib/kobject.c linux-2.6.32.39/lib/kobject.c
  				 struct kobject *parent_kobj)
  {
  	struct kset *kset;
-diff -urNp linux-2.6.32.39/lib/kobject_uevent.c linux-2.6.32.39/lib/kobject_uevent.c
---- linux-2.6.32.39/lib/kobject_uevent.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/kobject_uevent.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/kobject_uevent.c linux-2.6.32.40/lib/kobject_uevent.c
+--- linux-2.6.32.40/lib/kobject_uevent.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/kobject_uevent.c	2011-04-17 15:56:46.000000000 -0400
 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
  	const char *subsystem;
  	struct kobject *top_kobj;
@@ -54081,9 +60177,9 @@ diff -urNp linux-2.6.32.39/lib/kobject_uevent.c linux-2.6.32.39/lib/kobject_ueve
  	u64 seq;
  	int i = 0;
  	int retval = 0;
-diff -urNp linux-2.6.32.39/lib/kref.c linux-2.6.32.39/lib/kref.c
---- linux-2.6.32.39/lib/kref.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/kref.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/kref.c linux-2.6.32.40/lib/kref.c
+--- linux-2.6.32.40/lib/kref.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/kref.c	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -54093,9 +60189,9 @@ diff -urNp linux-2.6.32.39/lib/kref.c linux-2.6.32.39/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.32.39/lib/parser.c linux-2.6.32.39/lib/parser.c
---- linux-2.6.32.39/lib/parser.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/parser.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/parser.c linux-2.6.32.40/lib/parser.c
+--- linux-2.6.32.40/lib/parser.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/parser.c	2011-04-17 15:56:46.000000000 -0400
 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, 
  	char *buf;
  	int ret;
@@ -54105,9 +60201,9 @@ diff -urNp linux-2.6.32.39/lib/parser.c linux-2.6.32.39/lib/parser.c
  	if (!buf)
  		return -ENOMEM;
  	memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.32.39/lib/radix-tree.c linux-2.6.32.39/lib/radix-tree.c
---- linux-2.6.32.39/lib/radix-tree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/radix-tree.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/radix-tree.c linux-2.6.32.40/lib/radix-tree.c
+--- linux-2.6.32.40/lib/radix-tree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/radix-tree.c	2011-04-17 15:56:46.000000000 -0400
 @@ -81,7 +81,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -54117,9 +60213,9 @@ diff -urNp linux-2.6.32.39/lib/radix-tree.c linux-2.6.32.39/lib/radix-tree.c
  
  static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
  {
-diff -urNp linux-2.6.32.39/lib/random32.c linux-2.6.32.39/lib/random32.c
---- linux-2.6.32.39/lib/random32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/random32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/random32.c linux-2.6.32.40/lib/random32.c
+--- linux-2.6.32.40/lib/random32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/random32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
   */
  static inline u32 __seed(u32 x, u32 m)
@@ -54129,9 +60225,9 @@ diff -urNp linux-2.6.32.39/lib/random32.c linux-2.6.32.39/lib/random32.c
  }
  
  /**
-diff -urNp linux-2.6.32.39/lib/vsprintf.c linux-2.6.32.39/lib/vsprintf.c
---- linux-2.6.32.39/lib/vsprintf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/lib/vsprintf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/lib/vsprintf.c linux-2.6.32.40/lib/vsprintf.c
+--- linux-2.6.32.40/lib/vsprintf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/lib/vsprintf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -54232,14 +60328,14 @@ diff -urNp linux-2.6.32.39/lib/vsprintf.c linux-2.6.32.39/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-2.6.32.39/localversion-grsec linux-2.6.32.39/localversion-grsec
---- linux-2.6.32.39/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/localversion-grsec	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/localversion-grsec linux-2.6.32.40/localversion-grsec
+--- linux-2.6.32.40/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/localversion-grsec	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.32.39/Makefile linux-2.6.32.39/Makefile
---- linux-2.6.32.39/Makefile	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.39/Makefile	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.40/Makefile linux-2.6.32.40/Makefile
+--- linux-2.6.32.40/Makefile	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/Makefile	2011-05-10 22:12:26.000000000 -0400
 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -54268,9 +60364,21 @@ diff -urNp linux-2.6.32.39/Makefile linux-2.6.32.39/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.32.39/mm/filemap.c linux-2.6.32.39/mm/filemap.c
---- linux-2.6.32.39/mm/filemap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/filemap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/backing-dev.c linux-2.6.32.40/mm/backing-dev.c
+--- linux-2.6.32.40/mm/backing-dev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/backing-dev.c	2011-05-04 17:56:28.000000000 -0400
+@@ -484,7 +484,7 @@ static void bdi_add_to_pending(struct rc
+  * Add the default flusher task that gets created for any bdi
+  * that has dirty data pending writeout
+  */
+-void static bdi_add_default_flusher_task(struct backing_dev_info *bdi)
++static void bdi_add_default_flusher_task(struct backing_dev_info *bdi)
+ {
+ 	if (!bdi_cap_writeback_dirty(bdi))
+ 		return;
+diff -urNp linux-2.6.32.40/mm/filemap.c linux-2.6.32.40/mm/filemap.c
+--- linux-2.6.32.40/mm/filemap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/filemap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
@@ -54288,9 +60396,9 @@ diff -urNp linux-2.6.32.39/mm/filemap.c linux-2.6.32.39/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-2.6.32.39/mm/fremap.c linux-2.6.32.39/mm/fremap.c
---- linux-2.6.32.39/mm/fremap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/fremap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/fremap.c linux-2.6.32.40/mm/fremap.c
+--- linux-2.6.32.40/mm/fremap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/fremap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
@@ -54312,9 +60420,9 @@ diff -urNp linux-2.6.32.39/mm/fremap.c linux-2.6.32.39/mm/fremap.c
  		munlock_vma_pages_range(vma, start, start + size);
  		vma->vm_flags = saved_flags;
  	}
-diff -urNp linux-2.6.32.39/mm/highmem.c linux-2.6.32.39/mm/highmem.c
---- linux-2.6.32.39/mm/highmem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/highmem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/highmem.c linux-2.6.32.40/mm/highmem.c
+--- linux-2.6.32.40/mm/highmem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/highmem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -54340,9 +60448,9 @@ diff -urNp linux-2.6.32.39/mm/highmem.c linux-2.6.32.39/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.32.39/mm/hugetlb.c linux-2.6.32.39/mm/hugetlb.c
---- linux-2.6.32.39/mm/hugetlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/hugetlb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/hugetlb.c linux-2.6.32.40/mm/hugetlb.c
+--- linux-2.6.32.40/mm/hugetlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/hugetlb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
@@ -54422,9 +60530,9 @@ diff -urNp linux-2.6.32.39/mm/hugetlb.c linux-2.6.32.39/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-2.6.32.39/mm/Kconfig linux-2.6.32.39/mm/Kconfig
---- linux-2.6.32.39/mm/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/Kconfig linux-2.6.32.40/mm/Kconfig
+--- linux-2.6.32.40/mm/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -228,7 +228,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -54434,9 +60542,9 @@ diff -urNp linux-2.6.32.39/mm/Kconfig linux-2.6.32.39/mm/Kconfig
          help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.32.39/mm/kmemleak.c linux-2.6.32.39/mm/kmemleak.c
---- linux-2.6.32.39/mm/kmemleak.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/kmemleak.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/kmemleak.c linux-2.6.32.40/mm/kmemleak.c
+--- linux-2.6.32.40/mm/kmemleak.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/kmemleak.c	2011-04-17 15:56:46.000000000 -0400
 @@ -358,7 +358,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
@@ -54446,9 +60554,9 @@ diff -urNp linux-2.6.32.39/mm/kmemleak.c linux-2.6.32.39/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-2.6.32.39/mm/maccess.c linux-2.6.32.39/mm/maccess.c
---- linux-2.6.32.39/mm/maccess.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/maccess.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/maccess.c linux-2.6.32.40/mm/maccess.c
+--- linux-2.6.32.40/mm/maccess.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/maccess.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,7 +14,7 @@
   * Safely read from address @src to the buffer at @dst.  If a kernel fault
   * happens, handle that and return -EFAULT.
@@ -54467,9 +60575,9 @@ diff -urNp linux-2.6.32.39/mm/maccess.c linux-2.6.32.39/mm/maccess.c
  {
  	long ret;
  	mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.32.39/mm/madvise.c linux-2.6.32.39/mm/madvise.c
---- linux-2.6.32.39/mm/madvise.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/madvise.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/madvise.c linux-2.6.32.40/mm/madvise.c
+--- linux-2.6.32.40/mm/madvise.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/madvise.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
@@ -54546,9 +60654,9 @@ diff -urNp linux-2.6.32.39/mm/madvise.c linux-2.6.32.39/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-2.6.32.39/mm/memory.c linux-2.6.32.39/mm/memory.c
---- linux-2.6.32.39/mm/memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/memory.c linux-2.6.32.40/mm/memory.c
+--- linux-2.6.32.40/mm/memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -55078,9 +61186,9 @@ diff -urNp linux-2.6.32.39/mm/memory.c linux-2.6.32.39/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.32.39/mm/memory-failure.c linux-2.6.32.39/mm/memory-failure.c
---- linux-2.6.32.39/mm/memory-failure.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/memory-failure.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/memory-failure.c linux-2.6.32.40/mm/memory-failure.c
+--- linux-2.6.32.40/mm/memory-failure.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/memory-failure.c	2011-04-17 15:56:46.000000000 -0400
 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -55099,9 +61207,9 @@ diff -urNp linux-2.6.32.39/mm/memory-failure.c linux-2.6.32.39/mm/memory-failure
  
  	/*
  	 * We need/can do nothing about count=0 pages.
-diff -urNp linux-2.6.32.39/mm/mempolicy.c linux-2.6.32.39/mm/mempolicy.c
---- linux-2.6.32.39/mm/mempolicy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/mempolicy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/mempolicy.c linux-2.6.32.40/mm/mempolicy.c
+--- linux-2.6.32.40/mm/mempolicy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/mempolicy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
  	struct vm_area_struct *next;
  	int err;
@@ -55182,9 +61290,9 @@ diff -urNp linux-2.6.32.39/mm/mempolicy.c linux-2.6.32.39/mm/mempolicy.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.32.39/mm/migrate.c linux-2.6.32.39/mm/migrate.c
---- linux-2.6.32.39/mm/migrate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/migrate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/migrate.c linux-2.6.32.40/mm/migrate.c
+--- linux-2.6.32.40/mm/migrate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/migrate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
  	if (!mm)
  		return -EINVAL;
@@ -55210,9 +61318,9 @@ diff -urNp linux-2.6.32.39/mm/migrate.c linux-2.6.32.39/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-2.6.32.39/mm/mlock.c linux-2.6.32.39/mm/mlock.c
---- linux-2.6.32.39/mm/mlock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/mlock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/mlock.c linux-2.6.32.40/mm/mlock.c
+--- linux-2.6.32.40/mm/mlock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/mlock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -55323,9 +61431,9 @@ diff -urNp linux-2.6.32.39/mm/mlock.c linux-2.6.32.39/mm/mlock.c
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-2.6.32.39/mm/mmap.c linux-2.6.32.39/mm/mmap.c
---- linux-2.6.32.39/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/mmap.c linux-2.6.32.40/mm/mmap.c
+--- linux-2.6.32.40/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -45,6 +45,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -56542,9 +62650,9 @@ diff -urNp linux-2.6.32.39/mm/mmap.c linux-2.6.32.39/mm/mmap.c
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.32.39/mm/mprotect.c linux-2.6.32.39/mm/mprotect.c
---- linux-2.6.32.39/mm/mprotect.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/mprotect.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/mprotect.c linux-2.6.32.40/mm/mprotect.c
+--- linux-2.6.32.40/mm/mprotect.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/mprotect.c	2011-04-17 15:56:46.000000000 -0400
 @@ -24,10 +24,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -56767,9 +62875,9 @@ diff -urNp linux-2.6.32.39/mm/mprotect.c linux-2.6.32.39/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-2.6.32.39/mm/mremap.c linux-2.6.32.39/mm/mremap.c
---- linux-2.6.32.39/mm/mremap.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/mm/mremap.c	2011-04-17 17:03:58.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/mremap.c linux-2.6.32.40/mm/mremap.c
+--- linux-2.6.32.40/mm/mremap.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/mm/mremap.c	2011-04-17 17:03:58.000000000 -0400
 @@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -56874,9 +62982,9 @@ diff -urNp linux-2.6.32.39/mm/mremap.c linux-2.6.32.39/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.32.39/mm/nommu.c linux-2.6.32.39/mm/nommu.c
---- linux-2.6.32.39/mm/nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/nommu.c linux-2.6.32.40/mm/nommu.c
+--- linux-2.6.32.40/mm/nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -56901,9 +63009,9 @@ diff -urNp linux-2.6.32.39/mm/nommu.c linux-2.6.32.39/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-diff -urNp linux-2.6.32.39/mm/page_alloc.c linux-2.6.32.39/mm/page_alloc.c
---- linux-2.6.32.39/mm/page_alloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/page_alloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/page_alloc.c linux-2.6.32.40/mm/page_alloc.c
+--- linux-2.6.32.40/mm/page_alloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/page_alloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -587,6 +587,10 @@ static void __free_pages_ok(struct page 
  	int bad = 0;
  	int wasMlocked = __TestClearPageMlocked(page);
@@ -56960,9 +63068,9 @@ diff -urNp linux-2.6.32.39/mm/page_alloc.c linux-2.6.32.39/mm/page_alloc.c
  				struct zone *zone, unsigned long zonesize) {}
  #endif /* CONFIG_SPARSEMEM */
  
-diff -urNp linux-2.6.32.39/mm/percpu.c linux-2.6.32.39/mm/percpu.c
---- linux-2.6.32.39/mm/percpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/percpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/percpu.c linux-2.6.32.40/mm/percpu.c
+--- linux-2.6.32.40/mm/percpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/percpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -56972,9 +63080,9 @@ diff -urNp linux-2.6.32.39/mm/percpu.c linux-2.6.32.39/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-2.6.32.39/mm/rmap.c linux-2.6.32.39/mm/rmap.c
---- linux-2.6.32.39/mm/rmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/rmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/rmap.c linux-2.6.32.40/mm/rmap.c
+--- linux-2.6.32.40/mm/rmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/rmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
  		/* page_table_lock to protect against threads */
  		spin_lock(&mm->page_table_lock);
@@ -56993,9 +63101,9 @@ diff -urNp linux-2.6.32.39/mm/rmap.c linux-2.6.32.39/mm/rmap.c
  			vma->anon_vma = anon_vma;
  			list_add_tail(&vma->anon_vma_node, &anon_vma->head);
  			allocated = NULL;
-diff -urNp linux-2.6.32.39/mm/shmem.c linux-2.6.32.39/mm/shmem.c
---- linux-2.6.32.39/mm/shmem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/shmem.c	2011-04-18 22:03:00.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/shmem.c linux-2.6.32.40/mm/shmem.c
+--- linux-2.6.32.40/mm/shmem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/shmem.c	2011-05-04 17:56:20.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/swap.h>
  #include <linux/ima.h>
@@ -57023,9 +63131,19 @@ diff -urNp linux-2.6.32.39/mm/shmem.c linux-2.6.32.39/mm/shmem.c
  		/* do it inline */
  		memcpy(info, symname, len);
  		inode->i_op = &shmem_symlink_inline_operations;
-diff -urNp linux-2.6.32.39/mm/slab.c linux-2.6.32.39/mm/slab.c
---- linux-2.6.32.39/mm/slab.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/slab.c	2011-04-23 12:56:11.000000000 -0400
+@@ -2310,8 +2312,7 @@ int shmem_fill_super(struct super_block 
+ 	int err = -ENOMEM;
+ 
+ 	/* Round up to L1_CACHE_BYTES to resist false sharing */
+-	sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
+-				L1_CACHE_BYTES), GFP_KERNEL);
++	sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
+ 	if (!sbinfo)
+ 		return -ENOMEM;
+ 
+diff -urNp linux-2.6.32.40/mm/slab.c linux-2.6.32.40/mm/slab.c
+--- linux-2.6.32.40/mm/slab.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/slab.c	2011-05-04 17:56:20.000000000 -0400
 @@ -174,7 +174,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -57053,6 +63171,21 @@ diff -urNp linux-2.6.32.39/mm/slab.c linux-2.6.32.39/mm/slab.c
  #define	CACHE_CACHE 0
  #define	SIZE_AC MAX_NUMNODES
  #define	SIZE_L3 (2 * MAX_NUMNODES)
+@@ -409,10 +409,10 @@ static void kmem_list3_init(struct kmem_
+ 		if ((x)->max_freeable < i)				\
+ 			(x)->max_freeable = i;				\
+ 	} while (0)
+-#define STATS_INC_ALLOCHIT(x)	atomic_inc(&(x)->allochit)
+-#define STATS_INC_ALLOCMISS(x)	atomic_inc(&(x)->allocmiss)
+-#define STATS_INC_FREEHIT(x)	atomic_inc(&(x)->freehit)
+-#define STATS_INC_FREEMISS(x)	atomic_inc(&(x)->freemiss)
++#define STATS_INC_ALLOCHIT(x)	atomic_inc_unchecked(&(x)->allochit)
++#define STATS_INC_ALLOCMISS(x)	atomic_inc_unchecked(&(x)->allocmiss)
++#define STATS_INC_FREEHIT(x)	atomic_inc_unchecked(&(x)->freehit)
++#define STATS_INC_FREEMISS(x)	atomic_inc_unchecked(&(x)->freemiss)
+ #else
+ #define	STATS_INC_ACTIVE(x)	do { } while (0)
+ #define	STATS_DEC_ACTIVE(x)	do { } while (0)
 @@ -558,7 +558,7 @@ static inline void *index_to_obj(struct 
   *   reciprocal_divide(offset, cache->reciprocal_buffer_size)
   */
@@ -57089,6 +63222,21 @@ diff -urNp linux-2.6.32.39/mm/slab.c linux-2.6.32.39/mm/slab.c
  					NULL);
  		}
  #ifdef CONFIG_ZONE_DMA
+@@ -4211,10 +4211,10 @@ static int s_show(struct seq_file *m, vo
+ 	}
+ 	/* cpu stats */
+ 	{
+-		unsigned long allochit = atomic_read(&cachep->allochit);
+-		unsigned long allocmiss = atomic_read(&cachep->allocmiss);
+-		unsigned long freehit = atomic_read(&cachep->freehit);
+-		unsigned long freemiss = atomic_read(&cachep->freemiss);
++		unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
++		unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
++		unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
++		unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
+ 
+ 		seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
+ 			   allochit, allocmiss, freehit, freemiss);
 @@ -4471,15 +4471,66 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
@@ -57158,9 +63306,9 @@ diff -urNp linux-2.6.32.39/mm/slab.c linux-2.6.32.39/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-2.6.32.39/mm/slob.c linux-2.6.32.39/mm/slob.c
---- linux-2.6.32.39/mm/slob.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/slob.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/slob.c linux-2.6.32.40/mm/slob.c
+--- linux-2.6.32.40/mm/slob.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/slob.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -57478,9 +63626,9 @@ diff -urNp linux-2.6.32.39/mm/slob.c linux-2.6.32.39/mm/slob.c
  	}
  
  	trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.32.39/mm/slub.c linux-2.6.32.39/mm/slub.c
---- linux-2.6.32.39/mm/slub.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/slub.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/slub.c linux-2.6.32.40/mm/slub.c
+--- linux-2.6.32.40/mm/slub.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/slub.c	2011-04-17 15:56:46.000000000 -0400
 @@ -410,7 +410,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
@@ -57691,9 +63839,9 @@ diff -urNp linux-2.6.32.39/mm/slub.c linux-2.6.32.39/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-2.6.32.39/mm/util.c linux-2.6.32.39/mm/util.c
---- linux-2.6.32.39/mm/util.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/util.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/util.c linux-2.6.32.40/mm/util.c
+--- linux-2.6.32.40/mm/util.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/util.c	2011-04-17 15:56:46.000000000 -0400
 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
@@ -57707,9 +63855,9 @@ diff -urNp linux-2.6.32.39/mm/util.c linux-2.6.32.39/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.32.39/mm/vmalloc.c linux-2.6.32.39/mm/vmalloc.c
---- linux-2.6.32.39/mm/vmalloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/vmalloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/vmalloc.c linux-2.6.32.40/mm/vmalloc.c
+--- linux-2.6.32.40/mm/vmalloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/vmalloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -57946,9 +64094,9 @@ diff -urNp linux-2.6.32.39/mm/vmalloc.c linux-2.6.32.39/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.39/mm/vmstat.c linux-2.6.32.39/mm/vmstat.c
---- linux-2.6.32.39/mm/vmstat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/mm/vmstat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/mm/vmstat.c linux-2.6.32.40/mm/vmstat.c
+--- linux-2.6.32.40/mm/vmstat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/mm/vmstat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -58001,9 +64149,9 @@ diff -urNp linux-2.6.32.39/mm/vmstat.c linux-2.6.32.39/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-2.6.32.39/net/8021q/vlan.c linux-2.6.32.39/net/8021q/vlan.c
---- linux-2.6.32.39/net/8021q/vlan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/8021q/vlan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/8021q/vlan.c linux-2.6.32.40/net/8021q/vlan.c
+--- linux-2.6.32.40/net/8021q/vlan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/8021q/vlan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
@@ -58014,9 +64162,9 @@ diff -urNp linux-2.6.32.39/net/8021q/vlan.c linux-2.6.32.39/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.32.39/net/atm/atm_misc.c linux-2.6.32.39/net/atm/atm_misc.c
---- linux-2.6.32.39/net/atm/atm_misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/atm/atm_misc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/atm/atm_misc.c linux-2.6.32.40/net/atm/atm_misc.c
+--- linux-2.6.32.40/net/atm/atm_misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/atm/atm_misc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
@@ -58053,9 +64201,9 @@ diff -urNp linux-2.6.32.39/net/atm/atm_misc.c linux-2.6.32.39/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.32.39/net/atm/proc.c linux-2.6.32.39/net/atm/proc.c
---- linux-2.6.32.39/net/atm/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/atm/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/atm/proc.c linux-2.6.32.40/net/atm/proc.c
+--- linux-2.6.32.40/net/atm/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/atm/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -58094,9 +64242,9 @@ diff -urNp linux-2.6.32.39/net/atm/proc.c linux-2.6.32.39/net/atm/proc.c
  	else
  		seq_printf(seq, "%3d %3d %5d         ",
  			   vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.32.39/net/atm/resources.c linux-2.6.32.39/net/atm/resources.c
---- linux-2.6.32.39/net/atm/resources.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/atm/resources.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/atm/resources.c linux-2.6.32.40/net/atm/resources.c
+--- linux-2.6.32.40/net/atm/resources.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/atm/resources.c	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
@@ -58115,9 +64263,9 @@ diff -urNp linux-2.6.32.39/net/atm/resources.c linux-2.6.32.39/net/atm/resources
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.32.39/net/bridge/br_private.h linux-2.6.32.39/net/bridge/br_private.h
---- linux-2.6.32.39/net/bridge/br_private.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/bridge/br_private.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/bridge/br_private.h linux-2.6.32.40/net/bridge/br_private.h
+--- linux-2.6.32.40/net/bridge/br_private.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/bridge/br_private.h	2011-04-17 15:56:46.000000000 -0400
 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 
  
  #ifdef CONFIG_SYSFS
@@ -58127,9 +64275,9 @@ diff -urNp linux-2.6.32.39/net/bridge/br_private.h linux-2.6.32.39/net/bridge/br
  extern int br_sysfs_addif(struct net_bridge_port *p);
  
  /* br_sysfs_br.c */
-diff -urNp linux-2.6.32.39/net/bridge/br_stp_if.c linux-2.6.32.39/net/bridge/br_stp_if.c
---- linux-2.6.32.39/net/bridge/br_stp_if.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/bridge/br_stp_if.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/bridge/br_stp_if.c linux-2.6.32.40/net/bridge/br_stp_if.c
+--- linux-2.6.32.40/net/bridge/br_stp_if.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/bridge/br_stp_if.c	2011-04-17 15:56:46.000000000 -0400
 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
  	char *envp[] = { NULL };
  
@@ -58139,9 +64287,9 @@ diff -urNp linux-2.6.32.39/net/bridge/br_stp_if.c linux-2.6.32.39/net/bridge/br_
  		printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
  			br->dev->name, r);
  
-diff -urNp linux-2.6.32.39/net/bridge/br_sysfs_if.c linux-2.6.32.39/net/bridge/br_sysfs_if.c
---- linux-2.6.32.39/net/bridge/br_sysfs_if.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/bridge/br_sysfs_if.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/bridge/br_sysfs_if.c linux-2.6.32.40/net/bridge/br_sysfs_if.c
+--- linux-2.6.32.40/net/bridge/br_sysfs_if.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/bridge/br_sysfs_if.c	2011-04-17 15:56:46.000000000 -0400
 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
  	return ret;
  }
@@ -58151,9 +64299,9 @@ diff -urNp linux-2.6.32.39/net/bridge/br_sysfs_if.c linux-2.6.32.39/net/bridge/b
  	.show = brport_show,
  	.store = brport_store,
  };
-diff -urNp linux-2.6.32.39/net/can/bcm.c linux-2.6.32.39/net/can/bcm.c
---- linux-2.6.32.39/net/can/bcm.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/can/bcm.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.40/net/can/bcm.c linux-2.6.32.40/net/can/bcm.c
+--- linux-2.6.32.40/net/can/bcm.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.40/net/can/bcm.c	2011-05-10 22:12:34.000000000 -0400
 @@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file
  	struct bcm_sock *bo = bcm_sk(sk);
  	struct bcm_op *op;
@@ -58170,27 +64318,9 @@ diff -urNp linux-2.6.32.39/net/can/bcm.c linux-2.6.32.39/net/can/bcm.c
  	seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
  	seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
  	seq_printf(m, " <<<\n");
-diff -urNp linux-2.6.32.39/net/can/raw.c linux-2.6.32.39/net/can/raw.c
---- linux-2.6.32.39/net/can/raw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/can/raw.c	2011-04-22 19:38:01.000000000 -0400
-@@ -280,7 +280,13 @@ static int raw_init(struct sock *sk)
- static int raw_release(struct socket *sock)
- {
- 	struct sock *sk = sock->sk;
--	struct raw_sock *ro = raw_sk(sk);
-+	struct raw_sock *ro;
-+
-+
-+	if (!sk)
-+		return 0;
-+
-+	ro = raw_sk(sk);
- 
- 	unregister_netdevice_notifier(&ro->notifier);
- 
-diff -urNp linux-2.6.32.39/net/core/dev.c linux-2.6.32.39/net/core/dev.c
---- linux-2.6.32.39/net/core/dev.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/core/dev.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.40/net/core/dev.c linux-2.6.32.40/net/core/dev.c
+--- linux-2.6.32.40/net/core/dev.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/net/core/dev.c	2011-04-17 17:04:18.000000000 -0400
 @@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
@@ -58224,10 +64354,15 @@ diff -urNp linux-2.6.32.39/net/core/dev.c linux-2.6.32.39/net/core/dev.c
  {
  	struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.32.39/net/core/flow.c linux-2.6.32.39/net/core/flow.c
---- linux-2.6.32.39/net/core/flow.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/core/flow.c	2011-04-17 15:56:46.000000000 -0400
-@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
+diff -urNp linux-2.6.32.40/net/core/flow.c linux-2.6.32.40/net/core/flow.c
+--- linux-2.6.32.40/net/core/flow.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/core/flow.c	2011-05-04 17:56:20.000000000 -0400
+@@ -35,11 +35,11 @@ struct flow_cache_entry {
+ 	atomic_t		*object_ref;
+ };
+ 
+-atomic_t flow_cache_genid = ATOMIC_INIT(0);
++atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
  
  static u32 flow_hash_shift;
  #define flow_hash_size	(1 << flow_hash_shift)
@@ -58254,9 +64389,36 @@ diff -urNp linux-2.6.32.39/net/core/flow.c linux-2.6.32.39/net/core/flow.c
  
  #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
  
-diff -urNp linux-2.6.32.39/net/core/sock.c linux-2.6.32.39/net/core/sock.c
---- linux-2.6.32.39/net/core/sock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/core/sock.c	2011-04-23 13:45:37.000000000 -0400
+@@ -190,7 +190,7 @@ void *flow_cache_lookup(struct net *net,
+ 		if (fle->family == family &&
+ 		    fle->dir == dir &&
+ 		    flow_key_compare(key, &fle->key) == 0) {
+-			if (fle->genid == atomic_read(&flow_cache_genid)) {
++			if (fle->genid == atomic_read_unchecked(&flow_cache_genid)) {
+ 				void *ret = fle->object;
+ 
+ 				if (ret)
+@@ -228,7 +228,7 @@ nocache:
+ 		err = resolver(net, key, family, dir, &obj, &obj_ref);
+ 
+ 		if (fle && !err) {
+-			fle->genid = atomic_read(&flow_cache_genid);
++			fle->genid = atomic_read_unchecked(&flow_cache_genid);
+ 
+ 			if (fle->object)
+ 				atomic_dec(fle->object_ref);
+@@ -258,7 +258,7 @@ static void flow_cache_flush_tasklet(uns
+ 
+ 		fle = flow_table(cpu)[i];
+ 		for (; fle; fle = fle->next) {
+-			unsigned genid = atomic_read(&flow_cache_genid);
++			unsigned genid = atomic_read_unchecked(&flow_cache_genid);
+ 
+ 			if (!fle->object || fle->genid == genid)
+ 				continue;
+diff -urNp linux-2.6.32.40/net/core/sock.c linux-2.6.32.40/net/core/sock.c
+--- linux-2.6.32.40/net/core/sock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/core/sock.c	2011-05-04 17:56:20.000000000 -0400
 @@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock,
  		break;
  
@@ -58274,9 +64436,18 @@ diff -urNp linux-2.6.32.39/net/core/sock.c linux-2.6.32.39/net/core/sock.c
  
  	case SO_PEERNAME:
  	{
-diff -urNp linux-2.6.32.39/net/decnet/sysctl_net_decnet.c linux-2.6.32.39/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.39/net/decnet/sysctl_net_decnet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/decnet/sysctl_net_decnet.c	2011-04-17 15:56:46.000000000 -0400
+@@ -1892,7 +1896,7 @@ void sock_init_data(struct socket *sock,
+ 	 */
+ 	smp_wmb();
+ 	atomic_set(&sk->sk_refcnt, 1);
+-	atomic_set(&sk->sk_drops, 0);
++	atomic_set_unchecked(&sk->sk_drops, 0);
+ }
+ EXPORT_SYMBOL(sock_init_data);
+ 
+diff -urNp linux-2.6.32.40/net/decnet/sysctl_net_decnet.c linux-2.6.32.40/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.32.40/net/decnet/sysctl_net_decnet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/decnet/sysctl_net_decnet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
@@ -58295,9 +64466,9 @@ diff -urNp linux-2.6.32.39/net/decnet/sysctl_net_decnet.c linux-2.6.32.39/net/de
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-2.6.32.39/net/econet/Kconfig linux-2.6.32.39/net/econet/Kconfig
---- linux-2.6.32.39/net/econet/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/econet/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/econet/Kconfig linux-2.6.32.40/net/econet/Kconfig
+--- linux-2.6.32.40/net/econet/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/econet/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -58307,9 +64478,33 @@ diff -urNp linux-2.6.32.39/net/econet/Kconfig linux-2.6.32.39/net/econet/Kconfig
  	---help---
  	  Econet is a fairly old and slow networking protocol mainly used by
  	  Acorn computers to access file and print servers. It uses native
-diff -urNp linux-2.6.32.39/net/ipv4/inet_diag.c linux-2.6.32.39/net/ipv4/inet_diag.c
---- linux-2.6.32.39/net/ipv4/inet_diag.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/inet_diag.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ieee802154/dgram.c linux-2.6.32.40/net/ieee802154/dgram.c
+--- linux-2.6.32.40/net/ieee802154/dgram.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ieee802154/dgram.c	2011-05-04 17:56:28.000000000 -0400
+@@ -318,7 +318,7 @@ out:
+ static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)
+ {
+ 	if (sock_queue_rcv_skb(sk, skb) < 0) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
+diff -urNp linux-2.6.32.40/net/ieee802154/raw.c linux-2.6.32.40/net/ieee802154/raw.c
+--- linux-2.6.32.40/net/ieee802154/raw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ieee802154/raw.c	2011-05-04 17:56:28.000000000 -0400
+@@ -206,7 +206,7 @@ out:
+ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
+ {
+ 	if (sock_queue_rcv_skb(sk, skb) < 0) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
+diff -urNp linux-2.6.32.40/net/ipv4/inet_diag.c linux-2.6.32.40/net/ipv4/inet_diag.c
+--- linux-2.6.32.40/net/ipv4/inet_diag.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/inet_diag.c	2011-04-17 17:04:18.000000000 -0400
 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
@@ -58370,9 +64565,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/inet_diag.c linux-2.6.32.39/net/ipv4/inet_di
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-2.6.32.39/net/ipv4/inet_hashtables.c linux-2.6.32.39/net/ipv4/inet_hashtables.c
---- linux-2.6.32.39/net/ipv4/inet_hashtables.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/inet_hashtables.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/inet_hashtables.c linux-2.6.32.40/net/ipv4/inet_hashtables.c
+--- linux-2.6.32.40/net/ipv4/inet_hashtables.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/inet_hashtables.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,11 +18,14 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -58397,9 +64592,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/inet_hashtables.c linux-2.6.32.39/net/ipv4/i
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			inet_twsk_put(tw);
-diff -urNp linux-2.6.32.39/net/ipv4/inetpeer.c linux-2.6.32.39/net/ipv4/inetpeer.c
---- linux-2.6.32.39/net/ipv4/inetpeer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/inetpeer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/inetpeer.c linux-2.6.32.40/net/ipv4/inetpeer.c
+--- linux-2.6.32.40/net/ipv4/inetpeer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/inetpeer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da
  		return NULL;
  	n->v4daddr = daddr;
@@ -58409,9 +64604,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/inetpeer.c linux-2.6.32.39/net/ipv4/inetpeer
  	n->ip_id_count = secure_ip_id(daddr);
  	n->tcp_ts_stamp = 0;
  
-diff -urNp linux-2.6.32.39/net/ipv4/ip_fragment.c linux-2.6.32.39/net/ipv4/ip_fragment.c
---- linux-2.6.32.39/net/ipv4/ip_fragment.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/ip_fragment.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/ip_fragment.c linux-2.6.32.40/net/ipv4/ip_fragment.c
+--- linux-2.6.32.40/net/ipv4/ip_fragment.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/ip_fragment.c	2011-04-17 15:56:46.000000000 -0400
 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
@@ -58421,9 +64616,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/ip_fragment.c linux-2.6.32.39/net/ipv4/ip_fr
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c
---- linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/netfilter/arp_tables.c linux-2.6.32.40/net/ipv4/netfilter/arp_tables.c
+--- linux-2.6.32.40/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:04:18.000000000 -0400
 @@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
  			private = &tmp;
  		}
@@ -58432,9 +64627,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/netfilter/arp_tables.c linux-2.6.32.39/net/i
  		info.valid_hooks = t->valid_hooks;
  		memcpy(info.hook_entry, private->hook_entry,
  		       sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c
---- linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/netfilter/ip_tables.c linux-2.6.32.40/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.32.40/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:04:18.000000000 -0400
 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
  			private = &tmp;
  		}
@@ -58443,9 +64638,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/netfilter/ip_tables.c linux-2.6.32.39/net/ip
  		info.valid_hooks = t->valid_hooks;
  		memcpy(info.hook_entry, private->hook_entry,
  		       sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.40/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.32.40/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
@@ -58455,9 +64650,27 @@ diff -urNp linux-2.6.32.39/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.3
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.32.39/net/ipv4/raw.c linux-2.6.32.39/net/ipv4/raw.c
---- linux-2.6.32.39/net/ipv4/raw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/raw.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/raw.c linux-2.6.32.40/net/ipv4/raw.c
+--- linux-2.6.32.40/net/ipv4/raw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/raw.c	2011-05-04 17:59:08.000000000 -0400
+@@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk,
+ 	/* Charge it to the socket. */
+ 
+ 	if (sock_queue_rcv_skb(sk, skb) < 0) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
+@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk,
+ int raw_rcv(struct sock *sk, struct sk_buff *skb)
+ {
+ 	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
 @@ -724,15 +724,22 @@ static int raw_init(struct sock *sk)
  
  static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
@@ -58493,9 +64706,54 @@ diff -urNp linux-2.6.32.39/net/ipv4/raw.c linux-2.6.32.39/net/ipv4/raw.c
  		goto out;
  	ret = 0;
  out:	return ret;
-diff -urNp linux-2.6.32.39/net/ipv4/tcp_ipv4.c linux-2.6.32.39/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.39/net/ipv4/tcp_ipv4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/tcp_ipv4.c	2011-04-17 15:56:46.000000000 -0400
+@@ -954,7 +962,13 @@ static void raw_sock_seq_show(struct seq
+ 		sk_wmem_alloc_get(sp),
+ 		sk_rmem_alloc_get(sp),
+ 		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
+-		atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
++		atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		NULL,
++#else
++		sp,
++#endif
++		atomic_read_unchecked(&sp->sk_drops));
+ }
+ 
+ static int raw_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-2.6.32.40/net/ipv4/route.c linux-2.6.32.40/net/ipv4/route.c
+--- linux-2.6.32.40/net/ipv4/route.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/route.c	2011-05-04 17:56:28.000000000 -0400
+@@ -268,7 +268,7 @@ static inline unsigned int rt_hash(__be3
+ 
+ static inline int rt_genid(struct net *net)
+ {
+-	return atomic_read(&net->ipv4.rt_genid);
++	return atomic_read_unchecked(&net->ipv4.rt_genid);
+ }
+ 
+ #ifdef CONFIG_PROC_FS
+@@ -888,7 +888,7 @@ static void rt_cache_invalidate(struct n
+ 	unsigned char shuffle;
+ 
+ 	get_random_bytes(&shuffle, sizeof(shuffle));
+-	atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
++	atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
+ }
+ 
+ /*
+@@ -3356,7 +3356,7 @@ static __net_initdata struct pernet_oper
+ 
+ static __net_init int rt_secret_timer_init(struct net *net)
+ {
+-	atomic_set(&net->ipv4.rt_genid,
++	atomic_set_unchecked(&net->ipv4.rt_genid,
+ 			(int) ((num_physpages ^ (num_physpages>>8)) ^
+ 			(jiffies ^ (jiffies >> 7))));
+ 
+diff -urNp linux-2.6.32.40/net/ipv4/tcp_ipv4.c linux-2.6.32.40/net/ipv4/tcp_ipv4.c
+--- linux-2.6.32.40/net/ipv4/tcp_ipv4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/tcp_ipv4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -84,6 +84,9 @@
  int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
@@ -58591,9 +64849,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/tcp_ipv4.c linux-2.6.32.39/net/ipv4/tcp_ipv4
  }
  
  #define TMPSZ 150
-diff -urNp linux-2.6.32.39/net/ipv4/tcp_minisocks.c linux-2.6.32.39/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.39/net/ipv4/tcp_minisocks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/tcp_minisocks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/tcp_minisocks.c linux-2.6.32.40/net/ipv4/tcp_minisocks.c
+--- linux-2.6.32.40/net/ipv4/tcp_minisocks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/tcp_minisocks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,6 +26,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -58616,9 +64874,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/tcp_minisocks.c linux-2.6.32.39/net/ipv4/tcp
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-2.6.32.39/net/ipv4/tcp_probe.c linux-2.6.32.39/net/ipv4/tcp_probe.c
---- linux-2.6.32.39/net/ipv4/tcp_probe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/tcp_probe.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/tcp_probe.c linux-2.6.32.40/net/ipv4/tcp_probe.c
+--- linux-2.6.32.40/net/ipv4/tcp_probe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/tcp_probe.c	2011-04-17 15:56:46.000000000 -0400
 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
@@ -58628,9 +64886,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/tcp_probe.c linux-2.6.32.39/net/ipv4/tcp_pro
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-2.6.32.39/net/ipv4/tcp_timer.c linux-2.6.32.39/net/ipv4/tcp_timer.c
---- linux-2.6.32.39/net/ipv4/tcp_timer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/tcp_timer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/tcp_timer.c linux-2.6.32.40/net/ipv4/tcp_timer.c
+--- linux-2.6.32.40/net/ipv4/tcp_timer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/tcp_timer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -21,6 +21,10 @@
  #include <linux/module.h>
  #include <net/tcp.h>
@@ -58656,9 +64914,9 @@ diff -urNp linux-2.6.32.39/net/ipv4/tcp_timer.c linux-2.6.32.39/net/ipv4/tcp_tim
  	if (retransmits_timed_out(sk, retry_until)) {
  		/* Has it gone just too far? */
  		tcp_write_err(sk);
-diff -urNp linux-2.6.32.39/net/ipv4/udp.c linux-2.6.32.39/net/ipv4/udp.c
---- linux-2.6.32.39/net/ipv4/udp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv4/udp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv4/udp.c linux-2.6.32.40/net/ipv4/udp.c
+--- linux-2.6.32.40/net/ipv4/udp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv4/udp.c	2011-05-04 17:57:28.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -58718,6 +64976,15 @@ diff -urNp linux-2.6.32.39/net/ipv4/udp.c linux-2.6.32.39/net/ipv4/udp.c
  	ulen = skb->len - sizeof(struct udphdr);
  	copied = len;
  	if (copied > ulen)
+@@ -1065,7 +1086,7 @@ static int __udp_queue_rcv_skb(struct so
+ 		if (rc == -ENOMEM) {
+ 			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
+ 					 is_udplite);
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 		}
+ 		goto drop;
+ 	}
 @@ -1335,6 +1356,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
  		goto csum_error;
  
@@ -58728,23 +64995,58 @@ diff -urNp linux-2.6.32.39/net/ipv4/udp.c linux-2.6.32.39/net/ipv4/udp.c
  	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
  	/*
-@@ -1755,7 +1779,12 @@ static void udp4_format_sock(struct sock
+@@ -1755,8 +1779,13 @@ static void udp4_format_sock(struct sock
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
 -		atomic_read(&sp->sk_refcnt), sp,
+-		atomic_read(&sp->sk_drops), len);
 +		atomic_read(&sp->sk_refcnt),
 +#ifdef CONFIG_GRKERNSEC_HIDESYM
 +		NULL,
 +#else
 +		sp,
 +#endif
- 		atomic_read(&sp->sk_drops), len);
++		atomic_read_unchecked(&sp->sk_drops), len);
  }
  
-diff -urNp linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c
---- linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:04:18.000000000 -0400
+ int udp4_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-2.6.32.40/net/ipv6/inet6_connection_sock.c linux-2.6.32.40/net/ipv6/inet6_connection_sock.c
+--- linux-2.6.32.40/net/ipv6/inet6_connection_sock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv6/inet6_connection_sock.c	2011-05-04 17:56:28.000000000 -0400
+@@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock *
+ #ifdef CONFIG_XFRM
+ 	{
+ 		struct rt6_info *rt = (struct rt6_info  *)dst;
+-		rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
++		rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
+ 	}
+ #endif
+ }
+@@ -167,7 +167,7 @@ struct dst_entry *__inet6_csk_dst_check(
+ #ifdef CONFIG_XFRM
+ 	if (dst) {
+ 		struct rt6_info *rt = (struct rt6_info *)dst;
+-		if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
++		if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
+ 			sk->sk_dst_cache = NULL;
+ 			dst_release(dst);
+ 			dst = NULL;
+diff -urNp linux-2.6.32.40/net/ipv6/inet6_hashtables.c linux-2.6.32.40/net/ipv6/inet6_hashtables.c
+--- linux-2.6.32.40/net/ipv6/inet6_hashtables.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv6/inet6_hashtables.c	2011-05-04 17:56:28.000000000 -0400
+@@ -118,7 +118,7 @@ out:
+ }
+ EXPORT_SYMBOL(__inet6_lookup_established);
+ 
+-static int inline compute_score(struct sock *sk, struct net *net,
++static inline int compute_score(struct sock *sk, struct net *net,
+ 				const unsigned short hnum,
+ 				const struct in6_addr *daddr,
+ 				const int dif)
+diff -urNp linux-2.6.32.40/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.40/net/ipv6/netfilter/ip6_tables.c
+--- linux-2.6.32.40/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:04:18.000000000 -0400
 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
  			private = &tmp;
  		}
@@ -58753,9 +65055,53 @@ diff -urNp linux-2.6.32.39/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.39/net/i
  		info.valid_hooks = t->valid_hooks;
  		memcpy(info.hook_entry, private->hook_entry,
  		       sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.39/net/ipv6/raw.c linux-2.6.32.39/net/ipv6/raw.c
---- linux-2.6.32.39/net/ipv6/raw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv6/raw.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv6/raw.c linux-2.6.32.40/net/ipv6/raw.c
+--- linux-2.6.32.40/net/ipv6/raw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv6/raw.c	2011-05-04 17:58:00.000000000 -0400
+@@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct s
+ {
+ 	if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
+ 	    skb_checksum_complete(skb)) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
+ 
+ 	/* Charge it to the socket. */
+ 	if (sock_queue_rcv_skb(sk,skb)<0) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
+@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk
+ 	struct raw6_sock *rp = raw6_sk(sk);
+ 
+ 	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
+-		atomic_inc(&sk->sk_drops);
++		atomic_inc_unchecked(&sk->sk_drops);
+ 		kfree_skb(skb);
+ 		return NET_RX_DROP;
+ 	}
+@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk
+ 
+ 	if (inet->hdrincl) {
+ 		if (skb_checksum_complete(skb)) {
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 			kfree_skb(skb);
+ 			return NET_RX_DROP;
+ 		}
+@@ -518,7 +518,7 @@ csum_copy_err:
+ 	   as some normal condition.
+ 	 */
+ 	err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
+-	atomic_inc(&sk->sk_drops);
++	atomic_inc_unchecked(&sk->sk_drops);
+ 	goto out;
+ }
+ 
 @@ -600,7 +600,7 @@ out:
  	return err;
  }
@@ -58813,13 +65159,13 @@ diff -urNp linux-2.6.32.39/net/ipv6/raw.c linux-2.6.32.39/net/ipv6/raw.c
 +#else
 +		   sp,
 +#endif
-+		   atomic_read(&sp->sk_drops));
++		   atomic_read_unchecked(&sp->sk_drops));
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.39/net/ipv6/tcp_ipv6.c linux-2.6.32.39/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.39/net/ipv6/tcp_ipv6.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv6/tcp_ipv6.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv6/tcp_ipv6.c linux-2.6.32.40/net/ipv6/tcp_ipv6.c
+--- linux-2.6.32.40/net/ipv6/tcp_ipv6.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv6/tcp_ipv6.c	2011-04-17 15:56:46.000000000 -0400
 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -58919,9 +65265,9 @@ diff -urNp linux-2.6.32.39/net/ipv6/tcp_ipv6.c linux-2.6.32.39/net/ipv6/tcp_ipv6
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.39/net/ipv6/udp.c linux-2.6.32.39/net/ipv6/udp.c
---- linux-2.6.32.39/net/ipv6/udp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/ipv6/udp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/ipv6/udp.c linux-2.6.32.40/net/ipv6/udp.c
+--- linux-2.6.32.40/net/ipv6/udp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/ipv6/udp.c	2011-05-04 17:58:16.000000000 -0400
 @@ -49,6 +49,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -58933,6 +65279,15 @@ diff -urNp linux-2.6.32.39/net/ipv6/udp.c linux-2.6.32.39/net/ipv6/udp.c
  int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
  {
  	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
+@@ -388,7 +392,7 @@ int udpv6_queue_rcv_skb(struct sock * sk
+ 		if (rc == -ENOMEM) {
+ 			UDP6_INC_STATS_BH(sock_net(sk),
+ 					UDP_MIB_RCVBUFERRORS, is_udplite);
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 		}
+ 		goto drop;
+ 	}
 @@ -587,6 +591,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
  		UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
  				proto == IPPROTO_UDPLITE);
@@ -58943,23 +65298,25 @@ diff -urNp linux-2.6.32.39/net/ipv6/udp.c linux-2.6.32.39/net/ipv6/udp.c
  		icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
  
  		kfree_skb(skb);
-@@ -1206,7 +1213,12 @@ static void udp6_sock_seq_show(struct se
+@@ -1206,8 +1213,13 @@ static void udp6_sock_seq_show(struct se
  		   0, 0L, 0,
  		   sock_i_uid(sp), 0,
  		   sock_i_ino(sp),
 -		   atomic_read(&sp->sk_refcnt), sp,
+-		   atomic_read(&sp->sk_drops));
 +		   atomic_read(&sp->sk_refcnt),
 +#ifdef CONFIG_GRKERNSEC_HIDESYM
 +		   NULL,
 +#else
 +		   sp,
 +#endif
- 		   atomic_read(&sp->sk_drops));
++		   atomic_read_unchecked(&sp->sk_drops));
  }
  
-diff -urNp linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c	2011-04-17 15:56:46.000000000 -0400
+ int udp6_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-2.6.32.40/net/irda/ircomm/ircomm_tty.c linux-2.6.32.40/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.32.40/net/irda/ircomm/ircomm_tty.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/irda/ircomm/ircomm_tty.c	2011-04-17 15:56:46.000000000 -0400
 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
@@ -59082,9 +65439,25 @@ diff -urNp linux-2.6.32.39/net/irda/ircomm/ircomm_tty.c linux-2.6.32.39/net/irda
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.32.39/net/key/af_key.c linux-2.6.32.39/net/key/af_key.c
---- linux-2.6.32.39/net/key/af_key.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/key/af_key.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/iucv/af_iucv.c linux-2.6.32.40/net/iucv/af_iucv.c
+--- linux-2.6.32.40/net/iucv/af_iucv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/iucv/af_iucv.c	2011-05-04 17:56:28.000000000 -0400
+@@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct soc
+ 
+ 	write_lock_bh(&iucv_sk_list.lock);
+ 
+-	sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
++	sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
+ 	while (__iucv_get_sock_by_name(name)) {
+ 		sprintf(name, "%08x",
+-			atomic_inc_return(&iucv_sk_list.autobind_name));
++			atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
+ 	}
+ 
+ 	write_unlock_bh(&iucv_sk_list.lock);
+diff -urNp linux-2.6.32.40/net/key/af_key.c linux-2.6.32.40/net/key/af_key.c
+--- linux-2.6.32.40/net/key/af_key.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/key/af_key.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil
  		seq_printf(f ,"sk       RefCnt Rmem   Wmem   User   Inode\n");
  	else
@@ -59097,9 +65470,9 @@ diff -urNp linux-2.6.32.39/net/key/af_key.c linux-2.6.32.39/net/key/af_key.c
  			       atomic_read(&s->sk_refcnt),
  			       sk_rmem_alloc_get(s),
  			       sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.32.39/net/mac80211/cfg.c linux-2.6.32.39/net/mac80211/cfg.c
---- linux-2.6.32.39/net/mac80211/cfg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/cfg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/cfg.c linux-2.6.32.40/net/mac80211/cfg.c
+--- linux-2.6.32.40/net/mac80211/cfg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/cfg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st
  	return err;
  }
@@ -59109,9 +65482,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/cfg.c linux-2.6.32.39/net/mac80211/cfg.c
  	.add_virtual_intf = ieee80211_add_iface,
  	.del_virtual_intf = ieee80211_del_iface,
  	.change_virtual_intf = ieee80211_change_iface,
-diff -urNp linux-2.6.32.39/net/mac80211/cfg.h linux-2.6.32.39/net/mac80211/cfg.h
---- linux-2.6.32.39/net/mac80211/cfg.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/cfg.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/cfg.h linux-2.6.32.40/net/mac80211/cfg.h
+--- linux-2.6.32.40/net/mac80211/cfg.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/cfg.h	2011-04-17 15:56:46.000000000 -0400
 @@ -4,6 +4,6 @@
  #ifndef __CFG_H
  #define __CFG_H
@@ -59120,9 +65493,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/cfg.h linux-2.6.32.39/net/mac80211/cfg.h
 +extern const struct cfg80211_ops mac80211_config_ops;
  
  #endif /* __CFG_H */
-diff -urNp linux-2.6.32.39/net/mac80211/debugfs_key.c linux-2.6.32.39/net/mac80211/debugfs_key.c
---- linux-2.6.32.39/net/mac80211/debugfs_key.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/debugfs_key.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/debugfs_key.c linux-2.6.32.40/net/mac80211/debugfs_key.c
+--- linux-2.6.32.40/net/mac80211/debugfs_key.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/debugfs_key.c	2011-04-17 15:56:46.000000000 -0400
 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file 
  			    size_t count, loff_t *ppos)
  {
@@ -59138,9 +65511,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/debugfs_key.c linux-2.6.32.39/net/mac802
  
  	for (i = 0; i < key->conf.keylen; i++)
  		p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
-diff -urNp linux-2.6.32.39/net/mac80211/ieee80211_i.h linux-2.6.32.39/net/mac80211/ieee80211_i.h
---- linux-2.6.32.39/net/mac80211/ieee80211_i.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/ieee80211_i.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/ieee80211_i.h linux-2.6.32.40/net/mac80211/ieee80211_i.h
+--- linux-2.6.32.40/net/mac80211/ieee80211_i.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/ieee80211_i.h	2011-04-17 15:56:46.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/etherdevice.h>
  #include <net/cfg80211.h>
@@ -59158,9 +65531,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/ieee80211_i.h linux-2.6.32.39/net/mac802
  	int monitors, cooked_mntrs;
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
-diff -urNp linux-2.6.32.39/net/mac80211/iface.c linux-2.6.32.39/net/mac80211/iface.c
---- linux-2.6.32.39/net/mac80211/iface.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/iface.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/iface.c linux-2.6.32.40/net/mac80211/iface.c
+--- linux-2.6.32.40/net/mac80211/iface.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/iface.c	2011-04-17 15:56:46.000000000 -0400
 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
  		break;
  	}
@@ -59215,9 +65588,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/iface.c linux-2.6.32.39/net/mac80211/ifa
  		ieee80211_clear_tx_pending(local);
  		ieee80211_stop_device(local);
  
-diff -urNp linux-2.6.32.39/net/mac80211/main.c linux-2.6.32.39/net/mac80211/main.c
---- linux-2.6.32.39/net/mac80211/main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/main.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/main.c linux-2.6.32.40/net/mac80211/main.c
+--- linux-2.6.32.40/net/mac80211/main.c	2011-05-10 22:12:02.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/main.c	2011-05-10 22:12:34.000000000 -0400
 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
@@ -59227,9 +65600,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/main.c linux-2.6.32.39/net/mac80211/main
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-2.6.32.39/net/mac80211/pm.c linux-2.6.32.39/net/mac80211/pm.c
---- linux-2.6.32.39/net/mac80211/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/pm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/pm.c linux-2.6.32.40/net/mac80211/pm.c
+--- linux-2.6.32.40/net/mac80211/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/pm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
  	}
  
@@ -59239,9 +65612,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/pm.c linux-2.6.32.39/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
  	local->suspended = true;
-diff -urNp linux-2.6.32.39/net/mac80211/rate.c linux-2.6.32.39/net/mac80211/rate.c
---- linux-2.6.32.39/net/mac80211/rate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/rate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/rate.c linux-2.6.32.40/net/mac80211/rate.c
+--- linux-2.6.32.40/net/mac80211/rate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/rate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  	struct rate_control_ref *ref, *old;
  
@@ -59251,9 +65624,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/rate.c linux-2.6.32.39/net/mac80211/rate
  		return -EBUSY;
  
  	ref = rate_control_alloc(name, local);
-diff -urNp linux-2.6.32.39/net/mac80211/tx.c linux-2.6.32.39/net/mac80211/tx.c
---- linux-2.6.32.39/net/mac80211/tx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/tx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/tx.c linux-2.6.32.40/net/mac80211/tx.c
+--- linux-2.6.32.40/net/mac80211/tx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/tx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 
  	return cpu_to_le16(dur);
  }
@@ -59263,9 +65636,9 @@ diff -urNp linux-2.6.32.39/net/mac80211/tx.c linux-2.6.32.39/net/mac80211/tx.c
  				      struct net_device *dev)
  {
  	return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.32.39/net/mac80211/util.c linux-2.6.32.39/net/mac80211/util.c
---- linux-2.6.32.39/net/mac80211/util.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/mac80211/util.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/mac80211/util.c linux-2.6.32.40/net/mac80211/util.c
+--- linux-2.6.32.40/net/mac80211/util.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/mac80211/util.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
  		local->resuming = true;
  
@@ -59275,9 +65648,145 @@ diff -urNp linux-2.6.32.39/net/mac80211/util.c linux-2.6.32.39/net/mac80211/util
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.32.39/net/netfilter/Kconfig linux-2.6.32.39/net/netfilter/Kconfig
---- linux-2.6.32.39/net/netfilter/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/netfilter/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.40/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-2.6.32.40/net/netfilter/ipvs/ip_vs_conn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/ipvs/ip_vs_conn.c	2011-05-04 17:56:28.000000000 -0400
+@@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
+ 		/* if the connection is not template and is created
+ 		 * by sync, preserve the activity flag.
+ 		 */
+-		cp->flags |= atomic_read(&dest->conn_flags) &
++		cp->flags |= atomic_read_unchecked(&dest->conn_flags) &
+ 			     (~IP_VS_CONN_F_INACTIVE);
+ 	else
+-		cp->flags |= atomic_read(&dest->conn_flags);
++		cp->flags |= atomic_read_unchecked(&dest->conn_flags);
+ 	cp->dest = dest;
+ 
+ 	IP_VS_DBG_BUF(7, "Bind-dest %s c:%s:%d v:%s:%d "
+@@ -723,7 +723,7 @@ ip_vs_conn_new(int af, int proto, const 
+ 	atomic_set(&cp->refcnt, 1);
+ 
+ 	atomic_set(&cp->n_control, 0);
+-	atomic_set(&cp->in_pkts, 0);
++	atomic_set_unchecked(&cp->in_pkts, 0);
+ 
+ 	atomic_inc(&ip_vs_conn_count);
+ 	if (flags & IP_VS_CONN_F_NO_CPORT)
+@@ -961,7 +961,7 @@ static inline int todrop_entry(struct ip
+ 
+ 	/* Don't drop the entry if its number of incoming packets is not
+ 	   located in [0, 8] */
+-	i = atomic_read(&cp->in_pkts);
++	i = atomic_read_unchecked(&cp->in_pkts);
+ 	if (i > 8 || i < 0) return 0;
+ 
+ 	if (!todrop_rate[i]) return 0;
+diff -urNp linux-2.6.32.40/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.40/net/netfilter/ipvs/ip_vs_core.c
+--- linux-2.6.32.40/net/netfilter/ipvs/ip_vs_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/ipvs/ip_vs_core.c	2011-05-04 17:56:28.000000000 -0400
+@@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *sv
+ 		ret = cp->packet_xmit(skb, cp, pp);
+ 		/* do not touch skb anymore */
+ 
+-		atomic_inc(&cp->in_pkts);
++		atomic_inc_unchecked(&cp->in_pkts);
+ 		ip_vs_conn_put(cp);
+ 		return ret;
+ 	}
+@@ -1357,7 +1357,7 @@ ip_vs_in(unsigned int hooknum, struct sk
+ 	 * Sync connection if it is about to close to
+ 	 * encorage the standby servers to update the connections timeout
+ 	 */
+-	pkts = atomic_add_return(1, &cp->in_pkts);
++	pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
+ 	if (af == AF_INET &&
+ 	    (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
+ 	    (((cp->protocol != IPPROTO_TCP ||
+diff -urNp linux-2.6.32.40/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.40/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-2.6.32.40/net/netfilter/ipvs/ip_vs_ctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/ipvs/ip_vs_ctl.c	2011-05-04 17:56:28.000000000 -0400
+@@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service
+ 		ip_vs_rs_hash(dest);
+ 		write_unlock_bh(&__ip_vs_rs_lock);
+ 	}
+-	atomic_set(&dest->conn_flags, conn_flags);
++	atomic_set_unchecked(&dest->conn_flags, conn_flags);
+ 
+ 	/* bind the service */
+ 	if (!dest->svc) {
+@@ -1888,7 +1888,7 @@ static int ip_vs_info_seq_show(struct se
+ 					   "      %-7s %-6d %-10d %-10d\n",
+ 					   &dest->addr.in6,
+ 					   ntohs(dest->port),
+-					   ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
++					   ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
+ 					   atomic_read(&dest->weight),
+ 					   atomic_read(&dest->activeconns),
+ 					   atomic_read(&dest->inactconns));
+@@ -1899,7 +1899,7 @@ static int ip_vs_info_seq_show(struct se
+ 					   "%-7s %-6d %-10d %-10d\n",
+ 					   ntohl(dest->addr.ip),
+ 					   ntohs(dest->port),
+-					   ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
++					   ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
+ 					   atomic_read(&dest->weight),
+ 					   atomic_read(&dest->activeconns),
+ 					   atomic_read(&dest->inactconns));
+@@ -2292,7 +2292,7 @@ __ip_vs_get_dest_entries(const struct ip
+ 
+ 			entry.addr = dest->addr.ip;
+ 			entry.port = dest->port;
+-			entry.conn_flags = atomic_read(&dest->conn_flags);
++			entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
+ 			entry.weight = atomic_read(&dest->weight);
+ 			entry.u_threshold = dest->u_threshold;
+ 			entry.l_threshold = dest->l_threshold;
+@@ -2802,7 +2802,7 @@ static int ip_vs_genl_fill_dest(struct s
+ 	NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
+ 
+ 	NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
+-		    atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
++		    atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
+ 	NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
+ 	NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
+ 	NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
+diff -urNp linux-2.6.32.40/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.40/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-2.6.32.40/net/netfilter/ipvs/ip_vs_sync.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/ipvs/ip_vs_sync.c	2011-05-04 17:56:28.000000000 -0400
+@@ -438,7 +438,7 @@ static void ip_vs_process_message(const 
+ 
+ 		if (opt)
+ 			memcpy(&cp->in_seq, opt, sizeof(*opt));
+-		atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
++		atomic_set_unchecked(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
+ 		cp->state = state;
+ 		cp->old_state = cp->state;
+ 		/*
+diff -urNp linux-2.6.32.40/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.40/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-2.6.32.40/net/netfilter/ipvs/ip_vs_xmit.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/ipvs/ip_vs_xmit.c	2011-05-04 17:56:28.000000000 -0400
+@@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
+ 		else
+ 			rc = NF_ACCEPT;
+ 		/* do not touch skb anymore */
+-		atomic_inc(&cp->in_pkts);
++		atomic_inc_unchecked(&cp->in_pkts);
+ 		goto out;
+ 	}
+ 
+@@ -949,7 +949,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, 
+ 		else
+ 			rc = NF_ACCEPT;
+ 		/* do not touch skb anymore */
+-		atomic_inc(&cp->in_pkts);
++		atomic_inc_unchecked(&cp->in_pkts);
+ 		goto out;
+ 	}
+ 
+diff -urNp linux-2.6.32.40/net/netfilter/Kconfig linux-2.6.32.40/net/netfilter/Kconfig
+--- linux-2.6.32.40/net/netfilter/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -59295,9 +65804,9 @@ diff -urNp linux-2.6.32.39/net/netfilter/Kconfig linux-2.6.32.39/net/netfilter/K
  config NETFILTER_XT_MATCH_HASHLIMIT
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.32.39/net/netfilter/Makefile linux-2.6.32.39/net/netfilter/Makefile
---- linux-2.6.32.39/net/netfilter/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/netfilter/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/netfilter/Makefile linux-2.6.32.40/net/netfilter/Makefile
+--- linux-2.6.32.40/net/netfilter/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
  obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -59306,9 +65815,9 @@ diff -urNp linux-2.6.32.39/net/netfilter/Makefile linux-2.6.32.39/net/netfilter/
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.40/net/netfilter/nf_conntrack_netlink.c
+--- linux-2.6.32.40/net/netfilter/nf_conntrack_netlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/nf_conntrack_netlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
  static int
  ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -59318,9 +65827,30 @@ diff -urNp linux-2.6.32.39/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.39/
  {
  	struct nlattr *tb[CTA_TUPLE_MAX+1];
  	int err;
-diff -urNp linux-2.6.32.39/net/netfilter/xt_gradm.c linux-2.6.32.39/net/netfilter/xt_gradm.c
---- linux-2.6.32.39/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.39/net/netfilter/xt_gradm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/netfilter/nfnetlink_log.c linux-2.6.32.40/net/netfilter/nfnetlink_log.c
+--- linux-2.6.32.40/net/netfilter/nfnetlink_log.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netfilter/nfnetlink_log.c	2011-05-04 17:56:28.000000000 -0400
+@@ -68,7 +68,7 @@ struct nfulnl_instance {
+ };
+ 
+ static DEFINE_RWLOCK(instances_lock);
+-static atomic_t global_seq;
++static atomic_unchecked_t global_seq;
+ 
+ #define INSTANCE_BUCKETS	16
+ static struct hlist_head instance_table[INSTANCE_BUCKETS];
+@@ -493,7 +493,7 @@ __build_packet_message(struct nfulnl_ins
+ 	/* global sequence number */
+ 	if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
+ 		NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
+-			     htonl(atomic_inc_return(&global_seq)));
++			     htonl(atomic_inc_return_unchecked(&global_seq)));
+ 
+ 	if (data_len) {
+ 		struct nlattr *nla;
+diff -urNp linux-2.6.32.40/net/netfilter/xt_gradm.c linux-2.6.32.40/net/netfilter/xt_gradm.c
+--- linux-2.6.32.40/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.40/net/netfilter/xt_gradm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -59373,10 +65903,19 @@ diff -urNp linux-2.6.32.39/net/netfilter/xt_gradm.c linux-2.6.32.39/net/netfilte
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.32.39/net/netlink/af_netlink.c linux-2.6.32.39/net/netlink/af_netlink.c
---- linux-2.6.32.39/net/netlink/af_netlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/netlink/af_netlink.c	2011-04-17 15:56:46.000000000 -0400
-@@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f
+diff -urNp linux-2.6.32.40/net/netlink/af_netlink.c linux-2.6.32.40/net/netlink/af_netlink.c
+--- linux-2.6.32.40/net/netlink/af_netlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netlink/af_netlink.c	2011-05-04 17:56:28.000000000 -0400
+@@ -733,7 +733,7 @@ static void netlink_overrun(struct sock 
+ 			sk->sk_error_report(sk);
+ 		}
+ 	}
+-	atomic_inc(&sk->sk_drops);
++	atomic_inc_unchecked(&sk->sk_drops);
+ }
+ 
+ static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
+@@ -1964,15 +1964,23 @@ static int netlink_seq_show(struct seq_f
  		struct netlink_sock *nlk = nlk_sk(s);
  
  		seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d\n",
@@ -59396,11 +65935,14 @@ diff -urNp linux-2.6.32.39/net/netlink/af_netlink.c linux-2.6.32.39/net/netlink/
  			   nlk->cb,
 +#endif
  			   atomic_read(&s->sk_refcnt),
- 			   atomic_read(&s->sk_drops)
+-			   atomic_read(&s->sk_drops)
++			   atomic_read_unchecked(&s->sk_drops)
  			);
-diff -urNp linux-2.6.32.39/net/netrom/af_netrom.c linux-2.6.32.39/net/netrom/af_netrom.c
---- linux-2.6.32.39/net/netrom/af_netrom.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/netrom/af_netrom.c	2011-04-17 15:56:46.000000000 -0400
+ 
+ 	}
+diff -urNp linux-2.6.32.40/net/netrom/af_netrom.c linux-2.6.32.40/net/netrom/af_netrom.c
+--- linux-2.6.32.40/net/netrom/af_netrom.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/netrom/af_netrom.c	2011-04-17 15:56:46.000000000 -0400
 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
@@ -59417,9 +65959,9 @@ diff -urNp linux-2.6.32.39/net/netrom/af_netrom.c linux-2.6.32.39/net/netrom/af_
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-2.6.32.39/net/packet/af_packet.c linux-2.6.32.39/net/packet/af_packet.c
---- linux-2.6.32.39/net/packet/af_packet.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.39/net/packet/af_packet.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/packet/af_packet.c linux-2.6.32.40/net/packet/af_packet.c
+--- linux-2.6.32.40/net/packet/af_packet.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.40/net/packet/af_packet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2427,7 +2427,11 @@ static int packet_seq_show(struct seq_fi
  
  		seq_printf(seq,
@@ -59432,9 +65974,9 @@ diff -urNp linux-2.6.32.39/net/packet/af_packet.c linux-2.6.32.39/net/packet/af_
  			   atomic_read(&s->sk_refcnt),
  			   s->sk_type,
  			   ntohs(po->num),
-diff -urNp linux-2.6.32.39/net/phonet/af_phonet.c linux-2.6.32.39/net/phonet/af_phonet.c
---- linux-2.6.32.39/net/phonet/af_phonet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/phonet/af_phonet.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/phonet/af_phonet.c linux-2.6.32.40/net/phonet/af_phonet.c
+--- linux-2.6.32.40/net/phonet/af_phonet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/phonet/af_phonet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
@@ -59453,26 +65995,97 @@ diff -urNp linux-2.6.32.39/net/phonet/af_phonet.c linux-2.6.32.39/net/phonet/af_
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.32.39/net/phonet/socket.c linux-2.6.32.39/net/phonet/socket.c
---- linux-2.6.32.39/net/phonet/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/phonet/socket.c	2011-04-17 15:56:46.000000000 -0400
-@@ -482,7 +482,12 @@ static int pn_sock_seq_show(struct seq_f
+diff -urNp linux-2.6.32.40/net/phonet/datagram.c linux-2.6.32.40/net/phonet/datagram.c
+--- linux-2.6.32.40/net/phonet/datagram.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/phonet/datagram.c	2011-05-04 17:56:28.000000000 -0400
+@@ -162,7 +162,7 @@ static int pn_backlog_rcv(struct sock *s
+ 	if (err < 0) {
+ 		kfree_skb(skb);
+ 		if (err == -ENOMEM)
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 	}
+ 	return err ? NET_RX_DROP : NET_RX_SUCCESS;
+ }
+diff -urNp linux-2.6.32.40/net/phonet/pep.c linux-2.6.32.40/net/phonet/pep.c
+--- linux-2.6.32.40/net/phonet/pep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/phonet/pep.c	2011-05-04 17:56:28.000000000 -0400
+@@ -348,7 +348,7 @@ static int pipe_do_rcv(struct sock *sk, 
+ 
+ 	case PNS_PEP_CTRL_REQ:
+ 		if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 			break;
+ 		}
+ 		__skb_pull(skb, 4);
+@@ -362,12 +362,12 @@ static int pipe_do_rcv(struct sock *sk, 
+ 			if (!err)
+ 				return 0;
+ 			if (err == -ENOMEM)
+-				atomic_inc(&sk->sk_drops);
++				atomic_inc_unchecked(&sk->sk_drops);
+ 			break;
+ 		}
+ 
+ 		if (pn->rx_credits == 0) {
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 			err = -ENOBUFS;
+ 			break;
+ 		}
+diff -urNp linux-2.6.32.40/net/phonet/socket.c linux-2.6.32.40/net/phonet/socket.c
+--- linux-2.6.32.40/net/phonet/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/phonet/socket.c	2011-05-04 17:57:07.000000000 -0400
+@@ -482,8 +482,13 @@ static int pn_sock_seq_show(struct seq_f
  			sk->sk_state,
  			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
  			sock_i_uid(sk), sock_i_ino(sk),
 -			atomic_read(&sk->sk_refcnt), sk,
+-			atomic_read(&sk->sk_drops), &len);
 +			atomic_read(&sk->sk_refcnt),
 +#ifdef CONFIG_GRKERNSEC_HIDESYM
 +			NULL,
 +#else
 +			sk,
 +#endif
- 			atomic_read(&sk->sk_drops), &len);
++			atomic_read_unchecked(&sk->sk_drops), &len);
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
-diff -urNp linux-2.6.32.39/net/rds/Kconfig linux-2.6.32.39/net/rds/Kconfig
---- linux-2.6.32.39/net/rds/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/rds/Kconfig	2011-04-17 15:56:46.000000000 -0400
+ 	return 0;
+diff -urNp linux-2.6.32.40/net/rds/cong.c linux-2.6.32.40/net/rds/cong.c
+--- linux-2.6.32.40/net/rds/cong.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rds/cong.c	2011-05-04 17:56:28.000000000 -0400
+@@ -77,7 +77,7 @@
+  * finds that the saved generation number is smaller than the global generation
+  * number, it wakes up the process.
+  */
+-static atomic_t		rds_cong_generation = ATOMIC_INIT(0);
++static atomic_unchecked_t		rds_cong_generation = ATOMIC_INIT(0);
+ 
+ /*
+  * Congestion monitoring
+@@ -232,7 +232,7 @@ void rds_cong_map_updated(struct rds_con
+ 	rdsdebug("waking map %p for %pI4\n",
+ 	  map, &map->m_addr);
+ 	rds_stats_inc(s_cong_update_received);
+-	atomic_inc(&rds_cong_generation);
++	atomic_inc_unchecked(&rds_cong_generation);
+ 	if (waitqueue_active(&map->m_waitq))
+ 		wake_up(&map->m_waitq);
+ 	if (waitqueue_active(&rds_poll_waitq))
+@@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
+ 
+ int rds_cong_updated_since(unsigned long *recent)
+ {
+-	unsigned long gen = atomic_read(&rds_cong_generation);
++	unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
+ 
+ 	if (likely(*recent == gen))
+ 		return 0;
+diff -urNp linux-2.6.32.40/net/rds/Kconfig linux-2.6.32.40/net/rds/Kconfig
+--- linux-2.6.32.40/net/rds/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rds/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -1,7 +1,7 @@
  
  config RDS
@@ -59482,9 +66095,170 @@ diff -urNp linux-2.6.32.39/net/rds/Kconfig linux-2.6.32.39/net/rds/Kconfig
  	---help---
  	  The RDS (Reliable Datagram Sockets) protocol provides reliable,
  	  sequenced delivery of datagrams over Infiniband, iWARP,
-diff -urNp linux-2.6.32.39/net/rxrpc/ar-key.c linux-2.6.32.39/net/rxrpc/ar-key.c
---- linux-2.6.32.39/net/rxrpc/ar-key.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/rxrpc/ar-key.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/rxrpc/af_rxrpc.c linux-2.6.32.40/net/rxrpc/af_rxrpc.c
+--- linux-2.6.32.40/net/rxrpc/af_rxrpc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/af_rxrpc.c	2011-05-04 17:56:28.000000000 -0400
+@@ -38,7 +38,7 @@ static const struct proto_ops rxrpc_rpc_
+ __be32 rxrpc_epoch;
+ 
+ /* current debugging ID */
+-atomic_t rxrpc_debug_id;
++atomic_unchecked_t rxrpc_debug_id;
+ 
+ /* count of skbs currently in use */
+ atomic_t rxrpc_n_skbs;
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-ack.c linux-2.6.32.40/net/rxrpc/ar-ack.c
+--- linux-2.6.32.40/net/rxrpc/ar-ack.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-ack.c	2011-05-04 17:56:28.000000000 -0400
+@@ -174,7 +174,7 @@ static void rxrpc_resend(struct rxrpc_ca
+ 
+ 	_enter("{%d,%d,%d,%d},",
+ 	       call->acks_hard, call->acks_unacked,
+-	       atomic_read(&call->sequence),
++	       atomic_read_unchecked(&call->sequence),
+ 	       CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
+ 
+ 	stop = 0;
+@@ -198,7 +198,7 @@ static void rxrpc_resend(struct rxrpc_ca
+ 
+ 			/* each Tx packet has a new serial number */
+ 			sp->hdr.serial =
+-				htonl(atomic_inc_return(&call->conn->serial));
++				htonl(atomic_inc_return_unchecked(&call->conn->serial));
+ 
+ 			hdr = (struct rxrpc_header *) txb->head;
+ 			hdr->serial = sp->hdr.serial;
+@@ -401,7 +401,7 @@ static void rxrpc_rotate_tx_window(struc
+  */
+ static void rxrpc_clear_tx_window(struct rxrpc_call *call)
+ {
+-	rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
++	rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
+ }
+ 
+ /*
+@@ -627,7 +627,7 @@ process_further:
+ 
+ 		latest = ntohl(sp->hdr.serial);
+ 		hard = ntohl(ack.firstPacket);
+-		tx = atomic_read(&call->sequence);
++		tx = atomic_read_unchecked(&call->sequence);
+ 
+ 		_proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
+ 		       latest,
+@@ -1159,7 +1159,7 @@ void rxrpc_process_call(struct work_stru
+ 	goto maybe_reschedule;
+ 
+ send_ACK_with_skew:
+-	ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
++	ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
+ 			    ntohl(ack.serial));
+ send_ACK:
+ 	mtu = call->conn->trans->peer->if_mtu;
+@@ -1171,7 +1171,7 @@ send_ACK:
+ 	ackinfo.rxMTU	= htonl(5692);
+ 	ackinfo.jumbo_max = htonl(4);
+ 
+-	hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
++	hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
+ 	_proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
+ 	       ntohl(hdr.serial),
+ 	       ntohs(ack.maxSkew),
+@@ -1189,7 +1189,7 @@ send_ACK:
+ send_message:
+ 	_debug("send message");
+ 
+-	hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
++	hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
+ 	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
+ send_message_2:
+ 
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-call.c linux-2.6.32.40/net/rxrpc/ar-call.c
+--- linux-2.6.32.40/net/rxrpc/ar-call.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-call.c	2011-05-04 17:56:28.000000000 -0400
+@@ -82,7 +82,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
+ 	spin_lock_init(&call->lock);
+ 	rwlock_init(&call->state_lock);
+ 	atomic_set(&call->usage, 1);
+-	call->debug_id = atomic_inc_return(&rxrpc_debug_id);
++	call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
+ 	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
+ 
+ 	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-connection.c linux-2.6.32.40/net/rxrpc/ar-connection.c
+--- linux-2.6.32.40/net/rxrpc/ar-connection.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-connection.c	2011-05-04 17:56:28.000000000 -0400
+@@ -205,7 +205,7 @@ static struct rxrpc_connection *rxrpc_al
+ 		rwlock_init(&conn->lock);
+ 		spin_lock_init(&conn->state_lock);
+ 		atomic_set(&conn->usage, 1);
+-		conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
++		conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
+ 		conn->avail_calls = RXRPC_MAXCALLS;
+ 		conn->size_align = 4;
+ 		conn->header_size = sizeof(struct rxrpc_header);
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-connevent.c linux-2.6.32.40/net/rxrpc/ar-connevent.c
+--- linux-2.6.32.40/net/rxrpc/ar-connevent.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-connevent.c	2011-05-04 17:56:28.000000000 -0400
+@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
+ 
+ 	len = iov[0].iov_len + iov[1].iov_len;
+ 
+-	hdr.serial = htonl(atomic_inc_return(&conn->serial));
++	hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
+ 	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
+ 
+ 	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-input.c linux-2.6.32.40/net/rxrpc/ar-input.c
+--- linux-2.6.32.40/net/rxrpc/ar-input.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-input.c	2011-05-04 17:56:28.000000000 -0400
+@@ -339,9 +339,9 @@ void rxrpc_fast_process_packet(struct rx
+ 	/* track the latest serial number on this connection for ACK packet
+ 	 * information */
+ 	serial = ntohl(sp->hdr.serial);
+-	hi_serial = atomic_read(&call->conn->hi_serial);
++	hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
+ 	while (serial > hi_serial)
+-		hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
++		hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
+ 					   serial);
+ 
+ 	/* request ACK generation for any ACK or DATA packet that requests
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-internal.h linux-2.6.32.40/net/rxrpc/ar-internal.h
+--- linux-2.6.32.40/net/rxrpc/ar-internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-internal.h	2011-05-04 17:56:28.000000000 -0400
+@@ -272,8 +272,8 @@ struct rxrpc_connection {
+ 	int			error;		/* error code for local abort */
+ 	int			debug_id;	/* debug ID for printks */
+ 	unsigned		call_counter;	/* call ID counter */
+-	atomic_t		serial;		/* packet serial number counter */
+-	atomic_t		hi_serial;	/* highest serial number received */
++	atomic_unchecked_t	serial;		/* packet serial number counter */
++	atomic_unchecked_t	hi_serial;	/* highest serial number received */
+ 	u8			avail_calls;	/* number of calls available */
+ 	u8			size_align;	/* data size alignment (for security) */
+ 	u8			header_size;	/* rxrpc + security header size */
+@@ -346,7 +346,7 @@ struct rxrpc_call {
+ 	spinlock_t		lock;
+ 	rwlock_t		state_lock;	/* lock for state transition */
+ 	atomic_t		usage;
+-	atomic_t		sequence;	/* Tx data packet sequence counter */
++	atomic_unchecked_t	sequence;	/* Tx data packet sequence counter */
+ 	u32			abort_code;	/* local/remote abort code */
+ 	enum {					/* current state of call */
+ 		RXRPC_CALL_CLIENT_SEND_REQUEST,	/* - client sending request phase */
+@@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(stru
+  */
+ extern atomic_t rxrpc_n_skbs;
+ extern __be32 rxrpc_epoch;
+-extern atomic_t rxrpc_debug_id;
++extern atomic_unchecked_t rxrpc_debug_id;
+ extern struct workqueue_struct *rxrpc_workqueue;
+ 
+ /*
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-key.c linux-2.6.32.40/net/rxrpc/ar-key.c
+--- linux-2.6.32.40/net/rxrpc/ar-key.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-key.c	2011-04-17 15:56:46.000000000 -0400
 @@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s
  		return ret;
  
@@ -59512,9 +66286,95 @@ diff -urNp linux-2.6.32.39/net/rxrpc/ar-key.c linux-2.6.32.39/net/rxrpc/ar-key.c
  	if (!token->kad)
  		goto error_free;
  
-diff -urNp linux-2.6.32.39/net/sctp/proc.c linux-2.6.32.39/net/sctp/proc.c
---- linux-2.6.32.39/net/sctp/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/sctp/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-local.c linux-2.6.32.40/net/rxrpc/ar-local.c
+--- linux-2.6.32.40/net/rxrpc/ar-local.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-local.c	2011-05-04 17:56:28.000000000 -0400
+@@ -44,7 +44,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
+ 		spin_lock_init(&local->lock);
+ 		rwlock_init(&local->services_lock);
+ 		atomic_set(&local->usage, 1);
+-		local->debug_id = atomic_inc_return(&rxrpc_debug_id);
++		local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
+ 		memcpy(&local->srx, srx, sizeof(*srx));
+ 	}
+ 
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-output.c linux-2.6.32.40/net/rxrpc/ar-output.c
+--- linux-2.6.32.40/net/rxrpc/ar-output.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-output.c	2011-05-04 17:56:28.000000000 -0400
+@@ -680,9 +680,9 @@ static int rxrpc_send_data(struct kiocb 
+ 			sp->hdr.cid = call->cid;
+ 			sp->hdr.callNumber = call->call_id;
+ 			sp->hdr.seq =
+-				htonl(atomic_inc_return(&call->sequence));
++				htonl(atomic_inc_return_unchecked(&call->sequence));
+ 			sp->hdr.serial =
+-				htonl(atomic_inc_return(&conn->serial));
++				htonl(atomic_inc_return_unchecked(&conn->serial));
+ 			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
+ 			sp->hdr.userStatus = 0;
+ 			sp->hdr.securityIndex = conn->security_ix;
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-peer.c linux-2.6.32.40/net/rxrpc/ar-peer.c
+--- linux-2.6.32.40/net/rxrpc/ar-peer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-peer.c	2011-05-04 17:56:28.000000000 -0400
+@@ -86,7 +86,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
+ 		INIT_LIST_HEAD(&peer->error_targets);
+ 		spin_lock_init(&peer->lock);
+ 		atomic_set(&peer->usage, 1);
+-		peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
++		peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
+ 		memcpy(&peer->srx, srx, sizeof(*srx));
+ 
+ 		rxrpc_assess_MTU_size(peer);
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-proc.c linux-2.6.32.40/net/rxrpc/ar-proc.c
+--- linux-2.6.32.40/net/rxrpc/ar-proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-proc.c	2011-05-04 17:56:28.000000000 -0400
+@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
+ 		   atomic_read(&conn->usage),
+ 		   rxrpc_conn_states[conn->state],
+ 		   key_serial(conn->key),
+-		   atomic_read(&conn->serial),
+-		   atomic_read(&conn->hi_serial));
++		   atomic_read_unchecked(&conn->serial),
++		   atomic_read_unchecked(&conn->hi_serial));
+ 
+ 	return 0;
+ }
+diff -urNp linux-2.6.32.40/net/rxrpc/ar-transport.c linux-2.6.32.40/net/rxrpc/ar-transport.c
+--- linux-2.6.32.40/net/rxrpc/ar-transport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/ar-transport.c	2011-05-04 17:56:28.000000000 -0400
+@@ -46,7 +46,7 @@ static struct rxrpc_transport *rxrpc_all
+ 		spin_lock_init(&trans->client_lock);
+ 		rwlock_init(&trans->conn_lock);
+ 		atomic_set(&trans->usage, 1);
+-		trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
++		trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
+ 
+ 		if (peer->srx.transport.family == AF_INET) {
+ 			switch (peer->srx.transport_type) {
+diff -urNp linux-2.6.32.40/net/rxrpc/rxkad.c linux-2.6.32.40/net/rxrpc/rxkad.c
+--- linux-2.6.32.40/net/rxrpc/rxkad.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/rxrpc/rxkad.c	2011-05-04 17:56:28.000000000 -0400
+@@ -609,7 +609,7 @@ static int rxkad_issue_challenge(struct 
+ 
+ 	len = iov[0].iov_len + iov[1].iov_len;
+ 
+-	hdr.serial = htonl(atomic_inc_return(&conn->serial));
++	hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
+ 	_proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
+ 
+ 	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
+@@ -659,7 +659,7 @@ static int rxkad_send_response(struct rx
+ 
+ 	len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
+ 
+-	hdr->serial = htonl(atomic_inc_return(&conn->serial));
++	hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
+ 	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
+ 
+ 	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
+diff -urNp linux-2.6.32.40/net/sctp/proc.c linux-2.6.32.40/net/sctp/proc.c
+--- linux-2.6.32.40/net/sctp/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sctp/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_
  	sctp_for_each_hentry(epb, node, &head->chain) {
  		ep = sctp_ep(epb);
@@ -59543,9 +66403,9 @@ diff -urNp linux-2.6.32.39/net/sctp/proc.c linux-2.6.32.39/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-2.6.32.39/net/sctp/socket.c linux-2.6.32.39/net/sctp/socket.c
---- linux-2.6.32.39/net/sctp/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/sctp/socket.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.40/net/sctp/socket.c linux-2.6.32.40/net/sctp/socket.c
+--- linux-2.6.32.40/net/sctp/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sctp/socket.c	2011-04-23 12:56:11.000000000 -0400
 @@ -5802,7 +5802,6 @@ pp_found:
  		 */
  		int reuse = sk->sk_reuse;
@@ -59554,9 +66414,9 @@ diff -urNp linux-2.6.32.39/net/sctp/socket.c linux-2.6.32.39/net/sctp/socket.c
  
  		SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
  		if (pp->fastreuse && sk->sk_reuse &&
-diff -urNp linux-2.6.32.39/net/socket.c linux-2.6.32.39/net/socket.c
---- linux-2.6.32.39/net/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/socket.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/socket.c linux-2.6.32.40/net/socket.c
+--- linux-2.6.32.40/net/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/socket.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <linux/wireless.h>
  #include <linux/nsproxy.h>
@@ -59720,9 +66580,9 @@ diff -urNp linux-2.6.32.39/net/socket.c linux-2.6.32.39/net/socket.c
  	err =
  	    security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
  	if (err)
-diff -urNp linux-2.6.32.39/net/sunrpc/sched.c linux-2.6.32.39/net/sunrpc/sched.c
---- linux-2.6.32.39/net/sunrpc/sched.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/sunrpc/sched.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/sunrpc/sched.c linux-2.6.32.40/net/sunrpc/sched.c
+--- linux-2.6.32.40/net/sunrpc/sched.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sunrpc/sched.c	2011-04-17 15:56:46.000000000 -0400
 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -59736,9 +66596,34 @@ diff -urNp linux-2.6.32.39/net/sunrpc/sched.c linux-2.6.32.39/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma.c	2011-05-04 17:56:20.000000000 -0400
+@@ -59,15 +59,15 @@ unsigned int svcrdma_max_req_size = RPCR
+ static unsigned int min_max_inline = 4096;
+ static unsigned int max_max_inline = 65536;
+ 
+-atomic_t rdma_stat_recv;
+-atomic_t rdma_stat_read;
+-atomic_t rdma_stat_write;
+-atomic_t rdma_stat_sq_starve;
+-atomic_t rdma_stat_rq_starve;
+-atomic_t rdma_stat_rq_poll;
+-atomic_t rdma_stat_rq_prod;
+-atomic_t rdma_stat_sq_poll;
+-atomic_t rdma_stat_sq_prod;
++atomic_unchecked_t rdma_stat_recv;
++atomic_unchecked_t rdma_stat_read;
++atomic_unchecked_t rdma_stat_write;
++atomic_unchecked_t rdma_stat_sq_starve;
++atomic_unchecked_t rdma_stat_rq_starve;
++atomic_unchecked_t rdma_stat_rq_poll;
++atomic_unchecked_t rdma_stat_rq_prod;
++atomic_unchecked_t rdma_stat_sq_poll;
++atomic_unchecked_t rdma_stat_sq_prod;
+ 
+ /* Temporary NFS request map and context caches */
+ struct kmem_cache *svc_rdma_map_cachep;
 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
  		len -= *ppos;
  		if (len > *lenp)
@@ -59748,9 +66633,172 @@ diff -urNp linux-2.6.32.39/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.39/net/su
  			return -EFAULT;
  		*lenp = len;
  		*ppos += len;
-diff -urNp linux-2.6.32.39/net/sysctl_net.c linux-2.6.32.39/net/sysctl_net.c
---- linux-2.6.32.39/net/sysctl_net.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/sysctl_net.c	2011-04-17 15:56:46.000000000 -0400
+@@ -149,63 +149,63 @@ static ctl_table svcrdma_parm_table[] = 
+ 	{
+ 		.procname	= "rdma_stat_read",
+ 		.data		= &rdma_stat_read,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_recv",
+ 		.data		= &rdma_stat_recv,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_write",
+ 		.data		= &rdma_stat_write,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_sq_starve",
+ 		.data		= &rdma_stat_sq_starve,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_rq_starve",
+ 		.data		= &rdma_stat_rq_starve,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_rq_poll",
+ 		.data		= &rdma_stat_rq_poll,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_rq_prod",
+ 		.data		= &rdma_stat_rq_prod,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_sq_poll",
+ 		.data		= &rdma_stat_sq_poll,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+ 	{
+ 		.procname	= "rdma_stat_sq_prod",
+ 		.data		= &rdma_stat_sq_prod,
+-		.maxlen		= sizeof(atomic_t),
++		.maxlen		= sizeof(atomic_unchecked_t),
+ 		.mode		= 0644,
+ 		.proc_handler	= &read_reset_stat,
+ 	},
+diff -urNp linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-05-04 17:56:28.000000000 -0400
+@@ -495,7 +495,7 @@ next_sge:
+ 			svc_rdma_put_context(ctxt, 0);
+ 			goto out;
+ 		}
+-		atomic_inc(&rdma_stat_read);
++		atomic_inc_unchecked(&rdma_stat_read);
+ 
+ 		if (read_wr.num_sge < chl_map->ch[ch_no].count) {
+ 			chl_map->ch[ch_no].count -= read_wr.num_sge;
+@@ -606,7 +606,7 @@ int svc_rdma_recvfrom(struct svc_rqst *r
+ 				  dto_q);
+ 		list_del_init(&ctxt->dto_q);
+ 	} else {
+-		atomic_inc(&rdma_stat_rq_starve);
++		atomic_inc_unchecked(&rdma_stat_rq_starve);
+ 		clear_bit(XPT_DATA, &xprt->xpt_flags);
+ 		ctxt = NULL;
+ 	}
+@@ -626,7 +626,7 @@ int svc_rdma_recvfrom(struct svc_rqst *r
+ 	dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
+ 		ctxt, rdma_xprt, rqstp, ctxt->wc_status);
+ 	BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
+-	atomic_inc(&rdma_stat_recv);
++	atomic_inc_unchecked(&rdma_stat_recv);
+ 
+ 	/* Build up the XDR from the receive buffers. */
+ 	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
+diff -urNp linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-05-04 17:56:28.000000000 -0400
+@@ -328,7 +328,7 @@ static int send_write(struct svcxprt_rdm
+ 	write_wr.wr.rdma.remote_addr = to;
+ 
+ 	/* Post It */
+-	atomic_inc(&rdma_stat_write);
++	atomic_inc_unchecked(&rdma_stat_write);
+ 	if (svc_rdma_send(xprt, &write_wr))
+ 		goto err;
+ 	return 0;
+diff -urNp linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-05-04 17:56:28.000000000 -0400
+@@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rd
+ 		return;
+ 
+ 	ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
+-	atomic_inc(&rdma_stat_rq_poll);
++	atomic_inc_unchecked(&rdma_stat_rq_poll);
+ 
+ 	while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
+ 		ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
+@@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rd
+ 	}
+ 
+ 	if (ctxt)
+-		atomic_inc(&rdma_stat_rq_prod);
++		atomic_inc_unchecked(&rdma_stat_rq_prod);
+ 
+ 	set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
+ 	/*
+@@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rd
+ 		return;
+ 
+ 	ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
+-	atomic_inc(&rdma_stat_sq_poll);
++	atomic_inc_unchecked(&rdma_stat_sq_poll);
+ 	while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
+ 		if (wc.status != IB_WC_SUCCESS)
+ 			/* Close the transport */
+@@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rd
+ 	}
+ 
+ 	if (ctxt)
+-		atomic_inc(&rdma_stat_sq_prod);
++		atomic_inc_unchecked(&rdma_stat_sq_prod);
+ }
+ 
+ static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
+@@ -1260,7 +1260,7 @@ int svc_rdma_send(struct svcxprt_rdma *x
+ 		spin_lock_bh(&xprt->sc_lock);
+ 		if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
+ 			spin_unlock_bh(&xprt->sc_lock);
+-			atomic_inc(&rdma_stat_sq_starve);
++			atomic_inc_unchecked(&rdma_stat_sq_starve);
+ 
+ 			/* See if we can opportunistically reap SQ WR to make room */
+ 			sq_cq_reap(xprt);
+diff -urNp linux-2.6.32.40/net/sysctl_net.c linux-2.6.32.40/net/sysctl_net.c
+--- linux-2.6.32.40/net/sysctl_net.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/sysctl_net.c	2011-04-17 15:56:46.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
@@ -59760,10 +66808,10 @@ diff -urNp linux-2.6.32.39/net/sysctl_net.c linux-2.6.32.39/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c
---- linux-2.6.32.39/net/unix/af_unix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/unix/af_unix.c	2011-04-17 15:56:46.000000000 -0400
-@@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru
+diff -urNp linux-2.6.32.40/net/unix/af_unix.c linux-2.6.32.40/net/unix/af_unix.c
+--- linux-2.6.32.40/net/unix/af_unix.c	2011-05-10 22:12:02.000000000 -0400
++++ linux-2.6.32.40/net/unix/af_unix.c	2011-05-10 22:12:34.000000000 -0400
+@@ -745,6 +745,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
  			goto put_fail;
@@ -59776,7 +66824,7 @@ diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c
  		u = unix_find_socket_byinode(net, inode);
  		if (!u)
  			goto put_fail;
-@@ -763,6 +769,13 @@ static struct sock *unix_find_other(stru
+@@ -765,6 +771,13 @@ static struct sock *unix_find_other(stru
  		if (u) {
  			struct dentry *dentry;
  			dentry = unix_sk(u)->dentry;
@@ -59790,7 +66838,7 @@ diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c
  			if (dentry)
  				touch_atime(unix_sk(u)->mnt, dentry);
  		} else
-@@ -848,11 +861,18 @@ static int unix_bind(struct socket *sock
+@@ -850,11 +863,18 @@ static int unix_bind(struct socket *sock
  		err = security_path_mknod(&nd.path, dentry, mode, 0);
  		if (err)
  			goto out_mknod_drop_write;
@@ -59809,7 +66857,7 @@ diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c
  		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
  		dput(nd.path.dentry);
  		nd.path.dentry = dentry;
-@@ -870,6 +890,10 @@ out_mknod_drop_write:
+@@ -872,6 +892,10 @@ out_mknod_drop_write:
  			goto out_unlock;
  		}
  
@@ -59820,7 +66868,7 @@ diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c
  		list = &unix_socket_table[addr->hash];
  	} else {
  		list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-@@ -2170,7 +2194,11 @@ static int unix_seq_show(struct seq_file
+@@ -2211,7 +2235,11 @@ static int unix_seq_show(struct seq_file
  		unix_state_lock(s);
  
  		seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
@@ -59832,9 +66880,9 @@ diff -urNp linux-2.6.32.39/net/unix/af_unix.c linux-2.6.32.39/net/unix/af_unix.c
  			atomic_read(&s->sk_refcnt),
  			0,
  			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.32.39/net/wireless/wext.c linux-2.6.32.39/net/wireless/wext.c
---- linux-2.6.32.39/net/wireless/wext.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/wireless/wext.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/wireless/wext.c linux-2.6.32.40/net/wireless/wext.c
+--- linux-2.6.32.40/net/wireless/wext.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/wireless/wext.c	2011-04-17 15:56:46.000000000 -0400
 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -59868,9 +66916,54 @@ diff -urNp linux-2.6.32.39/net/wireless/wext.c linux-2.6.32.39/net/wireless/wext
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-2.6.32.39/net/xfrm/xfrm_policy.c linux-2.6.32.39/net/xfrm/xfrm_policy.c
---- linux-2.6.32.39/net/xfrm/xfrm_policy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/net/xfrm/xfrm_policy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/net/xfrm/xfrm_policy.c linux-2.6.32.40/net/xfrm/xfrm_policy.c
+--- linux-2.6.32.40/net/xfrm/xfrm_policy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/net/xfrm/xfrm_policy.c	2011-05-04 17:56:20.000000000 -0400
+@@ -586,7 +586,7 @@ int xfrm_policy_insert(int dir, struct x
+ 		hlist_add_head(&policy->bydst, chain);
+ 	xfrm_pol_hold(policy);
+ 	net->xfrm.policy_count[dir]++;
+-	atomic_inc(&flow_cache_genid);
++	atomic_inc_unchecked(&flow_cache_genid);
+ 	if (delpol)
+ 		__xfrm_policy_unlink(delpol, dir);
+ 	policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
+@@ -669,7 +669,7 @@ struct xfrm_policy *xfrm_policy_bysel_ct
+ 	write_unlock_bh(&xfrm_policy_lock);
+ 
+ 	if (ret && delete) {
+-		atomic_inc(&flow_cache_genid);
++		atomic_inc_unchecked(&flow_cache_genid);
+ 		xfrm_policy_kill(ret);
+ 	}
+ 	return ret;
+@@ -710,7 +710,7 @@ struct xfrm_policy *xfrm_policy_byid(str
+ 	write_unlock_bh(&xfrm_policy_lock);
+ 
+ 	if (ret && delete) {
+-		atomic_inc(&flow_cache_genid);
++		atomic_inc_unchecked(&flow_cache_genid);
+ 		xfrm_policy_kill(ret);
+ 	}
+ 	return ret;
+@@ -824,7 +824,7 @@ int xfrm_policy_flush(struct net *net, u
+ 		}
+ 
+ 	}
+-	atomic_inc(&flow_cache_genid);
++	atomic_inc_unchecked(&flow_cache_genid);
+ out:
+ 	write_unlock_bh(&xfrm_policy_lock);
+ 	return err;
+@@ -1088,7 +1088,7 @@ int xfrm_policy_delete(struct xfrm_polic
+ 	write_unlock_bh(&xfrm_policy_lock);
+ 	if (pol) {
+ 		if (dir < XFRM_POLICY_MAX)
+-			atomic_inc(&flow_cache_genid);
++			atomic_inc_unchecked(&flow_cache_genid);
+ 		xfrm_policy_kill(pol);
+ 		return 0;
+ 	}
 @@ -1477,7 +1477,7 @@ free_dst:
  	goto out;
  }
@@ -59898,9 +66991,27 @@ diff -urNp linux-2.6.32.39/net/xfrm/xfrm_policy.c linux-2.6.32.39/net/xfrm/xfrm_
  xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-diff -urNp linux-2.6.32.39/samples/kobject/kset-example.c linux-2.6.32.39/samples/kobject/kset-example.c
---- linux-2.6.32.39/samples/kobject/kset-example.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/samples/kobject/kset-example.c	2011-04-17 15:56:46.000000000 -0400
+@@ -1537,7 +1537,7 @@ int __xfrm_lookup(struct net *net, struc
+ 	u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT);
+ 
+ restart:
+-	genid = atomic_read(&flow_cache_genid);
++	genid = atomic_read_unchecked(&flow_cache_genid);
+ 	policy = NULL;
+ 	for (pi = 0; pi < ARRAY_SIZE(pols); pi++)
+ 		pols[pi] = NULL;
+@@ -1680,7 +1680,7 @@ restart:
+ 					goto error;
+ 				}
+ 				if (nx == -EAGAIN ||
+-				    genid != atomic_read(&flow_cache_genid)) {
++				    genid != atomic_read_unchecked(&flow_cache_genid)) {
+ 					xfrm_pols_put(pols, npols);
+ 					goto restart;
+ 				}
+diff -urNp linux-2.6.32.40/samples/kobject/kset-example.c linux-2.6.32.40/samples/kobject/kset-example.c
+--- linux-2.6.32.40/samples/kobject/kset-example.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/samples/kobject/kset-example.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
  }
  
@@ -59910,9 +67021,9 @@ diff -urNp linux-2.6.32.39/samples/kobject/kset-example.c linux-2.6.32.39/sample
  	.show = foo_attr_show,
  	.store = foo_attr_store,
  };
-diff -urNp linux-2.6.32.39/scripts/basic/fixdep.c linux-2.6.32.39/scripts/basic/fixdep.c
---- linux-2.6.32.39/scripts/basic/fixdep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/scripts/basic/fixdep.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/scripts/basic/fixdep.c linux-2.6.32.40/scripts/basic/fixdep.c
+--- linux-2.6.32.40/scripts/basic/fixdep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/scripts/basic/fixdep.c	2011-04-17 15:56:46.000000000 -0400
 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
  
  static void parse_config_file(char *map, size_t len)
@@ -59934,9 +67045,9 @@ diff -urNp linux-2.6.32.39/scripts/basic/fixdep.c linux-2.6.32.39/scripts/basic/
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.32.39/scripts/mod/file2alias.c linux-2.6.32.39/scripts/mod/file2alias.c
---- linux-2.6.32.39/scripts/mod/file2alias.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/scripts/mod/file2alias.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/scripts/mod/file2alias.c linux-2.6.32.40/scripts/mod/file2alias.c
+--- linux-2.6.32.40/scripts/mod/file2alias.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/scripts/mod/file2alias.c	2011-04-17 15:56:46.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -59991,9 +67102,9 @@ diff -urNp linux-2.6.32.39/scripts/mod/file2alias.c linux-2.6.32.39/scripts/mod/
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.32.39/scripts/mod/modpost.c linux-2.6.32.39/scripts/mod/modpost.c
---- linux-2.6.32.39/scripts/mod/modpost.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/scripts/mod/modpost.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/scripts/mod/modpost.c linux-2.6.32.40/scripts/mod/modpost.c
+--- linux-2.6.32.40/scripts/mod/modpost.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/scripts/mod/modpost.c	2011-04-17 15:56:46.000000000 -0400
 @@ -835,6 +835,7 @@ enum mismatch {
  	INIT_TO_EXIT,
  	EXIT_TO_INIT,
@@ -60061,9 +67172,9 @@ diff -urNp linux-2.6.32.39/scripts/mod/modpost.c linux-2.6.32.39/scripts/mod/mod
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.32.39/scripts/mod/modpost.h linux-2.6.32.39/scripts/mod/modpost.h
---- linux-2.6.32.39/scripts/mod/modpost.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/scripts/mod/modpost.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/scripts/mod/modpost.h linux-2.6.32.40/scripts/mod/modpost.h
+--- linux-2.6.32.40/scripts/mod/modpost.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/scripts/mod/modpost.h	2011-04-17 15:56:46.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -60083,9 +67194,9 @@ diff -urNp linux-2.6.32.39/scripts/mod/modpost.h linux-2.6.32.39/scripts/mod/mod
  
  struct module {
  	struct module *next;
-diff -urNp linux-2.6.32.39/scripts/mod/sumversion.c linux-2.6.32.39/scripts/mod/sumversion.c
---- linux-2.6.32.39/scripts/mod/sumversion.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/scripts/mod/sumversion.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/scripts/mod/sumversion.c linux-2.6.32.40/scripts/mod/sumversion.c
+--- linux-2.6.32.40/scripts/mod/sumversion.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/scripts/mod/sumversion.c	2011-04-17 15:56:46.000000000 -0400
 @@ -455,7 +455,7 @@ static void write_version(const char *fi
  		goto out;
  	}
@@ -60095,9 +67206,9 @@ diff -urNp linux-2.6.32.39/scripts/mod/sumversion.c linux-2.6.32.39/scripts/mod/
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-2.6.32.39/scripts/pnmtologo.c linux-2.6.32.39/scripts/pnmtologo.c
---- linux-2.6.32.39/scripts/pnmtologo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/scripts/pnmtologo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/scripts/pnmtologo.c linux-2.6.32.40/scripts/pnmtologo.c
+--- linux-2.6.32.40/scripts/pnmtologo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/scripts/pnmtologo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -60124,9 +67235,9 @@ diff -urNp linux-2.6.32.39/scripts/pnmtologo.c linux-2.6.32.39/scripts/pnmtologo
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.32.39/security/capability.c linux-2.6.32.39/security/capability.c
---- linux-2.6.32.39/security/capability.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/capability.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/capability.c linux-2.6.32.40/security/capability.c
+--- linux-2.6.32.40/security/capability.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/capability.c	2011-04-17 15:56:46.000000000 -0400
 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
  }
  #endif /* CONFIG_AUDIT */
@@ -60136,9 +67247,9 @@ diff -urNp linux-2.6.32.39/security/capability.c linux-2.6.32.39/security/capabi
  	.name	= "default",
  };
  
-diff -urNp linux-2.6.32.39/security/commoncap.c linux-2.6.32.39/security/commoncap.c
---- linux-2.6.32.39/security/commoncap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/commoncap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/commoncap.c linux-2.6.32.40/security/commoncap.c
+--- linux-2.6.32.40/security/commoncap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/commoncap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <linux/sched.h>
  #include <linux/prctl.h>
@@ -60171,9 +67282,9 @@ diff -urNp linux-2.6.32.39/security/commoncap.c linux-2.6.32.39/security/commonc
  	if (cred->uid != 0) {
  		if (bprm->cap_effective)
  			return 1;
-diff -urNp linux-2.6.32.39/security/integrity/ima/ima_api.c linux-2.6.32.39/security/integrity/ima/ima_api.c
---- linux-2.6.32.39/security/integrity/ima/ima_api.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/integrity/ima/ima_api.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/integrity/ima/ima_api.c linux-2.6.32.40/security/integrity/ima/ima_api.c
+--- linux-2.6.32.40/security/integrity/ima/ima_api.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/integrity/ima/ima_api.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
  	int result;
  
@@ -60183,9 +67294,9 @@ diff -urNp linux-2.6.32.39/security/integrity/ima/ima_api.c linux-2.6.32.39/secu
  
  	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  	if (!entry) {
-diff -urNp linux-2.6.32.39/security/integrity/ima/ima_fs.c linux-2.6.32.39/security/integrity/ima/ima_fs.c
---- linux-2.6.32.39/security/integrity/ima/ima_fs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/integrity/ima/ima_fs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/integrity/ima/ima_fs.c linux-2.6.32.40/security/integrity/ima/ima_fs.c
+--- linux-2.6.32.40/security/integrity/ima/ima_fs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/integrity/ima/ima_fs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,12 +27,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -60201,9 +67312,9 @@ diff -urNp linux-2.6.32.39/security/integrity/ima/ima_fs.c linux-2.6.32.39/secur
  	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-2.6.32.39/security/integrity/ima/ima.h linux-2.6.32.39/security/integrity/ima/ima.h
---- linux-2.6.32.39/security/integrity/ima/ima.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/integrity/ima/ima.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/integrity/ima/ima.h linux-2.6.32.40/security/integrity/ima/ima.h
+--- linux-2.6.32.40/security/integrity/ima/ima.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/integrity/ima/ima.h	2011-04-17 15:56:46.000000000 -0400
 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -60215,9 +67326,9 @@ diff -urNp linux-2.6.32.39/security/integrity/ima/ima.h linux-2.6.32.39/security
  	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.39/security/integrity/ima/ima_queue.c linux-2.6.32.39/security/integrity/ima/ima_queue.c
---- linux-2.6.32.39/security/integrity/ima/ima_queue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/integrity/ima/ima_queue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/integrity/ima/ima_queue.c linux-2.6.32.40/security/integrity/ima/ima_queue.c
+--- linux-2.6.32.40/security/integrity/ima/ima_queue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/integrity/ima/ima_queue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
  	INIT_LIST_HEAD(&qe->later);
  	list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -60227,10 +67338,10 @@ diff -urNp linux-2.6.32.39/security/integrity/ima/ima_queue.c linux-2.6.32.39/se
  	key = ima_hash_key(entry->digest);
  	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
  	return 0;
-diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
---- linux-2.6.32.39/security/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/Kconfig	2011-04-17 15:56:46.000000000 -0400
-@@ -4,6 +4,532 @@
+diff -urNp linux-2.6.32.40/security/Kconfig linux-2.6.32.40/security/Kconfig
+--- linux-2.6.32.40/security/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/Kconfig	2011-05-04 17:56:20.000000000 -0400
+@@ -4,6 +4,548 @@
  
  menu "Security options"
  
@@ -60289,9 +67400,6 @@ diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
 +	  know about the non-standard use of the ELF header) therefore it
 +	  has been deprecated in favour of PT_PAX_FLAGS support.
 +
-+	  If your toolchain does not support PT_PAX_FLAGS markings,
-+	  you can create one in most cases with 'paxctl -C'.
-+
 +	  Note that if you enable PT_PAX_FLAGS marking support as well,
 +	  the PT_PAX_FLAG marks will override the legacy EI_PAX marks.
 +
@@ -60306,9 +67414,8 @@ diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
 +	  integrated into the toolchain (the binutils patch is available
 +	  from http://pax.grsecurity.net).
 +
-+	  If you have applications not marked by the PT_PAX_FLAGS ELF
-+	  program header then you MUST enable the EI_PAX marking support
-+	  otherwise they will not get any protection.
++	  If your toolchain does not support PT_PAX_FLAGS markings,
++	  you can create one in most cases with 'paxctl -C'.
 +
 +	  Note that if you enable the legacy EI_PAX marking support as well,
 +	  the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
@@ -60560,6 +67667,9 @@ diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
 +	  that is, enabling this option will make it harder to inject
 +	  and execute 'foreign' code in kernel memory itself.
 +
++	  Note that on x86_64 kernels there is a known regression when
++	  this feature and KVM/VMX are both enabled in the host kernel.
++
 +config PAX_KERNEXEC_MODULE_TEXT
 +	int "Minimum amount of memory reserved for module code"
 +	default "4"
@@ -60688,6 +67798,23 @@ diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
 +	  Note that this feature does not protect data stored in live pages,
 +	  e.g., process memory swapped to disk may stay there for a long time.
 +
++config PAX_MEMORY_STACKLEAK
++	bool "Sanitize kernel stack"
++	help
++	  By saying Y here the kernel will erase the kernel stack before it
++	  returns from a system call.  This in turn reduces the information
++	  that a kernel stack leak bug can reveal.
++
++	  Note that such a bug can still leak information that was put on
++	  the stack by the current system call (the one eventually triggering
++	  the bug) but traces of earlier system calls on the kernel stack
++	  cannot leak anymore.
++
++	  The tradeoff is performance impact, on a single CPU system kernel
++	  compilation sees a 1% slowdown, other systems and workloads may vary
++	  and you are advised to test this feature on your expected workload
++	  before deploying it.
++
 +config PAX_MEMORY_UDEREF
 +	bool "Prevent invalid userland pointer dereference"
 +	depends on X86 && !UML_X86 && !XEN
@@ -60763,7 +67890,7 @@ diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
  config KEYS
  	bool "Enable access key retention support"
  	help
-@@ -146,7 +672,7 @@ config INTEL_TXT
+@@ -146,7 +688,7 @@ config INTEL_TXT
  config LSM_MMAP_MIN_ADDR
  	int "Low address space for LSM to protect from user allocation"
  	depends on SECURITY && SECURITY_SELINUX
@@ -60772,9 +67899,9 @@ diff -urNp linux-2.6.32.39/security/Kconfig linux-2.6.32.39/security/Kconfig
  	help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.32.39/security/keys/keyring.c linux-2.6.32.39/security/keys/keyring.c
---- linux-2.6.32.39/security/keys/keyring.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/keys/keyring.c	2011-04-18 22:03:00.000000000 -0400
+diff -urNp linux-2.6.32.40/security/keys/keyring.c linux-2.6.32.40/security/keys/keyring.c
+--- linux-2.6.32.40/security/keys/keyring.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/keys/keyring.c	2011-04-18 22:03:00.000000000 -0400
 @@ -214,15 +214,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
@@ -60794,9 +67921,9 @@ diff -urNp linux-2.6.32.39/security/keys/keyring.c linux-2.6.32.39/security/keys
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-2.6.32.39/security/min_addr.c linux-2.6.32.39/security/min_addr.c
---- linux-2.6.32.39/security/min_addr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/min_addr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/min_addr.c linux-2.6.32.40/security/min_addr.c
+--- linux-2.6.32.40/security/min_addr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/min_addr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -60813,9 +67940,9 @@ diff -urNp linux-2.6.32.39/security/min_addr.c linux-2.6.32.39/security/min_addr
  }
  
  /*
-diff -urNp linux-2.6.32.39/security/root_plug.c linux-2.6.32.39/security/root_plug.c
---- linux-2.6.32.39/security/root_plug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/root_plug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/root_plug.c linux-2.6.32.40/security/root_plug.c
+--- linux-2.6.32.40/security/root_plug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/root_plug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security 
  	return 0;
  }
@@ -60825,9 +67952,9 @@ diff -urNp linux-2.6.32.39/security/root_plug.c linux-2.6.32.39/security/root_pl
  	.bprm_check_security =		rootplug_bprm_check_security,
  };
  
-diff -urNp linux-2.6.32.39/security/security.c linux-2.6.32.39/security/security.c
---- linux-2.6.32.39/security/security.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/security.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/security.c linux-2.6.32.40/security/security.c
+--- linux-2.6.32.40/security/security.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/security.c	2011-04-17 15:56:46.000000000 -0400
 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
  extern struct security_operations default_security_ops;
  extern void security_fixup_ops(struct security_operations *ops);
@@ -60846,9 +67973,9 @@ diff -urNp linux-2.6.32.39/security/security.c linux-2.6.32.39/security/security
  {
  	if (verify(ops)) {
  		printk(KERN_DEBUG "%s could not verify "
-diff -urNp linux-2.6.32.39/security/selinux/hooks.c linux-2.6.32.39/security/selinux/hooks.c
---- linux-2.6.32.39/security/selinux/hooks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/selinux/hooks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/selinux/hooks.c linux-2.6.32.40/security/selinux/hooks.c
+--- linux-2.6.32.40/security/selinux/hooks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/selinux/hooks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -131,7 +131,7 @@ int selinux_enabled = 1;
   * Minimal support for a secondary security module,
   * just to allow the use of the capability module.
@@ -60877,9 +68004,9 @@ diff -urNp linux-2.6.32.39/security/selinux/hooks.c linux-2.6.32.39/security/sel
  
  	/* Unregister netfilter hooks. */
  	selinux_nf_ip_exit();
-diff -urNp linux-2.6.32.39/security/smack/smack_lsm.c linux-2.6.32.39/security/smack/smack_lsm.c
---- linux-2.6.32.39/security/smack/smack_lsm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/smack/smack_lsm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/smack/smack_lsm.c linux-2.6.32.40/security/smack/smack_lsm.c
+--- linux-2.6.32.40/security/smack/smack_lsm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/smack/smack_lsm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
@@ -60889,9 +68016,9 @@ diff -urNp linux-2.6.32.39/security/smack/smack_lsm.c linux-2.6.32.39/security/s
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-2.6.32.39/security/tomoyo/tomoyo.c linux-2.6.32.39/security/tomoyo/tomoyo.c
---- linux-2.6.32.39/security/tomoyo/tomoyo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/security/tomoyo/tomoyo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/security/tomoyo/tomoyo.c linux-2.6.32.40/security/tomoyo/tomoyo.c
+--- linux-2.6.32.40/security/tomoyo/tomoyo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/security/tomoyo/tomoyo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
@@ -60901,9 +68028,9 @@ diff -urNp linux-2.6.32.39/security/tomoyo/tomoyo.c linux-2.6.32.39/security/tom
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.c linux-2.6.32.39/sound/aoa/codecs/onyx.c
---- linux-2.6.32.39/sound/aoa/codecs/onyx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/aoa/codecs/onyx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/aoa/codecs/onyx.c linux-2.6.32.40/sound/aoa/codecs/onyx.c
+--- linux-2.6.32.40/sound/aoa/codecs/onyx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/aoa/codecs/onyx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -53,7 +53,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -60932,9 +68059,9 @@ diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.c linux-2.6.32.39/sound/aoa/cod
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.h linux-2.6.32.39/sound/aoa/codecs/onyx.h
---- linux-2.6.32.39/sound/aoa/codecs/onyx.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/aoa/codecs/onyx.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/aoa/codecs/onyx.h linux-2.6.32.40/sound/aoa/codecs/onyx.h
+--- linux-2.6.32.40/sound/aoa/codecs/onyx.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/aoa/codecs/onyx.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -60943,9 +68070,9 @@ diff -urNp linux-2.6.32.39/sound/aoa/codecs/onyx.h linux-2.6.32.39/sound/aoa/cod
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-2.6.32.39/sound/drivers/mts64.c linux-2.6.32.39/sound/drivers/mts64.c
---- linux-2.6.32.39/sound/drivers/mts64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/drivers/mts64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/drivers/mts64.c linux-2.6.32.40/sound/drivers/mts64.c
+--- linux-2.6.32.40/sound/drivers/mts64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/drivers/mts64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -61002,9 +68129,9 @@ diff -urNp linux-2.6.32.39/sound/drivers/mts64.c linux-2.6.32.39/sound/drivers/m
  
  	return 0;
  }
-diff -urNp linux-2.6.32.39/sound/drivers/portman2x4.c linux-2.6.32.39/sound/drivers/portman2x4.c
---- linux-2.6.32.39/sound/drivers/portman2x4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/drivers/portman2x4.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/drivers/portman2x4.c linux-2.6.32.40/sound/drivers/portman2x4.c
+--- linux-2.6.32.40/sound/drivers/portman2x4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/drivers/portman2x4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -46,6 +46,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -61022,9 +68149,9 @@ diff -urNp linux-2.6.32.39/sound/drivers/portman2x4.c linux-2.6.32.39/sound/driv
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-2.6.32.39/sound/oss/sb_audio.c linux-2.6.32.39/sound/oss/sb_audio.c
---- linux-2.6.32.39/sound/oss/sb_audio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/oss/sb_audio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/oss/sb_audio.c linux-2.6.32.40/sound/oss/sb_audio.c
+--- linux-2.6.32.40/sound/oss/sb_audio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/oss/sb_audio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -61034,9 +68161,9 @@ diff -urNp linux-2.6.32.39/sound/oss/sb_audio.c linux-2.6.32.39/sound/oss/sb_aud
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-2.6.32.39/sound/oss/swarm_cs4297a.c linux-2.6.32.39/sound/oss/swarm_cs4297a.c
---- linux-2.6.32.39/sound/oss/swarm_cs4297a.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/oss/swarm_cs4297a.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/oss/swarm_cs4297a.c linux-2.6.32.40/sound/oss/swarm_cs4297a.c
+--- linux-2.6.32.40/sound/oss/swarm_cs4297a.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/oss/swarm_cs4297a.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -61071,9 +68198,9 @@ diff -urNp linux-2.6.32.39/sound/oss/swarm_cs4297a.c linux-2.6.32.39/sound/oss/s
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_codec.c linux-2.6.32.39/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.39/sound/pci/ac97/ac97_codec.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/pci/ac97/ac97_codec.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/pci/ac97/ac97_codec.c linux-2.6.32.40/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.32.40/sound/pci/ac97/ac97_codec.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/pci/ac97/ac97_codec.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
  }
  
@@ -61083,9 +68210,9 @@ diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_codec.c linux-2.6.32.39/sound/pci
  
  #ifdef CONFIG_SND_AC97_POWER_SAVE
  static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_patch.c linux-2.6.32.39/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.39/sound/pci/ac97/ac97_patch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/pci/ac97/ac97_patch.c	2011-04-23 12:56:12.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/pci/ac97/ac97_patch.c linux-2.6.32.40/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.32.40/sound/pci/ac97/ac97_patch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/pci/ac97/ac97_patch.c	2011-04-23 12:56:12.000000000 -0400
 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
  	return 0;
  }
@@ -61374,9 +68501,9 @@ diff -urNp linux-2.6.32.39/sound/pci/ac97/ac97_patch.c linux-2.6.32.39/sound/pci
  	.build_specific	= patch_ucb1400_specific,
  };
  
-diff -urNp linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c
---- linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.40/sound/pci/hda/patch_intelhdmi.c
+--- linux-2.6.32.40/sound/pci/hda/patch_intelhdmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/pci/hda/patch_intelhdmi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
  		cp_ready);
  
@@ -61392,9 +68519,9 @@ diff -urNp linux-2.6.32.39/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.39/sound
  }
  
  
-diff -urNp linux-2.6.32.39/sound/pci/intel8x0m.c linux-2.6.32.39/sound/pci/intel8x0m.c
---- linux-2.6.32.39/sound/pci/intel8x0m.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/sound/pci/intel8x0m.c	2011-04-23 12:56:12.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/pci/intel8x0m.c linux-2.6.32.40/sound/pci/intel8x0m.c
+--- linux-2.6.32.40/sound/pci/intel8x0m.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/pci/intel8x0m.c	2011-04-23 12:56:12.000000000 -0400
 @@ -1264,7 +1264,7 @@ static struct shortname_table {
  	{ 0x5455, "ALi M5455" },
  	{ 0x746d, "AMD AMD8111" },
@@ -61404,9 +68531,52 @@ diff -urNp linux-2.6.32.39/sound/pci/intel8x0m.c linux-2.6.32.39/sound/pci/intel
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.32.39/usr/gen_init_cpio.c linux-2.6.32.39/usr/gen_init_cpio.c
---- linux-2.6.32.39/usr/gen_init_cpio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/usr/gen_init_cpio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.40/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.40/sound/pci/ymfpci/ymfpci_main.c
+--- linux-2.6.32.40/sound/pci/ymfpci/ymfpci_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/sound/pci/ymfpci/ymfpci_main.c	2011-05-04 17:56:28.000000000 -0400
+@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
+ 		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
+ 			break;
+ 	}
+-	if (atomic_read(&chip->interrupt_sleep_count)) {
+-		atomic_set(&chip->interrupt_sleep_count, 0);
++	if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
++		atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
+ 		wake_up(&chip->interrupt_sleep);
+ 	}
+       __end:
+@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct s
+ 		 	continue;
+ 		init_waitqueue_entry(&wait, current);
+ 		add_wait_queue(&chip->interrupt_sleep, &wait);
+-		atomic_inc(&chip->interrupt_sleep_count);
++		atomic_inc_unchecked(&chip->interrupt_sleep_count);
+ 		schedule_timeout_uninterruptible(msecs_to_jiffies(50));
+ 		remove_wait_queue(&chip->interrupt_sleep, &wait);
+ 	}
+@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(
+ 		snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
+ 		spin_unlock(&chip->reg_lock);
+ 
+-		if (atomic_read(&chip->interrupt_sleep_count)) {
+-			atomic_set(&chip->interrupt_sleep_count, 0);
++		if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
++			atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
+ 			wake_up(&chip->interrupt_sleep);
+ 		}
+ 	}
+@@ -2369,7 +2369,7 @@ int __devinit snd_ymfpci_create(struct s
+ 	spin_lock_init(&chip->reg_lock);
+ 	spin_lock_init(&chip->voice_lock);
+ 	init_waitqueue_head(&chip->interrupt_sleep);
+-	atomic_set(&chip->interrupt_sleep_count, 0);
++	atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
+ 	chip->card = card;
+ 	chip->pci = pci;
+ 	chip->irq = -1;
+diff -urNp linux-2.6.32.40/usr/gen_init_cpio.c linux-2.6.32.40/usr/gen_init_cpio.c
+--- linux-2.6.32.40/usr/gen_init_cpio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/usr/gen_init_cpio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
@@ -61429,9 +68599,9 @@ diff -urNp linux-2.6.32.39/usr/gen_init_cpio.c linux-2.6.32.39/usr/gen_init_cpio
                 } else
                         break;
         }
-diff -urNp linux-2.6.32.39/virt/kvm/kvm_main.c linux-2.6.32.39/virt/kvm/kvm_main.c
---- linux-2.6.32.39/virt/kvm/kvm_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.39/virt/kvm/kvm_main.c	2011-04-23 21:41:37.000000000 -0400
+diff -urNp linux-2.6.32.40/virt/kvm/kvm_main.c linux-2.6.32.40/virt/kvm/kvm_main.c
+--- linux-2.6.32.40/virt/kvm/kvm_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.40/virt/kvm/kvm_main.c	2011-04-23 21:41:37.000000000 -0400
 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
  	return 0;
  }
diff --git a/2.6.32/4435_grsec-kconfig-gentoo.patch b/2.6.32/4435_grsec-kconfig-gentoo.patch
index 910c884..6d61fd0 100644
--- a/2.6.32/4435_grsec-kconfig-gentoo.patch
+++ b/2.6.32/4435_grsec-kconfig-gentoo.patch
@@ -292,7 +292,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/grsecurity/Kconfig linux-2.6.32-harden
 diff -Naur linux-2.6.32-hardened-r44.orig/security/Kconfig linux-2.6.32-hardened-r44/security/Kconfig
 --- linux-2.6.32-hardened-r44.orig/security/Kconfig	2011-04-17 18:36:55.000000000 -0400
 +++ linux-2.6.32-hardened-r44/security/Kconfig	2011-04-17 18:42:14.000000000 -0400
-@@ -323,8 +323,9 @@
+@@ -319,8 +319,9 @@
  
  config PAX_KERNEXEC
  	bool "Enforce non-executable kernel pages"
@@ -303,7 +303,7 @@ diff -Naur linux-2.6.32-hardened-r44.orig/security/Kconfig linux-2.6.32-hardened
  	help
  	  This is the kernel land equivalent of PAGEEXEC and MPROTECT,
  	  that is, enabling this option will make it harder to inject
-@@ -460,8 +461,9 @@
+@@ -476,8 +477,9 @@
  
  config PAX_MEMORY_UDEREF
  	bool "Prevent invalid userland pointer dereference"
diff --git a/2.6.38/0000_README b/2.6.38/0000_README
index 50d44ee..fb776db 100644
--- a/2.6.38/0000_README
+++ b/2.6.38/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-2.6.38.4-201105021909.patch
+Patch:	4420_grsecurity-2.2.2-2.6.38.6-201105111839.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201105021909.patch b/2.6.38/4420_grsecurity-2.2.2-2.6.38.6-201105111839.patch
index 9a71df1..20cbc55 100644
--- a/2.6.38/4420_grsecurity-2.2.2-2.6.38.4-201105021909.patch
+++ b/2.6.38/4420_grsecurity-2.2.2-2.6.38.6-201105111839.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.6/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/alpha/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -3,9 +3,9 @@
  
  #include <linux/dma-attrs.h>
@@ -13,9 +13,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/include/asm/dma-mapping.h linux-2.6.38.4/ar
  {
  	return dma_ops;
  }
-diff -urNp linux-2.6.38.4/arch/alpha/include/asm/elf.h linux-2.6.38.4/arch/alpha/include/asm/elf.h
---- linux-2.6.38.4/arch/alpha/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/include/asm/elf.h linux-2.6.38.6/arch/alpha/include/asm/elf.h
+--- linux-2.6.38.6/arch/alpha/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -30,9 +30,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/include/asm/elf.h linux-2.6.38.4/arch/alpha
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.38.4/arch/alpha/include/asm/pgtable.h linux-2.6.38.4/arch/alpha/include/asm/pgtable.h
---- linux-2.6.38.4/arch/alpha/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/include/asm/pgtable.h linux-2.6.38.6/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.38.6/arch/alpha/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -51,9 +51,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/include/asm/pgtable.h linux-2.6.38.4/arch/a
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/module.c linux-2.6.38.4/arch/alpha/kernel/module.c
---- linux-2.6.38.4/arch/alpha/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/kernel/module.c linux-2.6.38.6/arch/alpha/kernel/module.c
+--- linux-2.6.38.6/arch/alpha/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -63,9 +63,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/kernel/module.c linux-2.6.38.4/arch/alpha/k
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/osf_sys.c linux-2.6.38.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.38.4/arch/alpha/kernel/osf_sys.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/osf_sys.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/kernel/osf_sys.c linux-2.6.38.6/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.38.6/arch/alpha/kernel/osf_sys.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/kernel/osf_sys.c	2011-04-28 19:34:14.000000000 -0400
 @@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
@@ -97,9 +97,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/kernel/osf_sys.c linux-2.6.38.4/arch/alpha/
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/kernel/pci_iommu.c linux-2.6.38.6/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.38.6/arch/alpha/kernel/pci_iommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/kernel/pci_iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
  	return 0;
  }
@@ -116,9 +116,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci_iommu.c linux-2.6.38.4/arch/alph
 -struct dma_map_ops *dma_ops = &alpha_pci_ops;
 +const struct dma_map_ops *dma_ops = &alpha_pci_ops;
  EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci-noop.c linux-2.6.38.4/arch/alpha/kernel/pci-noop.c
---- linux-2.6.38.4/arch/alpha/kernel/pci-noop.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/kernel/pci-noop.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/kernel/pci-noop.c linux-2.6.38.6/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.38.6/arch/alpha/kernel/pci-noop.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/kernel/pci-noop.c	2011-04-28 19:34:14.000000000 -0400
 @@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
  	return 0;
  }
@@ -137,9 +137,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/kernel/pci-noop.c linux-2.6.38.4/arch/alpha
  EXPORT_SYMBOL(dma_ops);
  
  void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.38.4/arch/alpha/mm/fault.c linux-2.6.38.4/arch/alpha/mm/fault.c
---- linux-2.6.38.4/arch/alpha/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/alpha/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/alpha/mm/fault.c linux-2.6.38.6/arch/alpha/mm/fault.c
+--- linux-2.6.38.6/arch/alpha/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/alpha/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -296,9 +296,9 @@ diff -urNp linux-2.6.38.4/arch/alpha/mm/fault.c linux-2.6.38.4/arch/alpha/mm/fau
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.38.4/arch/arm/include/asm/elf.h linux-2.6.38.4/arch/arm/include/asm/elf.h
---- linux-2.6.38.4/arch/arm/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/include/asm/elf.h linux-2.6.38.6/arch/arm/include/asm/elf.h
+--- linux-2.6.38.6/arch/arm/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -326,9 +326,9 @@ diff -urNp linux-2.6.38.4/arch/arm/include/asm/elf.h linux-2.6.38.4/arch/arm/inc
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-2.6.38.4/arch/arm/include/asm/kmap_types.h linux-2.6.38.4/arch/arm/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/arm/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/include/asm/kmap_types.h linux-2.6.38.6/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.38.6/arch/arm/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -337,9 +337,9 @@ diff -urNp linux-2.6.38.4/arch/arm/include/asm/kmap_types.h linux-2.6.38.4/arch/
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.38.4/arch/arm/include/asm/uaccess.h linux-2.6.38.4/arch/arm/include/asm/uaccess.h
---- linux-2.6.38.4/arch/arm/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/include/asm/uaccess.h linux-2.6.38.6/arch/arm/include/asm/uaccess.h
+--- linux-2.6.38.6/arch/arm/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -360,9 +360,9 @@ diff -urNp linux-2.6.38.4/arch/arm/include/asm/uaccess.h linux-2.6.38.4/arch/arm
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.38.4/arch/arm/kernel/kgdb.c linux-2.6.38.4/arch/arm/kernel/kgdb.c
---- linux-2.6.38.4/arch/arm/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/kernel/kgdb.c linux-2.6.38.6/arch/arm/kernel/kgdb.c
+--- linux-2.6.38.6/arch/arm/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
@@ -372,9 +372,9 @@ diff -urNp linux-2.6.38.4/arch/arm/kernel/kgdb.c linux-2.6.38.4/arch/arm/kernel/
  #ifndef __ARMEB__
  	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.38.4/arch/arm/kernel/process.c linux-2.6.38.4/arch/arm/kernel/process.c
---- linux-2.6.38.4/arch/arm/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/kernel/process.c linux-2.6.38.6/arch/arm/kernel/process.c
+--- linux-2.6.38.6/arch/arm/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
@@ -396,9 +396,9 @@ diff -urNp linux-2.6.38.4/arch/arm/kernel/process.c linux-2.6.38.4/arch/arm/kern
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.6/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.38.6/arch/arm/mach-msm/last_radio_log.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/mach-msm/last_radio_log.c	2011-04-28 19:34:14.000000000 -0400
 @@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struc
  	return count;
  }
@@ -408,9 +408,9 @@ diff -urNp linux-2.6.38.4/arch/arm/mach-msm/last_radio_log.c linux-2.6.38.4/arch
  	.read = last_radio_log_read,
  	.llseek = default_llseek,
  };
-diff -urNp linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c
---- linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.6/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-2.6.38.6/arch/arm/mach-ux500/mbox-db5500.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/mach-ux500/mbox-db5500.c	2011-04-28 19:34:14.000000000 -0400
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -420,9 +420,9 @@ diff -urNp linux-2.6.38.4/arch/arm/mach-ux500/mbox-db5500.c linux-2.6.38.4/arch/
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-2.6.38.4/arch/arm/mm/fault.c linux-2.6.38.4/arch/arm/mm/fault.c
---- linux-2.6.38.4/arch/arm/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/mm/fault.c linux-2.6.38.6/arch/arm/mm/fault.c
+--- linux-2.6.38.6/arch/arm/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -471,9 +471,9 @@ diff -urNp linux-2.6.38.4/arch/arm/mm/fault.c linux-2.6.38.4/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.38.4/arch/arm/mm/mmap.c linux-2.6.38.4/arch/arm/mm/mmap.c
---- linux-2.6.38.4/arch/arm/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/arm/mm/mmap.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/arm/mm/mmap.c linux-2.6.38.6/arch/arm/mm/mmap.c
+--- linux-2.6.38.6/arch/arm/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/arm/mm/mmap.c	2011-04-28 19:34:14.000000000 -0400
 @@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -523,9 +523,9 @@ diff -urNp linux-2.6.38.4/arch/arm/mm/mmap.c linux-2.6.38.4/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-2.6.38.4/arch/avr32/include/asm/elf.h linux-2.6.38.4/arch/avr32/include/asm/elf.h
---- linux-2.6.38.4/arch/avr32/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/avr32/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/avr32/include/asm/elf.h linux-2.6.38.6/arch/avr32/include/asm/elf.h
+--- linux-2.6.38.6/arch/avr32/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/avr32/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -542,9 +542,9 @@ diff -urNp linux-2.6.38.4/arch/avr32/include/asm/elf.h linux-2.6.38.4/arch/avr32
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/avr32/include/asm/kmap_types.h linux-2.6.38.6/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.38.6/arch/avr32/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/avr32/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -555,9 +555,9 @@ diff -urNp linux-2.6.38.4/arch/avr32/include/asm/kmap_types.h linux-2.6.38.4/arc
  };
  
  #undef D
-diff -urNp linux-2.6.38.4/arch/avr32/mm/fault.c linux-2.6.38.4/arch/avr32/mm/fault.c
---- linux-2.6.38.4/arch/avr32/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/avr32/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/avr32/mm/fault.c linux-2.6.38.6/arch/avr32/mm/fault.c
+--- linux-2.6.38.6/arch/avr32/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/avr32/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -599,9 +599,9 @@ diff -urNp linux-2.6.38.4/arch/avr32/mm/fault.c linux-2.6.38.4/arch/avr32/mm/fau
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.38.4/arch/blackfin/kernel/kgdb.c linux-2.6.38.4/arch/blackfin/kernel/kgdb.c
---- linux-2.6.38.4/arch/blackfin/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/blackfin/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/blackfin/kernel/kgdb.c linux-2.6.38.6/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.38.6/arch/blackfin/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/blackfin/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;		/* this means that we do not want to exit from the handler */
  }
@@ -611,9 +611,9 @@ diff -urNp linux-2.6.38.4/arch/blackfin/kernel/kgdb.c linux-2.6.38.4/arch/blackf
  	.gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
  	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.38.4/arch/blackfin/mm/maccess.c linux-2.6.38.4/arch/blackfin/mm/maccess.c
---- linux-2.6.38.4/arch/blackfin/mm/maccess.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/blackfin/mm/maccess.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/blackfin/mm/maccess.c linux-2.6.38.6/arch/blackfin/mm/maccess.c
+--- linux-2.6.38.6/arch/blackfin/mm/maccess.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/blackfin/mm/maccess.c	2011-04-28 19:34:14.000000000 -0400
 @@ -16,7 +16,7 @@ static int validate_memory_access_addres
  	return bfin_mem_access_type(addr, size);
  }
@@ -632,9 +632,9 @@ diff -urNp linux-2.6.38.4/arch/blackfin/mm/maccess.c linux-2.6.38.4/arch/blackfi
  {
  	unsigned long ldst = (unsigned long)dst;
  	int mem_type;
-diff -urNp linux-2.6.38.4/arch/frv/include/asm/kmap_types.h linux-2.6.38.4/arch/frv/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/frv/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/frv/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/frv/include/asm/kmap_types.h linux-2.6.38.6/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.38.6/arch/frv/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/frv/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -643,9 +643,9 @@ diff -urNp linux-2.6.38.4/arch/frv/include/asm/kmap_types.h linux-2.6.38.4/arch/
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.38.4/arch/frv/mm/elf-fdpic.c linux-2.6.38.4/arch/frv/mm/elf-fdpic.c
---- linux-2.6.38.4/arch/frv/mm/elf-fdpic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/frv/mm/elf-fdpic.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/frv/mm/elf-fdpic.c linux-2.6.38.6/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.38.6/arch/frv/mm/elf-fdpic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/frv/mm/elf-fdpic.c	2011-04-28 19:34:14.000000000 -0400
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -674,9 +674,9 @@ diff -urNp linux-2.6.38.4/arch/frv/mm/elf-fdpic.c linux-2.6.38.4/arch/frv/mm/elf
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.6/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.38.6/arch/ia64/hp/common/hwsw_iommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/hp/common/hwsw_iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -695,9 +695,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.38.4/arch/i
  {
  	if (use_swiotlb(dev))
  		return &swiotlb_dma_ops;
-diff -urNp linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.6/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.38.6/arch/ia64/hp/common/sba_iommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/hp/common/sba_iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
  	},
  };
@@ -716,9 +716,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/hp/common/sba_iommu.c linux-2.6.38.4/arch/ia
  	.alloc_coherent		= sba_alloc_coherent,
  	.free_coherent		= sba_free_coherent,
  	.map_page		= sba_map_page,
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.6/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/ia64/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -762,9 +762,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/include/asm/dma-mapping.h linux-2.6.38.4/arc
  	return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/elf.h linux-2.6.38.4/arch/ia64/include/asm/elf.h
---- linux-2.6.38.4/arch/ia64/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/include/asm/elf.h linux-2.6.38.6/arch/ia64/include/asm/elf.h
+--- linux-2.6.38.6/arch/ia64/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -779,9 +779,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/include/asm/elf.h linux-2.6.38.4/arch/ia64/i
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/machvec.h linux-2.6.38.4/arch/ia64/include/asm/machvec.h
---- linux-2.6.38.4/arch/ia64/include/asm/machvec.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/machvec.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/include/asm/machvec.h linux-2.6.38.6/arch/ia64/include/asm/machvec.h
+--- linux-2.6.38.6/arch/ia64/include/asm/machvec.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/include/asm/machvec.h	2011-04-28 19:34:14.000000000 -0400
 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
@@ -800,9 +800,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/include/asm/machvec.h linux-2.6.38.4/arch/ia
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/pgtable.h linux-2.6.38.4/arch/ia64/include/asm/pgtable.h
---- linux-2.6.38.4/arch/ia64/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/include/asm/pgtable.h linux-2.6.38.6/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.38.6/arch/ia64/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -830,9 +830,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/include/asm/pgtable.h linux-2.6.38.4/arch/ia
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/spinlock.h linux-2.6.38.4/arch/ia64/include/asm/spinlock.h
---- linux-2.6.38.4/arch/ia64/include/asm/spinlock.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/spinlock.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/include/asm/spinlock.h linux-2.6.38.6/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.38.6/arch/ia64/include/asm/spinlock.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/include/asm/spinlock.h	2011-04-28 19:34:14.000000000 -0400
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -842,9 +842,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/include/asm/spinlock.h linux-2.6.38.4/arch/i
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-2.6.38.4/arch/ia64/include/asm/uaccess.h linux-2.6.38.4/arch/ia64/include/asm/uaccess.h
---- linux-2.6.38.4/arch/ia64/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/include/asm/uaccess.h linux-2.6.38.6/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.38.6/arch/ia64/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/include/asm/uaccess.h linux-2.6.38.4/arch/ia
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/kernel/dma-mapping.c linux-2.6.38.6/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.38.6/arch/ia64/kernel/dma-mapping.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/kernel/dma-mapping.c	2011-04-28 19:34:14.000000000 -0400
 @@ -3,7 +3,7 @@
  /* Set this to 1 if there is a HW IOMMU in the system */
  int iommu_detected __read_mostly;
@@ -884,9 +884,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/kernel/dma-mapping.c linux-2.6.38.4/arch/ia6
  {
  	return dma_ops;
  }
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/module.c linux-2.6.38.4/arch/ia64/kernel/module.c
---- linux-2.6.38.4/arch/ia64/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/kernel/module.c linux-2.6.38.6/arch/ia64/kernel/module.c
+--- linux-2.6.38.6/arch/ia64/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -975,9 +975,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/kernel/module.c linux-2.6.38.4/arch/ia64/ker
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-dma.c linux-2.6.38.4/arch/ia64/kernel/pci-dma.c
---- linux-2.6.38.4/arch/ia64/kernel/pci-dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/pci-dma.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/kernel/pci-dma.c linux-2.6.38.6/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.38.6/arch/ia64/kernel/pci-dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/kernel/pci-dma.c	2011-04-28 19:34:14.000000000 -0400
 @@ -43,7 +43,7 @@ struct device fallback_dev = {
  	.dma_mask = &fallback_dev.coherent_dma_mask,
  };
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-dma.c linux-2.6.38.4/arch/ia64/ke
  
  static int __init pci_iommu_init(void)
  {
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.6/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.38.6/arch/ia64/kernel/pci-swiotlb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/kernel/pci-swiotlb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
  	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
  }
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/kernel/pci-swiotlb.c linux-2.6.38.4/arch/ia6
  	.alloc_coherent = ia64_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
  	.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/kernel/sys_ia64.c linux-2.6.38.6/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.38.6/arch/ia64/kernel/sys_ia64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/kernel/sys_ia64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -1034,9 +1034,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/kernel/sys_ia64.c linux-2.6.38.4/arch/ia64/k
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.6/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.38.6/arch/ia64/kernel/vmlinux.lds.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/kernel/vmlinux.lds.S	2011-04-28 19:34:14.000000000 -0400
 @@ -199,7 +199,7 @@ SECTIONS {
  	/* Per-cpu data: */
  	. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1046,9 +1046,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.38.4/arch/ia6
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff -urNp linux-2.6.38.4/arch/ia64/mm/fault.c linux-2.6.38.4/arch/ia64/mm/fault.c
---- linux-2.6.38.4/arch/ia64/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/mm/fault.c linux-2.6.38.6/arch/ia64/mm/fault.c
+--- linux-2.6.38.6/arch/ia64/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/mm/fault.c linux-2.6.38.4/arch/ia64/mm/fault
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
  	 * sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/mm/hugetlbpage.c linux-2.6.38.6/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.38.6/arch/ia64/mm/hugetlbpage.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/mm/hugetlbpage.c	2011-04-28 19:34:14.000000000 -0400
 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
  		/* At this point:  (!vmm || addr < vmm->vm_end). */
  		if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1110,9 +1110,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/mm/hugetlbpage.c linux-2.6.38.4/arch/ia64/mm
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-2.6.38.4/arch/ia64/mm/init.c linux-2.6.38.4/arch/ia64/mm/init.c
---- linux-2.6.38.4/arch/ia64/mm/init.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/mm/init.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/mm/init.c linux-2.6.38.6/arch/ia64/mm/init.c
+--- linux-2.6.38.6/arch/ia64/mm/init.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/mm/init.c	2011-04-28 19:34:14.000000000 -0400
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/mm/init.c linux-2.6.38.4/arch/ia64/mm/init.c
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.6/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.38.6/arch/ia64/sn/pci/pci_dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/ia64/sn/pci/pci_dma.c	2011-04-28 19:34:14.000000000 -0400
 @@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
  	return ret;
  }
@@ -1145,9 +1145,9 @@ diff -urNp linux-2.6.38.4/arch/ia64/sn/pci/pci_dma.c linux-2.6.38.4/arch/ia64/sn
  	.alloc_coherent		= sn_dma_alloc_coherent,
  	.free_coherent		= sn_dma_free_coherent,
  	.map_page		= sn_dma_map_page,
-diff -urNp linux-2.6.38.4/arch/m32r/lib/usercopy.c linux-2.6.38.4/arch/m32r/lib/usercopy.c
---- linux-2.6.38.4/arch/m32r/lib/usercopy.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/m32r/lib/usercopy.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/m32r/lib/usercopy.c linux-2.6.38.6/arch/m32r/lib/usercopy.c
+--- linux-2.6.38.6/arch/m32r/lib/usercopy.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/m32r/lib/usercopy.c	2011-04-28 19:34:14.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1168,9 +1168,9 @@ diff -urNp linux-2.6.38.4/arch/m32r/lib/usercopy.c linux-2.6.38.4/arch/m32r/lib/
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/device.h linux-2.6.38.4/arch/microblaze/include/asm/device.h
---- linux-2.6.38.4/arch/microblaze/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/microblaze/include/asm/device.h linux-2.6.38.6/arch/microblaze/include/asm/device.h
+--- linux-2.6.38.6/arch/microblaze/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/microblaze/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
 @@ -13,7 +13,7 @@ struct device_node;
  
  struct dev_archdata {
@@ -1180,9 +1180,9 @@ diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/device.h linux-2.6.38.4/ar
  	void                    *dma_data;
  };
  
-diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38.6/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/microblaze/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/microblaze/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
  	return 0xfffffffful;
  }
@@ -1254,9 +1254,9 @@ diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/dma-mapping.h linux-2.6.38
  
  	BUG_ON(!ops);
  	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/pci.h linux-2.6.38.4/arch/microblaze/include/asm/pci.h
---- linux-2.6.38.4/arch/microblaze/include/asm/pci.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/include/asm/pci.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/microblaze/include/asm/pci.h linux-2.6.38.6/arch/microblaze/include/asm/pci.h
+--- linux-2.6.38.6/arch/microblaze/include/asm/pci.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/microblaze/include/asm/pci.h	2011-04-28 19:34:14.000000000 -0400
 @@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
  }
  
@@ -1268,9 +1268,9 @@ diff -urNp linux-2.6.38.4/arch/microblaze/include/asm/pci.h linux-2.6.38.4/arch/
  #else	/* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.38.4/arch/microblaze/kernel/dma.c linux-2.6.38.4/arch/microblaze/kernel/dma.c
---- linux-2.6.38.4/arch/microblaze/kernel/dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/kernel/dma.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/microblaze/kernel/dma.c linux-2.6.38.6/arch/microblaze/kernel/dma.c
+--- linux-2.6.38.6/arch/microblaze/kernel/dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/microblaze/kernel/dma.c	2011-04-28 19:34:14.000000000 -0400
 @@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
  	__dma_sync_page(dma_address, 0 , size, direction);
  }
@@ -1280,9 +1280,9 @@ diff -urNp linux-2.6.38.4/arch/microblaze/kernel/dma.c linux-2.6.38.4/arch/micro
  	.alloc_coherent	= dma_direct_alloc_coherent,
  	.free_coherent	= dma_direct_free_coherent,
  	.map_sg		= dma_direct_map_sg,
-diff -urNp linux-2.6.38.4/arch/microblaze/kernel/kgdb.c linux-2.6.38.4/arch/microblaze/kernel/kgdb.c
---- linux-2.6.38.4/arch/microblaze/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/microblaze/kernel/kgdb.c linux-2.6.38.6/arch/microblaze/kernel/kgdb.c
+--- linux-2.6.38.6/arch/microblaze/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/microblaze/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
  /*
   * Global data
@@ -1296,9 +1296,9 @@ diff -urNp linux-2.6.38.4/arch/microblaze/kernel/kgdb.c linux-2.6.38.4/arch/micr
  	.gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
  #endif
  };
-diff -urNp linux-2.6.38.4/arch/microblaze/pci/pci-common.c linux-2.6.38.4/arch/microblaze/pci/pci-common.c
---- linux-2.6.38.4/arch/microblaze/pci/pci-common.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/microblaze/pci/pci-common.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/microblaze/pci/pci-common.c linux-2.6.38.6/arch/microblaze/pci/pci-common.c
+--- linux-2.6.38.6/arch/microblaze/pci/pci-common.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/microblaze/pci/pci-common.c	2011-04-28 19:34:14.000000000 -0400
 @@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
  /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
  unsigned int pci_flags;
@@ -1317,9 +1317,9 @@ diff -urNp linux-2.6.38.4/arch/microblaze/pci/pci-common.c linux-2.6.38.4/arch/m
  {
  	return pci_dma_ops;
  }
-diff -urNp linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c
---- linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.6/arch/mips/cavium-octeon/dma-octeon.c
+--- linux-2.6.38.6/arch/mips/cavium-octeon/dma-octeon.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/cavium-octeon/dma-octeon.c	2011-04-28 19:34:14.000000000 -0400
 @@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_p
  }
  
@@ -1338,9 +1338,9 @@ diff -urNp linux-2.6.38.4/arch/mips/cavium-octeon/dma-octeon.c linux-2.6.38.4/ar
  
  void __init octeon_pci_dma_init(void)
  {
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/device.h linux-2.6.38.4/arch/mips/include/asm/device.h
---- linux-2.6.38.4/arch/mips/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/include/asm/device.h linux-2.6.38.6/arch/mips/include/asm/device.h
+--- linux-2.6.38.6/arch/mips/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
 @@ -10,7 +10,7 @@ struct dma_map_ops;
  
  struct dev_archdata {
@@ -1350,9 +1350,9 @@ diff -urNp linux-2.6.38.4/arch/mips/include/asm/device.h linux-2.6.38.4/arch/mip
  };
  
  struct pdev_archdata {
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/include/asm/dma-mapping.h linux-2.6.38.6/arch/mips/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/mips/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -7,9 +7,9 @@
  
  #include <dma-coherence.h>
@@ -1399,9 +1399,9 @@ diff -urNp linux-2.6.38.4/arch/mips/include/asm/dma-mapping.h linux-2.6.38.4/arc
  
  	ops->free_coherent(dev, size, vaddr, dma_handle);
  
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/elf.h linux-2.6.38.4/arch/mips/include/asm/elf.h
---- linux-2.6.38.4/arch/mips/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/elf.h	2011-04-30 19:58:48.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/include/asm/elf.h linux-2.6.38.6/arch/mips/include/asm/elf.h
+--- linux-2.6.38.6/arch/mips/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/include/asm/elf.h	2011-04-30 19:58:48.000000000 -0400
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1423,9 +1423,9 @@ diff -urNp linux-2.6.38.4/arch/mips/include/asm/elf.h linux-2.6.38.4/arch/mips/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
---- linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h linux-2.6.38.6/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+--- linux-2.6.38.6/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2011-04-28 19:34:14.000000000 -0400
 @@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *de
  phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
  
@@ -1435,9 +1435,9 @@ diff -urNp linux-2.6.38.4/arch/mips/include/asm/mach-cavium-octeon/dma-coherence
  extern char *octeon_swiotlb;
  
  #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/page.h linux-2.6.38.4/arch/mips/include/asm/page.h
---- linux-2.6.38.4/arch/mips/include/asm/page.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/page.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/include/asm/page.h linux-2.6.38.6/arch/mips/include/asm/page.h
+--- linux-2.6.38.6/arch/mips/include/asm/page.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/include/asm/page.h	2011-04-28 19:34:14.000000000 -0400
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1447,9 +1447,9 @@ diff -urNp linux-2.6.38.4/arch/mips/include/asm/page.h linux-2.6.38.4/arch/mips/
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-2.6.38.4/arch/mips/include/asm/system.h linux-2.6.38.4/arch/mips/include/asm/system.h
---- linux-2.6.38.4/arch/mips/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/include/asm/system.h linux-2.6.38.6/arch/mips/include/asm/system.h
+--- linux-2.6.38.6/arch/mips/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1458,9 +1458,9 @@ diff -urNp linux-2.6.38.4/arch/mips/include/asm/system.h linux-2.6.38.4/arch/mip
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c	2011-04-30 19:58:48.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.6/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.38.6/arch/mips/kernel/binfmt_elfn32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/kernel/binfmt_elfn32.c	2011-04-30 19:58:48.000000000 -0400
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1475,9 +1475,9 @@ diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.38.4/arch/m
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c	2011-04-30 19:58:48.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.6/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.38.6/arch/mips/kernel/binfmt_elfo32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/kernel/binfmt_elfo32.c	2011-04-30 19:58:48.000000000 -0400
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1492,9 +1492,9 @@ diff -urNp linux-2.6.38.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.38.4/arch/m
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.38.4/arch/mips/kernel/kgdb.c linux-2.6.38.4/arch/mips/kernel/kgdb.c
---- linux-2.6.38.4/arch/mips/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/kernel/kgdb.c linux-2.6.38.6/arch/mips/kernel/kgdb.c
+--- linux-2.6.38.6/arch/mips/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;
  }
@@ -1504,9 +1504,9 @@ diff -urNp linux-2.6.38.4/arch/mips/kernel/kgdb.c linux-2.6.38.4/arch/mips/kerne
  
  /*
   * We use kgdb_early_setup so that functions we need to call now don't
-diff -urNp linux-2.6.38.4/arch/mips/kernel/process.c linux-2.6.38.4/arch/mips/kernel/process.c
---- linux-2.6.38.4/arch/mips/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/kernel/process.c linux-2.6.38.6/arch/mips/kernel/process.c
+--- linux-2.6.38.6/arch/mips/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
@@ -1523,9 +1523,9 @@ diff -urNp linux-2.6.38.4/arch/mips/kernel/process.c linux-2.6.38.4/arch/mips/ke
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-2.6.38.4/arch/mips/kernel/syscall.c linux-2.6.38.4/arch/mips/kernel/syscall.c
---- linux-2.6.38.4/arch/mips/kernel/syscall.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/kernel/syscall.c	2011-04-30 19:58:48.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/kernel/syscall.c linux-2.6.38.6/arch/mips/kernel/syscall.c
+--- linux-2.6.38.6/arch/mips/kernel/syscall.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/kernel/syscall.c	2011-04-30 19:58:48.000000000 -0400
 @@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(str
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
@@ -1590,9 +1590,9 @@ diff -urNp linux-2.6.38.4/arch/mips/kernel/syscall.c linux-2.6.38.4/arch/mips/ke
  SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
  	unsigned long, prot, unsigned long, flags, unsigned long,
  	fd, off_t, offset)
-diff -urNp linux-2.6.38.4/arch/mips/mm/dma-default.c linux-2.6.38.4/arch/mips/mm/dma-default.c
---- linux-2.6.38.4/arch/mips/mm/dma-default.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/mm/dma-default.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/mm/dma-default.c linux-2.6.38.6/arch/mips/mm/dma-default.c
+--- linux-2.6.38.6/arch/mips/mm/dma-default.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/mm/dma-default.c	2011-04-28 19:34:14.000000000 -0400
 @@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, 
  
  EXPORT_SYMBOL(dma_cache_sync);
@@ -1611,9 +1611,9 @@ diff -urNp linux-2.6.38.4/arch/mips/mm/dma-default.c linux-2.6.38.4/arch/mips/mm
  EXPORT_SYMBOL(mips_dma_map_ops);
  
  #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-diff -urNp linux-2.6.38.4/arch/mips/mm/fault.c linux-2.6.38.4/arch/mips/mm/fault.c
---- linux-2.6.38.4/arch/mips/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/mips/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/mips/mm/fault.c linux-2.6.38.6/arch/mips/mm/fault.c
+--- linux-2.6.38.6/arch/mips/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/mips/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -28,6 +28,23 @@
  #include <asm/highmem.h>		/* For VMALLOC_END */
  #include <linux/kdebug.h>
@@ -1638,9 +1638,9 @@ diff -urNp linux-2.6.38.4/arch/mips/mm/fault.c linux-2.6.38.4/arch/mips/mm/fault
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.38.4/arch/parisc/include/asm/elf.h linux-2.6.38.4/arch/parisc/include/asm/elf.h
---- linux-2.6.38.4/arch/parisc/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/parisc/include/asm/elf.h linux-2.6.38.6/arch/parisc/include/asm/elf.h
+--- linux-2.6.38.6/arch/parisc/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/parisc/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1655,9 +1655,9 @@ diff -urNp linux-2.6.38.4/arch/parisc/include/asm/elf.h linux-2.6.38.4/arch/pari
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-2.6.38.4/arch/parisc/include/asm/pgtable.h linux-2.6.38.4/arch/parisc/include/asm/pgtable.h
---- linux-2.6.38.4/arch/parisc/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/parisc/include/asm/pgtable.h linux-2.6.38.6/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.38.6/arch/parisc/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/parisc/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
 @@ -209,6 +209,17 @@ struct vm_area_struct;
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1676,9 +1676,9 @@ diff -urNp linux-2.6.38.4/arch/parisc/include/asm/pgtable.h linux-2.6.38.4/arch/
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
  #define PAGE_KERNEL_UNC	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.38.4/arch/parisc/kernel/module.c linux-2.6.38.4/arch/parisc/kernel/module.c
---- linux-2.6.38.4/arch/parisc/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/parisc/kernel/module.c linux-2.6.38.6/arch/parisc/kernel/module.c
+--- linux-2.6.38.6/arch/parisc/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/parisc/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
 @@ -96,16 +96,38 @@
  
  /* three functions to determine where in the module core
@@ -1779,9 +1779,9 @@ diff -urNp linux-2.6.38.4/arch/parisc/kernel/module.c linux-2.6.38.4/arch/parisc
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/parisc/kernel/sys_parisc.c linux-2.6.38.6/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.38.6/arch/parisc/kernel/sys_parisc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/parisc/kernel/sys_parisc.c	2011-04-28 19:34:14.000000000 -0400
 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (TASK_SIZE - len < addr)
@@ -1809,9 +1809,9 @@ diff -urNp linux-2.6.38.4/arch/parisc/kernel/sys_parisc.c linux-2.6.38.4/arch/pa
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.38.4/arch/parisc/kernel/traps.c linux-2.6.38.4/arch/parisc/kernel/traps.c
---- linux-2.6.38.4/arch/parisc/kernel/traps.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/kernel/traps.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/parisc/kernel/traps.c linux-2.6.38.6/arch/parisc/kernel/traps.c
+--- linux-2.6.38.6/arch/parisc/kernel/traps.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/parisc/kernel/traps.c	2011-04-28 19:34:14.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
@@ -1823,9 +1823,9 @@ diff -urNp linux-2.6.38.4/arch/parisc/kernel/traps.c linux-2.6.38.4/arch/parisc/
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.38.4/arch/parisc/mm/fault.c linux-2.6.38.4/arch/parisc/mm/fault.c
---- linux-2.6.38.4/arch/parisc/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/parisc/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/parisc/mm/fault.c linux-2.6.38.6/arch/parisc/mm/fault.c
+--- linux-2.6.38.6/arch/parisc/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/parisc/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1995,9 +1995,9 @@ diff -urNp linux-2.6.38.4/arch/parisc/mm/fault.c linux-2.6.38.4/arch/parisc/mm/f
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/device.h linux-2.6.38.4/arch/powerpc/include/asm/device.h
---- linux-2.6.38.4/arch/powerpc/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/device.h linux-2.6.38.6/arch/powerpc/include/asm/device.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
 @@ -17,7 +17,7 @@ struct device_node;
   */
  struct dev_archdata {
@@ -2007,9 +2007,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/device.h linux-2.6.38.4/arch/
  
  	/*
  	 * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.6/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
  /*
   * Available generic sets of operations
@@ -2072,9 +2072,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/dma-mapping.h linux-2.6.38.4/
  
  	if (dma_ops->mapping_error)
  		return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/elf.h linux-2.6.38.4/arch/powerpc/include/asm/elf.h
---- linux-2.6.38.4/arch/powerpc/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/elf.h linux-2.6.38.6/arch/powerpc/include/asm/elf.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -2107,9 +2107,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/elf.h linux-2.6.38.4/arch/pow
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/iommu.h linux-2.6.38.4/arch/powerpc/include/asm/iommu.h
---- linux-2.6.38.4/arch/powerpc/include/asm/iommu.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/iommu.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/iommu.h linux-2.6.38.6/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/iommu.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/iommu.h	2011-04-28 19:34:14.000000000 -0400
 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
  extern void iommu_init_early_dart(void);
  extern void iommu_init_early_pasemi(void);
@@ -2120,9 +2120,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/iommu.h linux-2.6.38.4/arch/p
  #ifdef CONFIG_PCI
  extern void pci_iommu_init(void);
  extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.6/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -27,6 +27,7 @@ enum km_type {
  	KM_PPC_SYNC_PAGE,
  	KM_PPC_SYNC_ICACHE,
@@ -2131,9 +2131,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.38.4/a
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page_64.h linux-2.6.38.4/arch/powerpc/include/asm/page_64.h
---- linux-2.6.38.4/arch/powerpc/include/asm/page_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/page_64.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/page_64.h linux-2.6.38.6/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/page_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/page_64.h	2011-04-28 19:34:14.000000000 -0400
 @@ -172,15 +172,18 @@ do {						\
   * stack by default, so in the absense of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -2155,9 +2155,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page_64.h linux-2.6.38.4/arch
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page.h linux-2.6.38.4/arch/powerpc/include/asm/page.h
---- linux-2.6.38.4/arch/powerpc/include/asm/page.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/page.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/page.h linux-2.6.38.6/arch/powerpc/include/asm/page.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/page.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/page.h	2011-04-28 19:34:14.000000000 -0400
 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -2180,9 +2180,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/page.h linux-2.6.38.4/arch/po
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pci.h linux-2.6.38.4/arch/powerpc/include/asm/pci.h
---- linux-2.6.38.4/arch/powerpc/include/asm/pci.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/pci.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/pci.h linux-2.6.38.6/arch/powerpc/include/asm/pci.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/pci.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/pci.h	2011-04-28 19:34:14.000000000 -0400
 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
  }
  
@@ -2194,9 +2194,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pci.h linux-2.6.38.4/arch/pow
  #else	/* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/pgtable.h linux-2.6.38.6/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -2205,9 +2205,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pgtable.h linux-2.6.38.4/arch
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.6/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/pte-hash32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/pte-hash32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -2216,9 +2216,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.38.4/a
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/reg.h linux-2.6.38.4/arch/powerpc/include/asm/reg.h
---- linux-2.6.38.4/arch/powerpc/include/asm/reg.h	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/reg.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/reg.h linux-2.6.38.6/arch/powerpc/include/asm/reg.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/reg.h	2011-04-18 17:27:13.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/reg.h	2011-04-28 19:34:14.000000000 -0400
 @@ -191,6 +191,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
@@ -2227,9 +2227,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/reg.h linux-2.6.38.4/arch/pow
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.6/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/swiotlb.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/swiotlb.h	2011-04-28 19:34:14.000000000 -0400
 @@ -13,7 +13,7 @@
  
  #include <linux/swiotlb.h>
@@ -2239,9 +2239,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/swiotlb.h linux-2.6.38.4/arch
  
  static inline void dma_mark_clean(void *addr, size_t size) {}
  
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/system.h linux-2.6.38.4/arch/powerpc/include/asm/system.h
---- linux-2.6.38.4/arch/powerpc/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/system.h linux-2.6.38.6/arch/powerpc/include/asm/system.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
 @@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
@@ -2251,9 +2251,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/system.h linux-2.6.38.4/arch/
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/include/asm/uaccess.h linux-2.6.38.6/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.38.6/arch/powerpc/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -2431,9 +2431,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/include/asm/uaccess.h linux-2.6.38.4/arch
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma.c linux-2.6.38.4/arch/powerpc/kernel/dma.c
---- linux-2.6.38.4/arch/powerpc/kernel/dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/dma.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/dma.c linux-2.6.38.6/arch/powerpc/kernel/dma.c
+--- linux-2.6.38.6/arch/powerpc/kernel/dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/dma.c	2011-04-28 19:34:14.000000000 -0400
 @@ -136,7 +136,7 @@ static inline void dma_direct_sync_singl
  }
  #endif
@@ -2452,9 +2452,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma.c linux-2.6.38.4/arch/powerpc/
  
  	if (ppc_md.dma_set_mask)
  		return ppc_md.dma_set_mask(dev, dma_mask);
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.6/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.38.6/arch/powerpc/kernel/dma-iommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/dma-iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
  }
  
@@ -2473,9 +2473,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-iommu.c linux-2.6.38.4/arch/po
  	.alloc_coherent	= dma_iommu_alloc_coherent,
  	.free_coherent	= dma_iommu_free_coherent,
  	.map_sg		= dma_iommu_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.6/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.38.6/arch/powerpc/kernel/dma-swiotlb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/dma-swiotlb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
   * map_page, and unmap_page on highmem, use normal dma_ops
   * for everything else.
@@ -2485,9 +2485,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.38.4/arch/
  	.alloc_coherent = dma_direct_alloc_coherent,
  	.free_coherent = dma_direct_free_coherent,
  	.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.6/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.38.6/arch/powerpc/kernel/exceptions-64e.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/exceptions-64e.S	2011-04-28 19:34:14.000000000 -0400
 @@ -495,6 +495,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
@@ -2506,9 +2506,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64e.S linux-2.6.38.4/ar
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.6/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.38.6/arch/powerpc/kernel/exceptions-64s.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/exceptions-64s.S	2011-04-28 19:34:14.000000000 -0400
 @@ -848,10 +848,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
@@ -2521,9 +2521,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/exceptions-64s.S linux-2.6.38.4/ar
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/ibmebus.c linux-2.6.38.6/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.38.6/arch/powerpc/kernel/ibmebus.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/ibmebus.c	2011-04-28 19:34:14.000000000 -0400
 @@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct 
  	return 1;
  }
@@ -2533,9 +2533,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/ibmebus.c linux-2.6.38.4/arch/powe
  	.alloc_coherent = ibmebus_alloc_coherent,
  	.free_coherent  = ibmebus_free_coherent,
  	.map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/kgdb.c linux-2.6.38.4/arch/powerpc/kernel/kgdb.c
---- linux-2.6.38.4/arch/powerpc/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/kgdb.c linux-2.6.38.6/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.38.6/arch/powerpc/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vecto
  /*
   * Global data
@@ -2545,9 +2545,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/kgdb.c linux-2.6.38.4/arch/powerpc
  	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module_32.c linux-2.6.38.4/arch/powerpc/kernel/module_32.c
---- linux-2.6.38.4/arch/powerpc/kernel/module_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/module_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/module_32.c linux-2.6.38.6/arch/powerpc/kernel/module_32.c
+--- linux-2.6.38.6/arch/powerpc/kernel/module_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/module_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
  			me->arch.core_plt_section = i;
  	}
@@ -2577,9 +2577,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module_32.c linux-2.6.38.4/arch/po
  
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module.c linux-2.6.38.4/arch/powerpc/kernel/module.c
---- linux-2.6.38.4/arch/powerpc/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/module.c linux-2.6.38.6/arch/powerpc/kernel/module.c
+--- linux-2.6.38.6/arch/powerpc/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2619,9 +2619,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/module.c linux-2.6.38.4/arch/power
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/pci-common.c linux-2.6.38.4/arch/powerpc/kernel/pci-common.c
---- linux-2.6.38.4/arch/powerpc/kernel/pci-common.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/pci-common.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/pci-common.c linux-2.6.38.6/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.38.6/arch/powerpc/kernel/pci-common.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/pci-common.c	2011-04-28 19:34:14.000000000 -0400
 @@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
  unsigned int ppc_pci_flags = 0;
  
@@ -2640,9 +2640,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/pci-common.c linux-2.6.38.4/arch/p
  {
  	return pci_dma_ops;
  }
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/process.c linux-2.6.38.4/arch/powerpc/kernel/process.c
---- linux-2.6.38.4/arch/powerpc/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/process.c linux-2.6.38.6/arch/powerpc/kernel/process.c
+--- linux-2.6.38.6/arch/powerpc/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
 @@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs)
  	 * Lookup NIP late so we have the best change of getting the
  	 * above info out without failing
@@ -2735,9 +2735,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/process.c linux-2.6.38.4/arch/powe
 -
 -	return ret;
 -}
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_32.c linux-2.6.38.4/arch/powerpc/kernel/signal_32.c
---- linux-2.6.38.4/arch/powerpc/kernel/signal_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/signal_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/signal_32.c linux-2.6.38.6/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.38.6/arch/powerpc/kernel/signal_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/signal_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
@@ -2747,9 +2747,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_32.c linux-2.6.38.4/arch/po
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_64.c linux-2.6.38.4/arch/powerpc/kernel/signal_64.c
---- linux-2.6.38.4/arch/powerpc/kernel/signal_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/signal_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/signal_64.c linux-2.6.38.6/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.38.6/arch/powerpc/kernel/signal_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/signal_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
@@ -2759,9 +2759,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/signal_64.c linux-2.6.38.4/arch/po
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vdso.c linux-2.6.38.4/arch/powerpc/kernel/vdso.c
---- linux-2.6.38.4/arch/powerpc/kernel/vdso.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/vdso.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/vdso.c linux-2.6.38.6/arch/powerpc/kernel/vdso.c
+--- linux-2.6.38.6/arch/powerpc/kernel/vdso.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/vdso.c	2011-04-28 19:34:14.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2788,9 +2788,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vdso.c linux-2.6.38.4/arch/powerpc
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vio.c linux-2.6.38.4/arch/powerpc/kernel/vio.c
---- linux-2.6.38.4/arch/powerpc/kernel/vio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/kernel/vio.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/kernel/vio.c linux-2.6.38.6/arch/powerpc/kernel/vio.c
+--- linux-2.6.38.6/arch/powerpc/kernel/vio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/kernel/vio.c	2011-04-28 19:34:14.000000000 -0400
 @@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(s
          return dma_iommu_ops.dma_supported(dev, mask);
  }
@@ -2805,9 +2805,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/kernel/vio.c linux-2.6.38.4/arch/powerpc/
  	.map_page       = vio_dma_iommu_map_page,
  	.unmap_page     = vio_dma_iommu_unmap_page,
  	.dma_supported  = vio_dma_iommu_dma_supported,
-diff -urNp linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/lib/usercopy_64.c linux-2.6.38.6/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.38.6/arch/powerpc/lib/usercopy_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/lib/usercopy_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2839,9 +2839,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/lib/usercopy_64.c linux-2.6.38.4/arch/pow
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.38.4/arch/powerpc/mm/fault.c linux-2.6.38.4/arch/powerpc/mm/fault.c
---- linux-2.6.38.4/arch/powerpc/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/mm/fault.c linux-2.6.38.6/arch/powerpc/mm/fault.c
+--- linux-2.6.38.6/arch/powerpc/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -31,6 +31,10 @@
  #include <linux/kdebug.h>
  #include <linux/perf_event.h>
@@ -2946,9 +2946,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/mm/fault.c linux-2.6.38.4/arch/powerpc/mm
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-2.6.38.4/arch/powerpc/mm/mmap_64.c linux-2.6.38.4/arch/powerpc/mm/mmap_64.c
---- linux-2.6.38.4/arch/powerpc/mm/mmap_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/mm/mmap_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/mm/mmap_64.c linux-2.6.38.6/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.38.6/arch/powerpc/mm/mmap_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/mm/mmap_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -2972,9 +2972,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/mm/mmap_64.c linux-2.6.38.4/arch/powerpc/
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.38.4/arch/powerpc/mm/slice.c linux-2.6.38.4/arch/powerpc/mm/slice.c
---- linux-2.6.38.4/arch/powerpc/mm/slice.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/mm/slice.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/mm/slice.c linux-2.6.38.6/arch/powerpc/mm/slice.c
+--- linux-2.6.38.6/arch/powerpc/mm/slice.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/mm/slice.c	2011-04-28 19:34:14.000000000 -0400
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
@@ -3041,9 +3041,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/mm/slice.c linux-2.6.38.4/arch/powerpc/mm
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.6/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.38.6/arch/powerpc/platforms/cell/iommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/platforms/cell/iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
  
  static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -3053,9 +3053,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/platforms/cell/iommu.c linux-2.6.38.4/arc
  	.alloc_coherent = dma_fixed_alloc_coherent,
  	.free_coherent  = dma_fixed_free_coherent,
  	.map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.6/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.38.6/arch/powerpc/platforms/ps3/system-bus.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/platforms/ps3/system-bus.c	2011-04-28 19:34:14.000000000 -0400
 @@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
  	return mask >= DMA_BIT_MASK(32);
  }
@@ -3074,9 +3074,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.38.4
  	.alloc_coherent = ps3_alloc_coherent,
  	.free_coherent = ps3_free_coherent,
  	.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c
---- linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.6/arch/powerpc/sysdev/ppc4xx_cpm.c
+--- linux-2.6.38.6/arch/powerpc/sysdev/ppc4xx_cpm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/powerpc/sysdev/ppc4xx_cpm.c	2011-04-28 19:34:14.000000000 -0400
 @@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_sta
  	return 0;
  }
@@ -3086,9 +3086,9 @@ diff -urNp linux-2.6.38.4/arch/powerpc/sysdev/ppc4xx_cpm.c linux-2.6.38.4/arch/p
  	.valid		= cpm_suspend_valid,
  	.enter		= cpm_suspend_enter,
  };
-diff -urNp linux-2.6.38.4/arch/s390/include/asm/elf.h linux-2.6.38.4/arch/s390/include/asm/elf.h
---- linux-2.6.38.4/arch/s390/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/include/asm/elf.h linux-2.6.38.6/arch/s390/include/asm/elf.h
+--- linux-2.6.38.6/arch/s390/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -3114,9 +3114,9 @@ diff -urNp linux-2.6.38.4/arch/s390/include/asm/elf.h linux-2.6.38.4/arch/s390/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-2.6.38.4/arch/s390/include/asm/system.h linux-2.6.38.4/arch/s390/include/asm/system.h
---- linux-2.6.38.4/arch/s390/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/include/asm/system.h linux-2.6.38.6/arch/s390/include/asm/system.h
+--- linux-2.6.38.6/arch/s390/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
 @@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
@@ -3126,9 +3126,9 @@ diff -urNp linux-2.6.38.4/arch/s390/include/asm/system.h linux-2.6.38.4/arch/s39
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-2.6.38.4/arch/s390/include/asm/uaccess.h linux-2.6.38.4/arch/s390/include/asm/uaccess.h
---- linux-2.6.38.4/arch/s390/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/include/asm/uaccess.h linux-2.6.38.6/arch/s390/include/asm/uaccess.h
+--- linux-2.6.38.6/arch/s390/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
 @@ -234,6 +234,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.38.4/arch/s390/include/asm/uaccess.h linux-2.6.38.4/arch/s3
  	if (unlikely(sz != -1 && sz < n)) {
  		copy_from_user_overflow();
  		return n;
-diff -urNp linux-2.6.38.4/arch/s390/Kconfig linux-2.6.38.4/arch/s390/Kconfig
---- linux-2.6.38.4/arch/s390/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/Kconfig	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/Kconfig linux-2.6.38.6/arch/s390/Kconfig
+--- linux-2.6.38.6/arch/s390/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/Kconfig	2011-04-28 19:34:14.000000000 -0400
 @@ -233,11 +233,9 @@ config S390_EXEC_PROTECT
  	prompt "Data execute protection"
  	help
@@ -3179,9 +3179,9 @@ diff -urNp linux-2.6.38.4/arch/s390/Kconfig linux-2.6.38.4/arch/s390/Kconfig
  
  comment "Code generation options"
  
-diff -urNp linux-2.6.38.4/arch/s390/kernel/module.c linux-2.6.38.4/arch/s390/kernel/module.c
---- linux-2.6.38.4/arch/s390/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/kernel/module.c linux-2.6.38.6/arch/s390/kernel/module.c
+--- linux-2.6.38.6/arch/s390/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
@@ -3253,9 +3253,9 @@ diff -urNp linux-2.6.38.4/arch/s390/kernel/module.c linux-2.6.38.4/arch/s390/ker
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-2.6.38.4/arch/s390/kernel/process.c linux-2.6.38.4/arch/s390/kernel/process.c
---- linux-2.6.38.4/arch/s390/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/kernel/process.c linux-2.6.38.6/arch/s390/kernel/process.c
+--- linux-2.6.38.6/arch/s390/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
 @@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_stru
  	}
  	return 0;
@@ -3296,9 +3296,9 @@ diff -urNp linux-2.6.38.4/arch/s390/kernel/process.c linux-2.6.38.4/arch/s390/ke
 -		return base;
 -	return ret;
 -}
-diff -urNp linux-2.6.38.4/arch/s390/kernel/setup.c linux-2.6.38.4/arch/s390/kernel/setup.c
---- linux-2.6.38.4/arch/s390/kernel/setup.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/kernel/setup.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/kernel/setup.c linux-2.6.38.6/arch/s390/kernel/setup.c
+--- linux-2.6.38.6/arch/s390/kernel/setup.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/kernel/setup.c	2011-04-28 19:34:14.000000000 -0400
 @@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -3347,9 +3347,9 @@ diff -urNp linux-2.6.38.4/arch/s390/kernel/setup.c linux-2.6.38.4/arch/s390/kern
  static void setup_addressing_mode(void)
  {
  	if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.38.4/arch/s390/mm/maccess.c linux-2.6.38.4/arch/s390/mm/maccess.c
---- linux-2.6.38.4/arch/s390/mm/maccess.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/mm/maccess.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/mm/maccess.c linux-2.6.38.6/arch/s390/mm/maccess.c
+--- linux-2.6.38.6/arch/s390/mm/maccess.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/mm/maccess.c	2011-04-28 19:34:14.000000000 -0400
 @@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void 
  	return rc ? rc : count;
  }
@@ -3359,9 +3359,9 @@ diff -urNp linux-2.6.38.4/arch/s390/mm/maccess.c linux-2.6.38.4/arch/s390/mm/mac
  {
  	long copied = 0;
  
-diff -urNp linux-2.6.38.4/arch/s390/mm/mmap.c linux-2.6.38.4/arch/s390/mm/mmap.c
---- linux-2.6.38.4/arch/s390/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/s390/mm/mmap.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/s390/mm/mmap.c linux-2.6.38.6/arch/s390/mm/mmap.c
+--- linux-2.6.38.6/arch/s390/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/s390/mm/mmap.c	2011-04-28 19:34:14.000000000 -0400
 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -3408,9 +3408,9 @@ diff -urNp linux-2.6.38.4/arch/s390/mm/mmap.c linux-2.6.38.4/arch/s390/mm/mmap.c
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.38.4/arch/score/include/asm/system.h linux-2.6.38.4/arch/score/include/asm/system.h
---- linux-2.6.38.4/arch/score/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/score/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/score/include/asm/system.h linux-2.6.38.6/arch/score/include/asm/system.h
+--- linux-2.6.38.6/arch/score/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/score/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -3420,9 +3420,9 @@ diff -urNp linux-2.6.38.4/arch/score/include/asm/system.h linux-2.6.38.4/arch/sc
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-2.6.38.4/arch/score/kernel/process.c linux-2.6.38.4/arch/score/kernel/process.c
---- linux-2.6.38.4/arch/score/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/score/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/score/kernel/process.c linux-2.6.38.6/arch/score/kernel/process.c
+--- linux-2.6.38.6/arch/score/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/score/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
@@ -3432,9 +3432,9 @@ diff -urNp linux-2.6.38.4/arch/score/kernel/process.c linux-2.6.38.4/arch/score/
 -{
 -	return sp;
 -}
-diff -urNp linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sh/include/asm/dma-mapping.h linux-2.6.38.6/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/sh/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sh/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -1,10 +1,10 @@
  #ifndef __ASM_SH_DMA_MAPPING_H
  #define __ASM_SH_DMA_MAPPING_H
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.38.4/arch/sh/include/asm/dma-mapping.h linux-2.6.38.4/arch/
  
  	if (dma_release_from_coherent(dev, get_order(size), vaddr))
  		return;
-diff -urNp linux-2.6.38.4/arch/sh/kernel/dma-nommu.c linux-2.6.38.4/arch/sh/kernel/dma-nommu.c
---- linux-2.6.38.4/arch/sh/kernel/dma-nommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/kernel/dma-nommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sh/kernel/dma-nommu.c linux-2.6.38.6/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.38.6/arch/sh/kernel/dma-nommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sh/kernel/dma-nommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device 
  }
  #endif
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.38.4/arch/sh/kernel/dma-nommu.c linux-2.6.38.4/arch/sh/kern
  	.alloc_coherent		= dma_generic_alloc_coherent,
  	.free_coherent		= dma_generic_free_coherent,
  	.map_page		= nommu_map_page,
-diff -urNp linux-2.6.38.4/arch/sh/kernel/kgdb.c linux-2.6.38.4/arch/sh/kernel/kgdb.c
---- linux-2.6.38.4/arch/sh/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sh/kernel/kgdb.c linux-2.6.38.6/arch/sh/kernel/kgdb.c
+--- linux-2.6.38.6/arch/sh/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sh/kernel/kgdb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
  	unregister_die_notifier(&kgdb_notifier);
  }
@@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.38.4/arch/sh/kernel/kgdb.c linux-2.6.38.4/arch/sh/kernel/kg
  	/* Breakpoint instruction: trapa #0x3c */
  #ifdef CONFIG_CPU_LITTLE_ENDIAN
  	.gdb_bpt_instr		= { 0x3c, 0xc3 },
-diff -urNp linux-2.6.38.4/arch/sh/mm/consistent.c linux-2.6.38.4/arch/sh/mm/consistent.c
---- linux-2.6.38.4/arch/sh/mm/consistent.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/mm/consistent.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sh/mm/consistent.c linux-2.6.38.6/arch/sh/mm/consistent.c
+--- linux-2.6.38.6/arch/sh/mm/consistent.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sh/mm/consistent.c	2011-04-28 19:34:14.000000000 -0400
 @@ -22,7 +22,7 @@
  
  #define PREALLOC_DMA_DEBUG_ENTRIES	4096
@@ -3529,9 +3529,9 @@ diff -urNp linux-2.6.38.4/arch/sh/mm/consistent.c linux-2.6.38.4/arch/sh/mm/cons
  EXPORT_SYMBOL(dma_ops);
  
  static int __init dma_init(void)
-diff -urNp linux-2.6.38.4/arch/sh/mm/mmap.c linux-2.6.38.4/arch/sh/mm/mmap.c
---- linux-2.6.38.4/arch/sh/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sh/mm/mmap.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sh/mm/mmap.c linux-2.6.38.6/arch/sh/mm/mmap.c
+--- linux-2.6.38.6/arch/sh/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sh/mm/mmap.c	2011-04-28 19:34:14.000000000 -0400
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
@@ -3606,9 +3606,9 @@ diff -urNp linux-2.6.38.4/arch/sh/mm/mmap.c linux-2.6.38.4/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/atomic_64.h linux-2.6.38.6/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.38.6/arch/sparc/include/asm/atomic_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/atomic_64.h	2011-04-28 19:57:25.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -3780,9 +3780,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/atomic_64.h linux-2.6.38.4/arch
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.6/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/sparc/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -12,10 +12,10 @@ extern int dma_supported(struct device *
  #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
  #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
@@ -3814,9 +3814,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/dma-mapping.h linux-2.6.38.4/ar
  
  	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
  	ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_32.h linux-2.6.38.4/arch/sparc/include/asm/elf_32.h
---- linux-2.6.38.4/arch/sparc/include/asm/elf_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/elf_32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/elf_32.h linux-2.6.38.6/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.38.6/arch/sparc/include/asm/elf_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/elf_32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3831,9 +3831,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_32.h linux-2.6.38.4/arch/sp
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_64.h linux-2.6.38.4/arch/sparc/include/asm/elf_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/elf_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/elf_64.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/elf_64.h linux-2.6.38.6/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.38.6/arch/sparc/include/asm/elf_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/elf_64.h	2011-04-28 19:34:14.000000000 -0400
 @@ -162,6 +162,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
@@ -3847,9 +3847,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/elf_64.h linux-2.6.38.4/arch/sp
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.6/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.38.6/arch/sparc/include/asm/pgtable_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/pgtable_32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3881,9 +3881,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.38.4/arc
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.6/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.38.6/arch/sparc/include/asm/pgtsrmmu.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/pgtsrmmu.h	2011-04-28 19:34:14.000000000 -0400
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3898,9 +3898,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.38.4/arch/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.6/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.38.6/arch/sparc/include/asm/spinlock_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/spinlock_64.h	2011-04-28 19:57:25.000000000 -0400
 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -3998,9 +3998,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.38.4/ar
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.6/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.38.6/arch/sparc/include/asm/uaccess_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/uaccess_32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -4052,9 +4052,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.38.4/arc
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.6/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.38.6/arch/sparc/include/asm/uaccess_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/uaccess_64.h	2011-04-28 19:34:14.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -4097,9 +4097,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.38.4/arc
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess.h linux-2.6.38.4/arch/sparc/include/asm/uaccess.h
---- linux-2.6.38.4/arch/sparc/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/include/asm/uaccess.h linux-2.6.38.6/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.38.6/arch/sparc/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -4114,9 +4114,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/include/asm/uaccess.h linux-2.6.38.4/arch/s
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/iommu.c linux-2.6.38.4/arch/sparc/kernel/iommu.c
---- linux-2.6.38.4/arch/sparc/kernel/iommu.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/iommu.c linux-2.6.38.6/arch/sparc/kernel/iommu.c
+--- linux-2.6.38.6/arch/sparc/kernel/iommu.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struc
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -4135,9 +4135,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/iommu.c linux-2.6.38.4/arch/sparc/ke
  EXPORT_SYMBOL(dma_ops);
  
  extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/ioport.c linux-2.6.38.4/arch/sparc/kernel/ioport.c
---- linux-2.6.38.4/arch/sparc/kernel/ioport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/ioport.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/ioport.c linux-2.6.38.6/arch/sparc/kernel/ioport.c
+--- linux-2.6.38.6/arch/sparc/kernel/ioport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/ioport.c	2011-04-28 19:34:14.000000000 -0400
 @@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
  	BUG();
  }
@@ -4165,9 +4165,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/ioport.c linux-2.6.38.4/arch/sparc/k
  	.alloc_coherent		= pci32_alloc_coherent,
  	.free_coherent		= pci32_free_coherent,
  	.map_page		= pci32_map_page,
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/kgdb_32.c linux-2.6.38.6/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.38.6/arch/sparc/kernel/kgdb_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/kgdb_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
  	regs->npc = regs->pc + 4;
  }
@@ -4177,9 +4177,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_32.c linux-2.6.38.4/arch/sparc/
  	/* Breakpoint instruction: ta 0x7d */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x7d },
  };
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/kgdb_64.c linux-2.6.38.6/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.38.6/arch/sparc/kernel/kgdb_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/kgdb_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
  	regs->tnpc = regs->tpc + 4;
  }
@@ -4189,9 +4189,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/kgdb_64.c linux-2.6.38.4/arch/sparc/
  	/* Breakpoint instruction: ta 0x72 */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/Makefile linux-2.6.38.4/arch/sparc/kernel/Makefile
---- linux-2.6.38.4/arch/sparc/kernel/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/Makefile	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/Makefile linux-2.6.38.6/arch/sparc/kernel/Makefile
+--- linux-2.6.38.6/arch/sparc/kernel/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/Makefile	2011-04-28 19:34:14.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -4201,9 +4201,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/Makefile linux-2.6.38.4/arch/sparc/k
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.6/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.38.6/arch/sparc/kernel/pci_sun4v.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/pci_sun4v.c	2011-04-28 19:34:14.000000000 -0400
 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -4213,9 +4213,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/pci_sun4v.c linux-2.6.38.4/arch/spar
  	.alloc_coherent			= dma_4v_alloc_coherent,
  	.free_coherent			= dma_4v_free_coherent,
  	.map_page			= dma_4v_map_page,
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_32.c linux-2.6.38.4/arch/sparc/kernel/process_32.c
---- linux-2.6.38.4/arch/sparc/kernel/process_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/process_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/process_32.c linux-2.6.38.6/arch/sparc/kernel/process_32.c
+--- linux-2.6.38.6/arch/sparc/kernel/process_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/process_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
@@ -4251,9 +4251,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_32.c linux-2.6.38.4/arch/spa
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_64.c linux-2.6.38.4/arch/sparc/kernel/process_64.c
---- linux-2.6.38.4/arch/sparc/kernel/process_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/process_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/process_64.c linux-2.6.38.6/arch/sparc/kernel/process_64.c
+--- linux-2.6.38.6/arch/sparc/kernel/process_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/process_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
  	printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
  	       rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -4289,9 +4289,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/process_64.c linux-2.6.38.4/arch/spa
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.6/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.38.6/arch/sparc/kernel/sys_sparc_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/sys_sparc_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
@@ -4310,9 +4310,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.38.4/arch/s
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.6/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.38.6/arch/sparc/kernel/sys_sparc_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/sys_sparc_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
@@ -4460,9 +4460,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.38.4/arch/s
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_32.c linux-2.6.38.4/arch/sparc/kernel/traps_32.c
---- linux-2.6.38.4/arch/sparc/kernel/traps_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/traps_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/traps_32.c linux-2.6.38.6/arch/sparc/kernel/traps_32.c
+--- linux-2.6.38.6/arch/sparc/kernel/traps_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/traps_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_
  		      count++ < 30				&&
                        (((unsigned long) rw) >= PAGE_OFFSET)	&&
@@ -4472,9 +4472,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_32.c linux-2.6.38.4/arch/sparc
  			       (void *) rw->ins[7]);
  			rw = (struct reg_window32 *)rw->ins[6];
  		}
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_64.c linux-2.6.38.4/arch/sparc/kernel/traps_64.c
---- linux-2.6.38.4/arch/sparc/kernel/traps_64.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/traps_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/traps_64.c linux-2.6.38.6/arch/sparc/kernel/traps_64.c
+--- linux-2.6.38.6/arch/sparc/kernel/traps_64.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/traps_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
  		       i + 1,
  		       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4591,9 +4591,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/traps_64.c linux-2.6.38.4/arch/sparc
  			       (void *) rw->ins[7]);
  
  			rw = kernel_stack_up(rw);
-diff -urNp linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/kernel/unaligned_64.c linux-2.6.38.6/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.38.6/arch/sparc/kernel/unaligned_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/kernel/unaligned_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs
  	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
@@ -4603,9 +4603,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/kernel/unaligned_64.c linux-2.6.38.4/arch/s
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-2.6.38.4/arch/sparc/lib/atomic_64.S linux-2.6.38.4/arch/sparc/lib/atomic_64.S
---- linux-2.6.38.4/arch/sparc/lib/atomic_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/lib/atomic_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/lib/atomic_64.S linux-2.6.38.6/arch/sparc/lib/atomic_64.S
+--- linux-2.6.38.6/arch/sparc/lib/atomic_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/lib/atomic_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -4840,9 +4840,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/lib/atomic_64.S linux-2.6.38.4/arch/sparc/l
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-2.6.38.4/arch/sparc/lib/ksyms.c linux-2.6.38.4/arch/sparc/lib/ksyms.c
---- linux-2.6.38.4/arch/sparc/lib/ksyms.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/lib/ksyms.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/lib/ksyms.c linux-2.6.38.6/arch/sparc/lib/ksyms.c
+--- linux-2.6.38.6/arch/sparc/lib/ksyms.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/lib/ksyms.c	2011-04-28 19:34:14.000000000 -0400
 @@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4861,9 +4861,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/lib/ksyms.c linux-2.6.38.4/arch/sparc/lib/k
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-2.6.38.4/arch/sparc/Makefile linux-2.6.38.4/arch/sparc/Makefile
---- linux-2.6.38.4/arch/sparc/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/Makefile	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/Makefile linux-2.6.38.6/arch/sparc/Makefile
+--- linux-2.6.38.6/arch/sparc/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/Makefile	2011-04-28 19:34:14.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4873,9 +4873,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/Makefile linux-2.6.38.4/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_32.c linux-2.6.38.4/arch/sparc/mm/fault_32.c
---- linux-2.6.38.4/arch/sparc/mm/fault_32.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/fault_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/mm/fault_32.c linux-2.6.38.6/arch/sparc/mm/fault_32.c
+--- linux-2.6.38.6/arch/sparc/mm/fault_32.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/mm/fault_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -5180,9 +5180,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_32.c linux-2.6.38.4/arch/sparc/mm/
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_64.c linux-2.6.38.4/arch/sparc/mm/fault_64.c
---- linux-2.6.38.4/arch/sparc/mm/fault_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/fault_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/mm/fault_64.c linux-2.6.38.6/arch/sparc/mm/fault_64.c
+--- linux-2.6.38.6/arch/sparc/mm/fault_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/mm/fault_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -5690,9 +5690,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/mm/fault_64.c linux-2.6.38.4/arch/sparc/mm/
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/mm/hugetlbpage.c linux-2.6.38.6/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.38.6/arch/sparc/mm/hugetlbpage.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/mm/hugetlbpage.c	2011-04-28 19:34:14.000000000 -0400
 @@ -68,7 +68,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -5752,9 +5752,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/mm/hugetlbpage.c linux-2.6.38.4/arch/sparc/
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.38.4/arch/sparc/mm/init_32.c linux-2.6.38.4/arch/sparc/mm/init_32.c
---- linux-2.6.38.4/arch/sparc/mm/init_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/init_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/mm/init_32.c linux-2.6.38.6/arch/sparc/mm/init_32.c
+--- linux-2.6.38.6/arch/sparc/mm/init_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/mm/init_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -318,6 +318,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5789,9 +5789,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/mm/init_32.c linux-2.6.38.4/arch/sparc/mm/i
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.38.4/arch/sparc/mm/Makefile linux-2.6.38.4/arch/sparc/mm/Makefile
---- linux-2.6.38.4/arch/sparc/mm/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/Makefile	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/mm/Makefile linux-2.6.38.6/arch/sparc/mm/Makefile
+--- linux-2.6.38.6/arch/sparc/mm/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/mm/Makefile	2011-04-28 19:34:14.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -5801,9 +5801,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/mm/Makefile linux-2.6.38.4/arch/sparc/mm/Ma
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.38.4/arch/sparc/mm/srmmu.c linux-2.6.38.4/arch/sparc/mm/srmmu.c
---- linux-2.6.38.4/arch/sparc/mm/srmmu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/sparc/mm/srmmu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/sparc/mm/srmmu.c linux-2.6.38.6/arch/sparc/mm/srmmu.c
+--- linux-2.6.38.6/arch/sparc/mm/srmmu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/sparc/mm/srmmu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5818,9 +5818,9 @@ diff -urNp linux-2.6.38.4/arch/sparc/mm/srmmu.c linux-2.6.38.4/arch/sparc/mm/srm
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.38.4/arch/um/include/asm/kmap_types.h linux-2.6.38.4/arch/um/include/asm/kmap_types.h
---- linux-2.6.38.4/arch/um/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/um/include/asm/kmap_types.h linux-2.6.38.6/arch/um/include/asm/kmap_types.h
+--- linux-2.6.38.6/arch/um/include/asm/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/um/include/asm/kmap_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -5829,9 +5829,9 @@ diff -urNp linux-2.6.38.4/arch/um/include/asm/kmap_types.h linux-2.6.38.4/arch/u
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.38.4/arch/um/include/asm/page.h linux-2.6.38.4/arch/um/include/asm/page.h
---- linux-2.6.38.4/arch/um/include/asm/page.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/include/asm/page.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/um/include/asm/page.h linux-2.6.38.6/arch/um/include/asm/page.h
+--- linux-2.6.38.6/arch/um/include/asm/page.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/um/include/asm/page.h	2011-04-28 19:34:14.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -5842,9 +5842,9 @@ diff -urNp linux-2.6.38.4/arch/um/include/asm/page.h linux-2.6.38.4/arch/um/incl
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.38.4/arch/um/kernel/process.c linux-2.6.38.4/arch/um/kernel/process.c
---- linux-2.6.38.4/arch/um/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/um/kernel/process.c linux-2.6.38.6/arch/um/kernel/process.c
+--- linux-2.6.38.6/arch/um/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/um/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -5868,9 +5868,9 @@ diff -urNp linux-2.6.38.4/arch/um/kernel/process.c linux-2.6.38.4/arch/um/kernel
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.38.4/arch/um/sys-i386/syscalls.c linux-2.6.38.4/arch/um/sys-i386/syscalls.c
---- linux-2.6.38.4/arch/um/sys-i386/syscalls.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/um/sys-i386/syscalls.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/um/sys-i386/syscalls.c linux-2.6.38.6/arch/um/sys-i386/syscalls.c
+--- linux-2.6.38.6/arch/um/sys-i386/syscalls.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/um/sys-i386/syscalls.c	2011-04-28 19:34:14.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5893,9 +5893,9 @@ diff -urNp linux-2.6.38.4/arch/um/sys-i386/syscalls.c linux-2.6.38.4/arch/um/sys
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-2.6.38.4/arch/x86/boot/bitops.h linux-2.6.38.4/arch/x86/boot/bitops.h
---- linux-2.6.38.4/arch/x86/boot/bitops.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/bitops.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/bitops.h linux-2.6.38.6/arch/x86/boot/bitops.h
+--- linux-2.6.38.6/arch/x86/boot/bitops.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/bitops.h	2011-04-28 19:34:14.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
@@ -5914,9 +5914,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/bitops.h linux-2.6.38.4/arch/x86/boot/bi
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.38.4/arch/x86/boot/boot.h linux-2.6.38.4/arch/x86/boot/boot.h
---- linux-2.6.38.4/arch/x86/boot/boot.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/boot.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/boot.h linux-2.6.38.6/arch/x86/boot/boot.h
+--- linux-2.6.38.6/arch/x86/boot/boot.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/boot.h	2011-04-28 19:34:14.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5935,9 +5935,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/boot.h linux-2.6.38.4/arch/x86/boot/boot
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_32.S linux-2.6.38.4/arch/x86/boot/compressed/head_32.S
---- linux-2.6.38.4/arch/x86/boot/compressed/head_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/head_32.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/compressed/head_32.S linux-2.6.38.6/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.38.6/arch/x86/boot/compressed/head_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/compressed/head_32.S	2011-04-28 19:34:14.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -5966,9 +5966,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_32.S linux-2.6.38.4/arch
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_64.S linux-2.6.38.4/arch/x86/boot/compressed/head_64.S
---- linux-2.6.38.4/arch/x86/boot/compressed/head_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/head_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/compressed/head_64.S linux-2.6.38.6/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.38.6/arch/x86/boot/compressed/head_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/compressed/head_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -5987,9 +5987,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/head_64.S linux-2.6.38.4/arch
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/misc.c linux-2.6.38.4/arch/x86/boot/compressed/misc.c
---- linux-2.6.38.4/arch/x86/boot/compressed/misc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/misc.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/compressed/misc.c linux-2.6.38.6/arch/x86/boot/compressed/misc.c
+--- linux-2.6.38.6/arch/x86/boot/compressed/misc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/compressed/misc.c	2011-04-28 19:34:14.000000000 -0400
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -6008,9 +6008,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/misc.c linux-2.6.38.4/arch/x8
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/relocs.c linux-2.6.38.4/arch/x86/boot/compressed/relocs.c
---- linux-2.6.38.4/arch/x86/boot/compressed/relocs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/compressed/relocs.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/compressed/relocs.c linux-2.6.38.6/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.38.6/arch/x86/boot/compressed/relocs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/compressed/relocs.c	2011-04-28 19:34:14.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -6203,9 +6203,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/compressed/relocs.c linux-2.6.38.4/arch/
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-2.6.38.4/arch/x86/boot/cpucheck.c linux-2.6.38.4/arch/x86/boot/cpucheck.c
---- linux-2.6.38.4/arch/x86/boot/cpucheck.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/cpucheck.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/cpucheck.c linux-2.6.38.6/arch/x86/boot/cpucheck.c
+--- linux-2.6.38.6/arch/x86/boot/cpucheck.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/cpucheck.c	2011-04-28 19:34:14.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -6301,9 +6301,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/cpucheck.c linux-2.6.38.4/arch/x86/boot/
  
  		err = check_flags();
  	}
-diff -urNp linux-2.6.38.4/arch/x86/boot/header.S linux-2.6.38.4/arch/x86/boot/header.S
---- linux-2.6.38.4/arch/x86/boot/header.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/header.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/header.S linux-2.6.38.6/arch/x86/boot/header.S
+--- linux-2.6.38.6/arch/x86/boot/header.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/header.S	2011-04-28 19:34:14.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
@@ -6313,9 +6313,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/header.S linux-2.6.38.4/arch/x86/boot/he
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-2.6.38.4/arch/x86/boot/memory.c linux-2.6.38.4/arch/x86/boot/memory.c
---- linux-2.6.38.4/arch/x86/boot/memory.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/memory.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/memory.c linux-2.6.38.6/arch/x86/boot/memory.c
+--- linux-2.6.38.6/arch/x86/boot/memory.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/memory.c	2011-04-28 19:34:14.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -6325,9 +6325,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/memory.c linux-2.6.38.4/arch/x86/boot/me
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.38.4/arch/x86/boot/video.c linux-2.6.38.4/arch/x86/boot/video.c
---- linux-2.6.38.4/arch/x86/boot/video.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/video.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/video.c linux-2.6.38.6/arch/x86/boot/video.c
+--- linux-2.6.38.6/arch/x86/boot/video.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/video.c	2011-04-28 19:34:14.000000000 -0400
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -6337,9 +6337,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/video.c linux-2.6.38.4/arch/x86/boot/vid
  	int key;
  	unsigned int v;
  
-diff -urNp linux-2.6.38.4/arch/x86/boot/video-vesa.c linux-2.6.38.4/arch/x86/boot/video-vesa.c
---- linux-2.6.38.4/arch/x86/boot/video-vesa.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/boot/video-vesa.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/boot/video-vesa.c linux-2.6.38.6/arch/x86/boot/video-vesa.c
+--- linux-2.6.38.6/arch/x86/boot/video-vesa.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/boot/video-vesa.c	2011-04-28 19:34:14.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
  	boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6348,9 +6348,9 @@ diff -urNp linux-2.6.38.4/arch/x86/boot/video-vesa.c linux-2.6.38.4/arch/x86/boo
  }
  
  /*
-diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_aout.c linux-2.6.38.4/arch/x86/ia32/ia32_aout.c
---- linux-2.6.38.4/arch/x86/ia32/ia32_aout.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/ia32/ia32_aout.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/ia32/ia32_aout.c linux-2.6.38.6/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.38.6/arch/x86/ia32/ia32_aout.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/ia32/ia32_aout.c	2011-04-28 19:34:14.000000000 -0400
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
@@ -6360,9 +6360,9 @@ diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_aout.c linux-2.6.38.4/arch/x86/ia32
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4/arch/x86/ia32/ia32entry.S
---- linux-2.6.38.4/arch/x86/ia32/ia32entry.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/ia32/ia32entry.S	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/ia32/ia32entry.S linux-2.6.38.6/arch/x86/ia32/ia32entry.S
+--- linux-2.6.38.6/arch/x86/ia32/ia32entry.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/ia32/ia32entry.S	2011-05-11 18:34:57.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -6480,15 +6480,6 @@ diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4/arch/x86/ia32
  1:	movl	(%r8),%r9d
  	.section __ex_table,"a"
  	.quad 1b,ia32_badarg
-@@ -323,7 +365,7 @@ ENTRY(ia32_cstar_target)
- 	cmpq $IA32_NR_syscalls-1,%rax
- 	ja  ia32_badsys
- cstar_do_call:
--	IA32_ARG_FIXUP 1
-+	IA32_ARG_FIXUP 0
- cstar_dispatch:
- 	call *ia32_sys_call_table(,%rax,8)
- 	movq %rax,RAX-ARGOFFSET(%rsp)
 @@ -333,6 +375,7 @@ cstar_dispatch:
  	testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz sysretl_audit
@@ -6505,9 +6496,9 @@ diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32entry.S linux-2.6.38.4/arch/x86/ia32
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_signal.c linux-2.6.38.4/arch/x86/ia32/ia32_signal.c
---- linux-2.6.38.4/arch/x86/ia32/ia32_signal.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/ia32/ia32_signal.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/ia32/ia32_signal.c linux-2.6.38.6/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.38.6/arch/x86/ia32/ia32_signal.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/ia32/ia32_signal.c	2011-04-28 19:34:14.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
  	sp -= frame_size;
  	/* Align the stack pointer according to the i386 ABI,
@@ -6557,9 +6548,9 @@ diff -urNp linux-2.6.38.4/arch/x86/ia32/ia32_signal.c linux-2.6.38.4/arch/x86/ia
  	} put_user_catch(err);
  
  	if (err)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/alternative.h linux-2.6.38.4/arch/x86/include/asm/alternative.h
---- linux-2.6.38.4/arch/x86/include/asm/alternative.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/alternative.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/alternative.h linux-2.6.38.6/arch/x86/include/asm/alternative.h
+--- linux-2.6.38.6/arch/x86/include/asm/alternative.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/alternative.h	2011-04-28 19:34:14.000000000 -0400
 @@ -94,7 +94,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"				\
        "	 .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */	\
@@ -6569,9 +6560,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/alternative.h linux-2.6.38.4/arch
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/apm.h linux-2.6.38.4/arch/x86/include/asm/apm.h
---- linux-2.6.38.4/arch/x86/include/asm/apm.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/apm.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/apm.h linux-2.6.38.6/arch/x86/include/asm/apm.h
+--- linux-2.6.38.6/arch/x86/include/asm/apm.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/apm.h	2011-04-28 19:34:14.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -6590,9 +6581,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/apm.h linux-2.6.38.4/arch/x86/inc
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/atomic64_32.h linux-2.6.38.6/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.38.6/arch/x86/include/asm/atomic64_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/atomic64_32.h	2011-05-11 18:35:16.000000000 -0400
 @@ -12,6 +12,14 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
@@ -6608,7 +6599,29 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch
  #define ATOMIC64_INIT(val)	{ (val) }
  
  #ifdef CONFIG_X86_CMPXCHG64
-@@ -77,6 +85,24 @@ static inline void atomic64_set(atomic64
+@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg
+ }
+ 
+ /**
++ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
++ * @p: pointer to type atomic64_unchecked_t
++ * @o: expected value
++ * @n: new value
++ *
++ * Atomically sets @v to @n if it was equal to @o and returns
++ * the old value.
++ */
++
++static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
++{
++	return cmpxchg64(&v->counter, o, n);
++}
++
++/**
+  * atomic64_xchg - xchg atomic64 variable
+  * @v: pointer to type atomic64_t
+  * @n: value to assign
+@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64
  }
  
  /**
@@ -6633,7 +6646,7 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch
   * atomic64_read - read atomic64 variable
   * @v: pointer to type atomic64_t
   *
-@@ -93,6 +119,22 @@ static inline long long atomic64_read(at
+@@ -93,6 +134,22 @@ static inline long long atomic64_read(at
   }
  
  /**
@@ -6656,7 +6669,30 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch
   * atomic64_add_return - add and return
   * @i: integer value to add
   * @v: pointer to type atomic64_t
-@@ -131,6 +173,17 @@ static inline long long atomic64_inc_ret
+@@ -108,6 +165,22 @@ static inline long long atomic64_add_ret
+ 	return i;
+ }
+ 
++/**
++ * atomic64_add_return_unchecked - add and return
++ * @i: integer value to add
++ * @v: pointer to type atomic64_unchecked_t
++ *
++ * Atomically adds @i to @v and returns @i + *@v
++ */
++static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
++{
++	asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
++		     : "+A" (i), "+c" (v)
++		     : : "memory"
++		     );
++	return i;
++}
++
+ /*
+  * Other variants with different arithmetic operators:
+  */
+@@ -131,6 +204,17 @@ static inline long long atomic64_inc_ret
  	return a;
  }
  
@@ -6674,7 +6710,7 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch
  static inline long long atomic64_dec_return(atomic64_t *v)
  {
  	long long a;
-@@ -159,6 +212,22 @@ static inline long long atomic64_add(lon
+@@ -159,6 +243,22 @@ static inline long long atomic64_add(lon
  }
  
  /**
@@ -6697,9 +6733,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_32.h linux-2.6.38.4/arch
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/atomic64_64.h linux-2.6.38.6/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.38.6/arch/x86/include/asm/atomic64_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/atomic64_64.h	2011-04-28 19:34:14.000000000 -0400
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -7009,9 +7045,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic64_64.h linux-2.6.38.4/arch
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic.h linux-2.6.38.4/arch/x86/include/asm/atomic.h
---- linux-2.6.38.4/arch/x86/include/asm/atomic.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/atomic.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/atomic.h linux-2.6.38.6/arch/x86/include/asm/atomic.h
+--- linux-2.6.38.6/arch/x86/include/asm/atomic.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/atomic.h	2011-04-28 19:57:25.000000000 -0400
 @@ -22,7 +22,18 @@
   */
  static inline int atomic_read(const atomic_t *v)
@@ -7424,9 +7460,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/atomic.h linux-2.6.38.4/arch/x86/
  /*
   * atomic_dec_if_positive - decrement by 1 if old value positive
   * @v: pointer of type atomic_t
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/bitops.h linux-2.6.38.4/arch/x86/include/asm/bitops.h
---- linux-2.6.38.4/arch/x86/include/asm/bitops.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/bitops.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/bitops.h linux-2.6.38.6/arch/x86/include/asm/bitops.h
+--- linux-2.6.38.6/arch/x86/include/asm/bitops.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/bitops.h	2011-04-28 19:34:14.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -7436,9 +7472,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/bitops.h linux-2.6.38.4/arch/x86/
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/boot.h linux-2.6.38.4/arch/x86/include/asm/boot.h
---- linux-2.6.38.4/arch/x86/include/asm/boot.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/boot.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/boot.h linux-2.6.38.6/arch/x86/include/asm/boot.h
+--- linux-2.6.38.6/arch/x86/include/asm/boot.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/boot.h	2011-04-28 19:34:14.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -7456,9 +7492,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/boot.h linux-2.6.38.4/arch/x86/in
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/cacheflush.h linux-2.6.38.4/arch/x86/include/asm/cacheflush.h
---- linux-2.6.38.4/arch/x86/include/asm/cacheflush.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/cacheflush.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/cacheflush.h linux-2.6.38.6/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.38.6/arch/x86/include/asm/cacheflush.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/cacheflush.h	2011-04-28 19:34:14.000000000 -0400
 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
  	unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -7468,9 +7504,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/cacheflush.h linux-2.6.38.4/arch/
  	else if (pg_flags == _PGMT_WC)
  		return _PAGE_CACHE_WC;
  	else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/cache.h linux-2.6.38.4/arch/x86/include/asm/cache.h
---- linux-2.6.38.4/arch/x86/include/asm/cache.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/cache.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/cache.h linux-2.6.38.6/arch/x86/include/asm/cache.h
+--- linux-2.6.38.6/arch/x86/include/asm/cache.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/cache.h	2011-04-28 19:57:25.000000000 -0400
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -7487,9 +7523,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/cache.h linux-2.6.38.4/arch/x86/i
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/checksum_32.h linux-2.6.38.4/arch/x86/include/asm/checksum_32.h
---- linux-2.6.38.4/arch/x86/include/asm/checksum_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/checksum_32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/checksum_32.h linux-2.6.38.6/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.38.6/arch/x86/include/asm/checksum_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/checksum_32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
@@ -7523,9 +7559,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/checksum_32.h linux-2.6.38.4/arch
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/cpufeature.h linux-2.6.38.4/arch/x86/include/asm/cpufeature.h
---- linux-2.6.38.4/arch/x86/include/asm/cpufeature.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/cpufeature.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/cpufeature.h linux-2.6.38.6/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.38.6/arch/x86/include/asm/cpufeature.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/cpufeature.h	2011-04-28 19:34:14.000000000 -0400
 @@ -349,7 +349,7 @@ static __always_inline __pure bool __sta
  			     ".section .discard,\"aw\",@progbits\n"
  			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -7535,9 +7571,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/cpufeature.h linux-2.6.38.4/arch/
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc_defs.h linux-2.6.38.4/arch/x86/include/asm/desc_defs.h
---- linux-2.6.38.4/arch/x86/include/asm/desc_defs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/desc_defs.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/desc_defs.h linux-2.6.38.6/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.38.6/arch/x86/include/asm/desc_defs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/desc_defs.h	2011-04-28 19:34:14.000000000 -0400
 @@ -31,6 +31,12 @@ struct desc_struct {
  			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
  			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -7551,9 +7587,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc_defs.h linux-2.6.38.4/arch/x
  	};
  } __attribute__((packed));
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc.h linux-2.6.38.4/arch/x86/include/asm/desc.h
---- linux-2.6.38.4/arch/x86/include/asm/desc.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/desc.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/desc.h linux-2.6.38.6/arch/x86/include/asm/desc.h
+--- linux-2.6.38.6/arch/x86/include/asm/desc.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/desc.h	2011-04-28 19:34:14.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7734,9 +7770,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/desc.h linux-2.6.38.4/arch/x86/in
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/device.h linux-2.6.38.4/arch/x86/include/asm/device.h
---- linux-2.6.38.4/arch/x86/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/device.h linux-2.6.38.6/arch/x86/include/asm/device.h
+--- linux-2.6.38.6/arch/x86/include/asm/device.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/device.h	2011-04-28 19:34:14.000000000 -0400
 @@ -6,7 +6,7 @@ struct dev_archdata {
  	void	*acpi_handle;
  #endif
@@ -7746,9 +7782,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/device.h linux-2.6.38.4/arch/x86/
  #endif
  #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
  	void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/dma-mapping.h linux-2.6.38.6/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.38.6/arch/x86/include/asm/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/dma-mapping.h	2011-04-28 19:34:14.000000000 -0400
 @@ -26,9 +26,9 @@ extern int iommu_merge;
  extern struct device x86_dma_fallback_dev;
  extern int panic_on_overflow;
@@ -7788,9 +7824,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/dma-mapping.h linux-2.6.38.4/arch
  
  	WARN_ON(irqs_disabled());       /* for portability */
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/e820.h linux-2.6.38.4/arch/x86/include/asm/e820.h
---- linux-2.6.38.4/arch/x86/include/asm/e820.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/e820.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/e820.h linux-2.6.38.6/arch/x86/include/asm/e820.h
+--- linux-2.6.38.6/arch/x86/include/asm/e820.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/e820.h	2011-04-28 19:34:14.000000000 -0400
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS	0xa0000
  #define ISA_END_ADDRESS		0x100000
@@ -7800,9 +7836,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/e820.h linux-2.6.38.4/arch/x86/in
  #define BIOS_END		0x00100000
  
  #define BIOS_ROM_BASE		0xffe00000
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/elf.h linux-2.6.38.4/arch/x86/include/asm/elf.h
---- linux-2.6.38.4/arch/x86/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/elf.h linux-2.6.38.6/arch/x86/include/asm/elf.h
+--- linux-2.6.38.6/arch/x86/include/asm/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/elf.h	2011-04-28 19:34:14.000000000 -0400
 @@ -237,7 +237,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -7856,9 +7892,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/elf.h linux-2.6.38.4/arch/x86/inc
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/futex.h linux-2.6.38.4/arch/x86/include/asm/futex.h
---- linux-2.6.38.4/arch/x86/include/asm/futex.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/futex.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/futex.h linux-2.6.38.6/arch/x86/include/asm/futex.h
+--- linux-2.6.38.6/arch/x86/include/asm/futex.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/futex.h	2011-04-28 19:34:14.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -7934,9 +7970,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/futex.h linux-2.6.38.4/arch/x86/i
  		     : "i" (-EFAULT), "r" (newval), "0" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/hw_irq.h linux-2.6.38.4/arch/x86/include/asm/hw_irq.h
---- linux-2.6.38.4/arch/x86/include/asm/hw_irq.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/hw_irq.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/hw_irq.h linux-2.6.38.6/arch/x86/include/asm/hw_irq.h
+--- linux-2.6.38.6/arch/x86/include/asm/hw_irq.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/hw_irq.h	2011-04-28 19:57:25.000000000 -0400
 @@ -113,8 +113,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
@@ -7948,9 +7984,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/hw_irq.h linux-2.6.38.4/arch/x86/
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/i387.h linux-2.6.38.4/arch/x86/include/asm/i387.h
---- linux-2.6.38.4/arch/x86/include/asm/i387.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/i387.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/i387.h linux-2.6.38.6/arch/x86/include/asm/i387.h
+--- linux-2.6.38.6/arch/x86/include/asm/i387.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/i387.h	2011-04-28 19:34:14.000000000 -0400
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -8009,9 +8045,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/i387.h linux-2.6.38.4/arch/x86/in
  	else
  		clts();
  }
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/io.h linux-2.6.38.4/arch/x86/include/asm/io.h
---- linux-2.6.38.4/arch/x86/include/asm/io.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/io.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/io.h linux-2.6.38.6/arch/x86/include/asm/io.h
+--- linux-2.6.38.6/arch/x86/include/asm/io.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/io.h	2011-04-28 19:34:14.000000000 -0400
 @@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
@@ -8030,9 +8066,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/io.h linux-2.6.38.4/arch/x86/incl
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/iommu.h linux-2.6.38.4/arch/x86/include/asm/iommu.h
---- linux-2.6.38.4/arch/x86/include/asm/iommu.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/iommu.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/iommu.h linux-2.6.38.6/arch/x86/include/asm/iommu.h
+--- linux-2.6.38.6/arch/x86/include/asm/iommu.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/iommu.h	2011-04-28 19:34:14.000000000 -0400
 @@ -1,7 +1,7 @@
  #ifndef _ASM_X86_IOMMU_H
  #define _ASM_X86_IOMMU_H
@@ -8042,9 +8078,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/iommu.h linux-2.6.38.4/arch/x86/i
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int iommu_pass_through;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/irqflags.h linux-2.6.38.4/arch/x86/include/asm/irqflags.h
---- linux-2.6.38.4/arch/x86/include/asm/irqflags.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/irqflags.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/irqflags.h linux-2.6.38.6/arch/x86/include/asm/irqflags.h
+--- linux-2.6.38.6/arch/x86/include/asm/irqflags.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/irqflags.h	2011-04-28 19:34:14.000000000 -0400
 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
  	sti;					\
  	sysexit
@@ -8057,9 +8093,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/irqflags.h linux-2.6.38.4/arch/x8
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/kprobes.h linux-2.6.38.4/arch/x86/include/asm/kprobes.h
---- linux-2.6.38.4/arch/x86/include/asm/kprobes.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/kprobes.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/kprobes.h linux-2.6.38.6/arch/x86/include/asm/kprobes.h
+--- linux-2.6.38.6/arch/x86/include/asm/kprobes.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/kprobes.h	2011-04-28 19:34:14.000000000 -0400
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -8076,9 +8112,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/kprobes.h linux-2.6.38.4/arch/x86
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/kvm_host.h linux-2.6.38.4/arch/x86/include/asm/kvm_host.h
---- linux-2.6.38.4/arch/x86/include/asm/kvm_host.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/kvm_host.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/kvm_host.h linux-2.6.38.6/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.38.6/arch/x86/include/asm/kvm_host.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/kvm_host.h	2011-04-28 19:57:25.000000000 -0400
 @@ -423,7 +423,7 @@ struct kvm_arch {
  	unsigned int n_used_mmu_pages;
  	unsigned int n_requested_mmu_pages;
@@ -8097,9 +8133,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/kvm_host.h linux-2.6.38.4/arch/x8
  
  int kvm_mmu_module_init(void);
  void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/local.h linux-2.6.38.4/arch/x86/include/asm/local.h
---- linux-2.6.38.4/arch/x86/include/asm/local.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/local.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/local.h linux-2.6.38.6/arch/x86/include/asm/local.h
+--- linux-2.6.38.6/arch/x86/include/asm/local.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/local.h	2011-04-28 19:34:14.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -8252,9 +8288,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/local.h linux-2.6.38.4/arch/x86/i
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mce.h linux-2.6.38.4/arch/x86/include/asm/mce.h
---- linux-2.6.38.4/arch/x86/include/asm/mce.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mce.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/mce.h linux-2.6.38.6/arch/x86/include/asm/mce.h
+--- linux-2.6.38.6/arch/x86/include/asm/mce.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/mce.h	2011-04-28 19:34:14.000000000 -0400
 @@ -198,7 +198,7 @@ int mce_notify_irq(void);
  void mce_notify_process(void);
  
@@ -8264,9 +8300,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/mce.h linux-2.6.38.4/arch/x86/inc
  
  /*
   * Exception handler
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/microcode.h linux-2.6.38.4/arch/x86/include/asm/microcode.h
---- linux-2.6.38.4/arch/x86/include/asm/microcode.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/microcode.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/microcode.h linux-2.6.38.6/arch/x86/include/asm/microcode.h
+--- linux-2.6.38.6/arch/x86/include/asm/microcode.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/microcode.h	2011-04-28 19:34:14.000000000 -0400
 @@ -12,13 +12,13 @@ struct device;
  enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
  
@@ -8313,9 +8349,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/microcode.h linux-2.6.38.4/arch/x
  {
  	return NULL;
  }
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mman.h linux-2.6.38.4/arch/x86/include/asm/mman.h
---- linux-2.6.38.4/arch/x86/include/asm/mman.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mman.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/mman.h linux-2.6.38.6/arch/x86/include/asm/mman.h
+--- linux-2.6.38.6/arch/x86/include/asm/mman.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/mman.h	2011-04-28 19:34:14.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -8331,9 +8367,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/mman.h linux-2.6.38.4/arch/x86/in
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu_context.h linux-2.6.38.4/arch/x86/include/asm/mmu_context.h
---- linux-2.6.38.4/arch/x86/include/asm/mmu_context.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mmu_context.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/mmu_context.h linux-2.6.38.6/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.38.6/arch/x86/include/asm/mmu_context.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/mmu_context.h	2011-04-28 19:34:14.000000000 -0400
 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -8457,9 +8493,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu_context.h linux-2.6.38.4/arch
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu.h linux-2.6.38.4/arch/x86/include/asm/mmu.h
---- linux-2.6.38.4/arch/x86/include/asm/mmu.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/mmu.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/mmu.h linux-2.6.38.6/arch/x86/include/asm/mmu.h
+--- linux-2.6.38.6/arch/x86/include/asm/mmu.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/mmu.h	2011-04-28 19:34:14.000000000 -0400
 @@ -9,10 +9,23 @@
   * we put the segment information here.
   */
@@ -8486,9 +8522,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/mmu.h linux-2.6.38.4/arch/x86/inc
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/module.h linux-2.6.38.4/arch/x86/include/asm/module.h
---- linux-2.6.38.4/arch/x86/include/asm/module.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/module.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/module.h linux-2.6.38.6/arch/x86/include/asm/module.h
+--- linux-2.6.38.6/arch/x86/include/asm/module.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/module.h	2011-04-28 19:34:14.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -8530,9 +8566,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/module.h linux-2.6.38.4/arch/x86/
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/page_64_types.h linux-2.6.38.4/arch/x86/include/asm/page_64_types.h
---- linux-2.6.38.4/arch/x86/include/asm/page_64_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/page_64_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/page_64_types.h linux-2.6.38.6/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.38.6/arch/x86/include/asm/page_64_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/page_64_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -8542,9 +8578,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/page_64_types.h linux-2.6.38.4/ar
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt.h linux-2.6.38.4/arch/x86/include/asm/paravirt.h
---- linux-2.6.38.4/arch/x86/include/asm/paravirt.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/paravirt.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/paravirt.h linux-2.6.38.6/arch/x86/include/asm/paravirt.h
+--- linux-2.6.38.6/arch/x86/include/asm/paravirt.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/paravirt.h	2011-04-28 19:34:14.000000000 -0400
 @@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned
  	pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
@@ -8598,9 +8634,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt.h linux-2.6.38.4/arch/x8
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/paravirt_types.h linux-2.6.38.6/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.38.6/arch/x86/include/asm/paravirt_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/paravirt_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -317,6 +317,12 @@ struct pv_mmu_ops {
  	   an mfn.  We can tell which is which from the index. */
  	void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -8614,9 +8650,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/paravirt_types.h linux-2.6.38.4/a
  };
  
  struct arch_spinlock;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pci_x86.h linux-2.6.38.4/arch/x86/include/asm/pci_x86.h
---- linux-2.6.38.4/arch/x86/include/asm/pci_x86.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pci_x86.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pci_x86.h linux-2.6.38.6/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.38.6/arch/x86/include/asm/pci_x86.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pci_x86.h	2011-04-28 19:34:14.000000000 -0400
 @@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct 
  extern void (*pcibios_disable_irq)(struct pci_dev *dev);
  
@@ -8639,9 +8675,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pci_x86.h linux-2.6.38.4/arch/x86
  extern bool port_cf9_safe;
  
  /* arch_initcall level */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgalloc.h linux-2.6.38.4/arch/x86/include/asm/pgalloc.h
---- linux-2.6.38.4/arch/x86/include/asm/pgalloc.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgalloc.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgalloc.h linux-2.6.38.6/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgalloc.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgalloc.h	2011-04-28 19:34:14.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
  				       pmd_t *pmd, pte_t *pte)
  {
@@ -8656,9 +8692,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgalloc.h linux-2.6.38.4/arch/x86
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.6/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable-2level.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable-2level.h	2011-04-28 19:34:14.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8669,9 +8705,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.38.4/a
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable_32.h linux-2.6.38.6/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable_32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -8715,9 +8751,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32.h linux-2.6.38.4/arch/
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.6/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable_32_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable_32_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8747,9 +8783,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.38.4
  #define MODULES_VADDR	VMALLOC_START
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.6/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable-3level.h	2011-04-18 17:27:13.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable-3level.h	2011-04-28 19:34:14.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8767,9 +8803,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.38.4/a
  }
  
  /*
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable_64.h linux-2.6.38.6/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable_64.h	2011-04-28 19:34:14.000000000 -0400
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8806,9 +8842,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64.h linux-2.6.38.4/arch/
  }
  
  static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.6/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable_64_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable_64_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -8820,9 +8856,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_64_types.h linux-2.6.38.4
 +#define ktva_ktla(addr)		(addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable.h linux-2.6.38.4/arch/x86/include/asm/pgtable.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable.h linux-2.6.38.6/arch/x86/include/asm/pgtable.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable.h	2011-04-28 19:34:14.000000000 -0400
 @@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm
  
  #define arch_end_context_switch(prev)	do {} while(0)
@@ -8992,9 +9028,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable.h linux-2.6.38.4/arch/x86
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/pgtable_types.h linux-2.6.38.6/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.38.6/arch/x86/include/asm/pgtable_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/pgtable_types.h	2011-04-28 19:34:14.000000000 -0400
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -9108,9 +9144,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/pgtable_types.h linux-2.6.38.4/ar
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x86/include/asm/processor.h
---- linux-2.6.38.4/arch/x86/include/asm/processor.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/processor.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/processor.h linux-2.6.38.6/arch/x86/include/asm/processor.h
+--- linux-2.6.38.6/arch/x86/include/asm/processor.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/processor.h	2011-05-11 18:34:57.000000000 -0400
 @@ -270,7 +270,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -9120,7 +9156,7 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -864,8 +864,15 @@ static inline void spin_lock_prefetch(co
+@@ -864,11 +864,18 @@ static inline void spin_lock_prefetch(co
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -9136,7 +9172,11 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x
 +#define STACK_TOP_MAX		TASK_SIZE
  
  #define INIT_THREAD  {							  \
- 	.sp0			= sizeof(init_stack) + (long)&init_stack, \
+-	.sp0			= sizeof(init_stack) + (long)&init_stack, \
++	.sp0			= sizeof(init_stack) + (long)&init_stack - 8, \
+ 	.vm86_info		= NULL,					  \
+ 	.sysenter_cs		= __KERNEL_CS,				  \
+ 	.io_bitmap_ptr		= NULL,					  \
 @@ -882,7 +889,7 @@ static inline void spin_lock_prefetch(co
   */
  #define INIT_TSS  {							  \
@@ -9184,6 +9224,20 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x
  
  #define TASK_SIZE		(test_thread_flag(TIF_IA32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
+@@ -939,11 +942,11 @@ extern unsigned long thread_saved_pc(str
+ #define STACK_TOP_MAX		TASK_SIZE_MAX
+ 
+ #define INIT_THREAD  { \
+-	.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
++	.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
+ }
+ 
+ #define INIT_TSS  { \
+-	.x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
++	.x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
+ }
+ 
+ /*
 @@ -965,6 +968,10 @@ extern void start_thread(struct pt_regs 
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
@@ -9195,9 +9249,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/processor.h linux-2.6.38.4/arch/x
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/ptrace.h linux-2.6.38.4/arch/x86/include/asm/ptrace.h
---- linux-2.6.38.4/arch/x86/include/asm/ptrace.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/ptrace.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/ptrace.h linux-2.6.38.6/arch/x86/include/asm/ptrace.h
+--- linux-2.6.38.6/arch/x86/include/asm/ptrace.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/ptrace.h	2011-04-28 19:34:14.000000000 -0400
 @@ -152,28 +152,29 @@ static inline unsigned long regs_return_
  }
  
@@ -9234,9 +9288,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/ptrace.h linux-2.6.38.4/arch/x86/
  #endif
  }
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/reboot.h linux-2.6.38.4/arch/x86/include/asm/reboot.h
---- linux-2.6.38.4/arch/x86/include/asm/reboot.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/reboot.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/reboot.h linux-2.6.38.6/arch/x86/include/asm/reboot.h
+--- linux-2.6.38.6/arch/x86/include/asm/reboot.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/reboot.h	2011-04-28 19:34:14.000000000 -0400
 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
  
  void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -9246,9 +9300,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/reboot.h linux-2.6.38.4/arch/x86/
  
  typedef void (*nmi_shootdown_cb)(int, struct die_args*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/rwsem.h linux-2.6.38.4/arch/x86/include/asm/rwsem.h
---- linux-2.6.38.4/arch/x86/include/asm/rwsem.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/rwsem.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/rwsem.h linux-2.6.38.6/arch/x86/include/asm/rwsem.h
+--- linux-2.6.38.6/arch/x86/include/asm/rwsem.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/rwsem.h	2011-04-28 19:34:14.000000000 -0400
 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
@@ -9373,9 +9427,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/rwsem.h linux-2.6.38.4/arch/x86/i
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/segment.h linux-2.6.38.4/arch/x86/include/asm/segment.h
---- linux-2.6.38.4/arch/x86/include/asm/segment.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/segment.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/segment.h linux-2.6.38.6/arch/x86/include/asm/segment.h
+--- linux-2.6.38.6/arch/x86/include/asm/segment.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/segment.h	2011-04-28 19:34:14.000000000 -0400
 @@ -62,8 +62,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -9435,9 +9489,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/segment.h linux-2.6.38.4/arch/x86
  #define __KERNEL_DS	(GDT_ENTRY_KERNEL_DS*8)
  #define __USER_DS	(GDT_ENTRY_DEFAULT_USER_DS*8+3)
  #define __USER_CS	(GDT_ENTRY_DEFAULT_USER_CS*8+3)
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/smp.h linux-2.6.38.4/arch/x86/include/asm/smp.h
---- linux-2.6.38.4/arch/x86/include/asm/smp.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/smp.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/smp.h linux-2.6.38.6/arch/x86/include/asm/smp.h
+--- linux-2.6.38.6/arch/x86/include/asm/smp.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/smp.h	2011-04-28 19:34:14.000000000 -0400
 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
  DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
  DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -9464,9 +9518,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/smp.h linux-2.6.38.4/arch/x86/inc
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/spinlock.h linux-2.6.38.4/arch/x86/include/asm/spinlock.h
---- linux-2.6.38.4/arch/x86/include/asm/spinlock.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/spinlock.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/spinlock.h linux-2.6.38.6/arch/x86/include/asm/spinlock.h
+--- linux-2.6.38.6/arch/x86/include/asm/spinlock.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/spinlock.h	2011-04-28 19:34:14.000000000 -0400
 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
@@ -9529,9 +9583,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/spinlock.h linux-2.6.38.4/arch/x8
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/stackprotector.h linux-2.6.38.4/arch/x86/include/asm/stackprotector.h
---- linux-2.6.38.4/arch/x86/include/asm/stackprotector.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/stackprotector.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/stackprotector.h linux-2.6.38.6/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.38.6/arch/x86/include/asm/stackprotector.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/stackprotector.h	2011-04-28 19:34:14.000000000 -0400
 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
  
  static inline void load_stack_canary_segment(void)
@@ -9541,9 +9595,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/stackprotector.h linux-2.6.38.4/a
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/stacktrace.h linux-2.6.38.4/arch/x86/include/asm/stacktrace.h
---- linux-2.6.38.4/arch/x86/include/asm/stacktrace.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/stacktrace.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/stacktrace.h linux-2.6.38.6/arch/x86/include/asm/stacktrace.h
+--- linux-2.6.38.6/arch/x86/include/asm/stacktrace.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/stacktrace.h	2011-04-28 19:34:14.000000000 -0400
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -9594,9 +9648,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/stacktrace.h linux-2.6.38.4/arch/
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/system.h linux-2.6.38.4/arch/x86/include/asm/system.h
---- linux-2.6.38.4/arch/x86/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/system.h linux-2.6.38.6/arch/x86/include/asm/system.h
+--- linux-2.6.38.6/arch/x86/include/asm/system.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/system.h	2011-04-28 19:34:14.000000000 -0400
 @@ -131,7 +131,7 @@ do {									\
  	     "call __switch_to\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
@@ -9633,9 +9687,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/system.h linux-2.6.38.4/arch/x86/
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/thread_info.h linux-2.6.38.4/arch/x86/include/asm/thread_info.h
---- linux-2.6.38.4/arch/x86/include/asm/thread_info.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/thread_info.h	2011-04-30 19:58:48.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/thread_info.h linux-2.6.38.6/arch/x86/include/asm/thread_info.h
+--- linux-2.6.38.6/arch/x86/include/asm/thread_info.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/thread_info.h	2011-04-30 19:58:48.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -9780,9 +9834,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/thread_info.h linux-2.6.38.4/arch
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/uaccess_32.h linux-2.6.38.6/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.38.6/arch/x86/include/asm/uaccess_32.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/uaccess_32.h	2011-04-28 19:34:14.000000000 -0400
 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9939,9 +9993,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_32.h linux-2.6.38.4/arch/
  	return n;
  }
  
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/uaccess_64.h linux-2.6.38.6/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.38.6/arch/x86/include/asm/uaccess_64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/uaccess_64.h	2011-04-28 19:57:25.000000000 -0400
 @@ -11,6 +11,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -10340,9 +10394,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess_64.h linux-2.6.38.4/arch/
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess.h linux-2.6.38.4/arch/x86/include/asm/uaccess.h
---- linux-2.6.38.4/arch/x86/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/uaccess.h linux-2.6.38.6/arch/x86/include/asm/uaccess.h
+--- linux-2.6.38.6/arch/x86/include/asm/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/uaccess.h	2011-04-28 19:34:14.000000000 -0400
 @@ -8,12 +8,15 @@
  #include <linux/thread_info.h>
  #include <linux/prefetch.h>
@@ -10561,9 +10615,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/uaccess.h linux-2.6.38.4/arch/x86
  #ifdef CONFIG_X86_32
  # include "uaccess_32.h"
  #else
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/vgtod.h linux-2.6.38.4/arch/x86/include/asm/vgtod.h
---- linux-2.6.38.4/arch/x86/include/asm/vgtod.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/vgtod.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/vgtod.h linux-2.6.38.6/arch/x86/include/asm/vgtod.h
+--- linux-2.6.38.6/arch/x86/include/asm/vgtod.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/vgtod.h	2011-04-28 19:34:14.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -10572,9 +10626,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/vgtod.h linux-2.6.38.4/arch/x86/i
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/vsyscall.h linux-2.6.38.4/arch/x86/include/asm/vsyscall.h
---- linux-2.6.38.4/arch/x86/include/asm/vsyscall.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/vsyscall.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/vsyscall.h linux-2.6.38.6/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.38.6/arch/x86/include/asm/vsyscall.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/vsyscall.h	2011-04-28 19:34:14.000000000 -0400
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -10605,9 +10659,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/vsyscall.h linux-2.6.38.4/arch/x8
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.38.4/arch/x86/include/asm/xsave.h linux-2.6.38.4/arch/x86/include/asm/xsave.h
---- linux-2.6.38.4/arch/x86/include/asm/xsave.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/include/asm/xsave.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/include/asm/xsave.h linux-2.6.38.6/arch/x86/include/asm/xsave.h
+--- linux-2.6.38.6/arch/x86/include/asm/xsave.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/include/asm/xsave.h	2011-04-28 19:34:14.000000000 -0400
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
  	int err;
@@ -10632,9 +10686,9 @@ diff -urNp linux-2.6.38.4/arch/x86/include/asm/xsave.h linux-2.6.38.4/arch/x86/i
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.38.4/arch/x86/Kconfig linux-2.6.38.4/arch/x86/Kconfig
---- linux-2.6.38.4/arch/x86/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Kconfig	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/Kconfig linux-2.6.38.6/arch/x86/Kconfig
+--- linux-2.6.38.6/arch/x86/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/Kconfig	2011-04-28 19:34:14.000000000 -0400
 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE
  
  config X86_32_LAZY_GS
@@ -10716,9 +10770,9 @@ diff -urNp linux-2.6.38.4/arch/x86/Kconfig linux-2.6.38.4/arch/x86/Kconfig
  	---help---
  	  Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-2.6.38.4/arch/x86/Kconfig.cpu linux-2.6.38.4/arch/x86/Kconfig.cpu
---- linux-2.6.38.4/arch/x86/Kconfig.cpu	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Kconfig.cpu	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/Kconfig.cpu linux-2.6.38.6/arch/x86/Kconfig.cpu
+--- linux-2.6.38.6/arch/x86/Kconfig.cpu	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/Kconfig.cpu	2011-04-28 19:34:14.000000000 -0400
 @@ -339,7 +339,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -10746,9 +10800,9 @@ diff -urNp linux-2.6.38.4/arch/x86/Kconfig.cpu linux-2.6.38.4/arch/x86/Kconfig.c
  
  config X86_MINIMUM_CPU_FAMILY
  	int
-diff -urNp linux-2.6.38.4/arch/x86/Kconfig.debug linux-2.6.38.4/arch/x86/Kconfig.debug
---- linux-2.6.38.4/arch/x86/Kconfig.debug	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Kconfig.debug	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/Kconfig.debug linux-2.6.38.6/arch/x86/Kconfig.debug
+--- linux-2.6.38.6/arch/x86/Kconfig.debug	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/Kconfig.debug	2011-04-28 19:34:14.000000000 -0400
 @@ -101,7 +101,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
@@ -10767,9 +10821,9 @@ diff -urNp linux-2.6.38.4/arch/x86/Kconfig.debug linux-2.6.38.4/arch/x86/Kconfig
  	---help---
  	  This option helps catch unintended modifications to loadable
  	  kernel module's text and read-only data. It also prevents execution
-diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/acpi/sleep.c linux-2.6.38.6/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.38.6/arch/x86/kernel/acpi/sleep.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/acpi/sleep.c	2011-04-28 19:34:14.000000000 -0400
 @@ -18,7 +18,7 @@
  #include "realmode/wakeup.h"
  #include "sleep.h"
@@ -10792,9 +10846,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/sleep.c linux-2.6.38.4/arch/x86/k
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.6/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.38.6/arch/x86/kernel/acpi/wakeup_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/acpi/wakeup_32.S	2011-04-28 19:34:14.000000000 -0400
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
  	# and restore the stack ... but you need gdt for this to work
  	movl	saved_context_esp, %esp
@@ -10811,9 +10865,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.38.4/arch/x
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-2.6.38.4/arch/x86/kernel/alternative.c linux-2.6.38.4/arch/x86/kernel/alternative.c
---- linux-2.6.38.4/arch/x86/kernel/alternative.c	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/alternative.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/alternative.c linux-2.6.38.6/arch/x86/kernel/alternative.c
+--- linux-2.6.38.6/arch/x86/kernel/alternative.c	2011-04-18 17:27:13.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/alternative.c	2011-04-28 19:34:14.000000000 -0400
 @@ -248,7 +248,7 @@ static void alternatives_smp_lock(const 
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
@@ -10927,9 +10981,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/alternative.c linux-2.6.38.4/arch/x86/
  #endif
  
  void __init arch_init_ideal_nop5(void)
-diff -urNp linux-2.6.38.4/arch/x86/kernel/amd_iommu.c linux-2.6.38.4/arch/x86/kernel/amd_iommu.c
---- linux-2.6.38.4/arch/x86/kernel/amd_iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/amd_iommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/amd_iommu.c linux-2.6.38.6/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.38.6/arch/x86/kernel/amd_iommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/amd_iommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
  	}
  }
@@ -10939,9 +10993,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/amd_iommu.c linux-2.6.38.4/arch/x86/ke
  	.alloc_coherent = alloc_coherent,
  	.free_coherent = free_coherent,
  	.map_page = map_page,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/apic.c linux-2.6.38.4/arch/x86/kernel/apic/apic.c
---- linux-2.6.38.4/arch/x86/kernel/apic/apic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/apic/apic.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/apic/apic.c linux-2.6.38.6/arch/x86/kernel/apic/apic.c
+--- linux-2.6.38.6/arch/x86/kernel/apic/apic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/apic/apic.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1819,7 +1819,7 @@ void smp_error_interrupt(struct pt_regs 
  	apic_write(APIC_ESR, 0);
  	v1 = apic_read(APIC_ESR);
@@ -10951,9 +11005,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/apic.c linux-2.6.38.4/arch/x86/ke
  
  	/*
  	 * Here is what the APIC error bits mean:
-diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/apic/io_apic.c linux-2.6.38.6/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.38.6/arch/x86/kernel/apic/io_apic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/apic/io_apic.c	2011-04-28 19:57:25.000000000 -0400
 @@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapi
  	ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
  				GFP_KERNEL);
@@ -11008,9 +11062,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/apic/io_apic.c linux-2.6.38.4/arch/x86
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/apm_32.c linux-2.6.38.4/arch/x86/kernel/apm_32.c
---- linux-2.6.38.4/arch/x86/kernel/apm_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/apm_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/apm_32.c linux-2.6.38.6/arch/x86/kernel/apm_32.c
+--- linux-2.6.38.6/arch/x86/kernel/apm_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/apm_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -11091,9 +11145,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/apm_32.c linux-2.6.38.4/arch/x86/kerne
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.6/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.38.6/arch/x86/kernel/asm-offsets_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/asm-offsets_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -51,7 +51,6 @@ void foo(void)
  	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
  	BLANK();
@@ -11114,9 +11168,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.38.4/arch/x
  #endif
  
  #ifdef CONFIG_XEN
-diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c	2011-04-30 11:45:06.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.6/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.38.6/arch/x86/kernel/asm-offsets_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/asm-offsets_64.c	2011-04-30 11:45:06.000000000 -0400
 @@ -63,6 +63,18 @@ int main(void)
  	OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
  	OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -11152,9 +11206,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.38.4/arch/x
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/amd.c linux-2.6.38.4/arch/x86/kernel/cpu/amd.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/amd.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/amd.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/amd.c linux-2.6.38.6/arch/x86/kernel/cpu/amd.c
+--- linux-2.6.38.6/arch/x86/kernel/cpu/amd.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/amd.c	2011-05-10 22:08:57.000000000 -0400
 @@ -624,7 +624,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
@@ -11164,9 +11218,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/amd.c linux-2.6.38.4/arch/x86/kern
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4/arch/x86/kernel/cpu/common.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/common.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/common.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/common.c linux-2.6.38.6/arch/x86/kernel/cpu/common.c
+--- linux-2.6.38.6/arch/x86/kernel/cpu/common.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/common.c	2011-05-11 18:34:57.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -11263,7 +11317,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4/arch/x86/k
  
  DEFINE_PER_CPU(unsigned long, kernel_stack) =
 -	(unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
-+	(unsigned long)&init_thread_union - 8 + THREAD_SIZE;
++	(unsigned long)&init_thread_union - 16 + THREAD_SIZE;
  EXPORT_PER_CPU_SYMBOL(kernel_stack);
  
  DEFINE_PER_CPU(char *, irq_stack_ptr) =
@@ -11311,9 +11365,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/common.c linux-2.6.38.4/arch/x86/k
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/intel.c linux-2.6.38.4/arch/x86/kernel/cpu/intel.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/intel.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/intel.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/intel.c linux-2.6.38.6/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.38.6/arch/x86/kernel/cpu/intel.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/intel.c	2011-04-28 19:34:14.000000000 -0400
 @@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
  	 * Update the IDT descriptor and reload the IDT so that
  	 * it uses the read-only mapped virtual address.
@@ -11323,9 +11377,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/intel.c linux-2.6.38.4/arch/x86/ke
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/Makefile linux-2.6.38.4/arch/x86/kernel/cpu/Makefile
---- linux-2.6.38.4/arch/x86/kernel/cpu/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/Makefile	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/Makefile linux-2.6.38.6/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.38.6/arch/x86/kernel/cpu/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/Makefile	2011-04-28 19:34:14.000000000 -0400
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -11337,9 +11391,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/Makefile linux-2.6.38.4/arch/x86/k
  obj-y			:= intel_cacheinfo.o scattered.o topology.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
  obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.6/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.38.6/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/mcheck/mce.c	2011-04-28 19:57:25.000000000 -0400
 @@ -45,6 +45,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
@@ -11451,9 +11505,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.38.4/arch/x
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/main.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/main.c	2011-04-28 19:34:14.000000000 -0400
 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -11463,9 +11517,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.38.4/arch/x8
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-04-28 19:34:14.000000000 -0400
 @@ -12,19 +12,19 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
@@ -11494,9 +11548,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.38.4/arch/x8
  };
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.6/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.38.6/arch/x86/kernel/cpu/perf_event.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/cpu/perf_event.c	2011-04-28 19:34:14.000000000 -0400
 @@ -1781,7 +1781,7 @@ perf_callchain_user(struct perf_callchai
  			break;
  
@@ -11506,9 +11560,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/cpu/perf_event.c linux-2.6.38.4/arch/x
  	}
  }
  
-diff -urNp linux-2.6.38.4/arch/x86/kernel/crash.c linux-2.6.38.4/arch/x86/kernel/crash.c
---- linux-2.6.38.4/arch/x86/kernel/crash.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/crash.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/crash.c linux-2.6.38.6/arch/x86/kernel/crash.c
+--- linux-2.6.38.6/arch/x86/kernel/crash.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/crash.c	2011-04-28 19:34:14.000000000 -0400
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
@@ -11518,9 +11572,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/crash.c linux-2.6.38.4/arch/x86/kernel
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/doublefault_32.c linux-2.6.38.4/arch/x86/kernel/doublefault_32.c
---- linux-2.6.38.4/arch/x86/kernel/doublefault_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/doublefault_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/doublefault_32.c linux-2.6.38.6/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.38.6/arch/x86/kernel/doublefault_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/doublefault_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -11552,9 +11606,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/doublefault_32.c linux-2.6.38.4/arch/x
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/dumpstack_32.c linux-2.6.38.6/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.38.6/arch/x86/kernel/dumpstack_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/dumpstack_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task
  
  	bp = stack_frame(task, regs);
@@ -11618,9 +11672,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_32.c linux-2.6.38.4/arch/x86
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/dumpstack_64.c linux-2.6.38.6/arch/x86/kernel/dumpstack_64.c
+--- linux-2.6.38.6/arch/x86/kernel/dumpstack_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/dumpstack_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task
  	unsigned long *irq_stack_end =
  		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -11673,9 +11727,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack_64.c linux-2.6.38.4/arch/x86
  	put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack.c linux-2.6.38.4/arch/x86/kernel/dumpstack.c
---- linux-2.6.38.4/arch/x86/kernel/dumpstack.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/dumpstack.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/dumpstack.c linux-2.6.38.6/arch/x86/kernel/dumpstack.c
+--- linux-2.6.38.6/arch/x86/kernel/dumpstack.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/dumpstack.c	2011-04-28 19:34:14.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11828,10 +11882,10 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/dumpstack.c linux-2.6.38.4/arch/x86/ke
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/kernel/entry_32.S
---- linux-2.6.38.4/arch/x86/kernel/entry_32.S	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/entry_32.S	2011-05-02 19:07:47.000000000 -0400
-@@ -183,13 +183,130 @@
+diff -urNp linux-2.6.38.6/arch/x86/kernel/entry_32.S linux-2.6.38.6/arch/x86/kernel/entry_32.S
+--- linux-2.6.38.6/arch/x86/kernel/entry_32.S	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/entry_32.S	2011-05-10 21:13:12.000000000 -0400
+@@ -183,13 +183,139 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
  .macro SET_KERNEL_GS reg
@@ -11933,6 +11987,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
 +	push %edi
 +
 +	lea -64(%esp), %edi
++	and $-64, %edi
 +	mov $-0xBEEF, %eax
 +	std
 +1:
@@ -11941,10 +11996,18 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
 +	shr $2, %ecx
 +	repne scasl
 +	jecxz 2f
-+	sub $16, %ecx
++
++	and $-64, %edi
++	and $-16, %ecx
++
++	sub $128, %ecx
 +	jc 2f
 +	mov $16, %ecx
 +	repe scasl
++	jne 1b
++	sub $(512 - 64), %edi
++	mov $16, %ecx
++	repe scasl
 +	jecxz 2f
 +	jne 1b
 +2:
@@ -11963,7 +12026,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	cld
  	PUSH_GS
  	pushl_cfi %fs
-@@ -212,7 +329,7 @@
+@@ -212,7 +338,7 @@
  	CFI_REL_OFFSET ecx, 0
  	pushl_cfi %ebx
  	CFI_REL_OFFSET ebx, 0
@@ -11972,7 +12035,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	movl %edx, %ds
  	movl %edx, %es
  	movl $(__KERNEL_PERCPU), %edx
-@@ -220,6 +337,15 @@
+@@ -220,6 +346,15 @@
  	SET_KERNEL_GS %edx
  .endm
  
@@ -11988,7 +12051,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  .macro RESTORE_INT_REGS
  	popl_cfi %ebx
  	CFI_RESTORE ebx
-@@ -330,7 +456,15 @@ check_userspace:
+@@ -330,7 +465,15 @@ check_userspace:
  	movb PT_CS(%esp), %al
  	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
  	cmpl $USER_RPL, %eax
@@ -12004,7 +12067,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  
  ENTRY(resume_userspace)
  	LOCKDEP_SYS_EXIT
-@@ -392,23 +526,34 @@ sysenter_past_esp:
+@@ -392,23 +535,34 @@ sysenter_past_esp:
  	/*CFI_REL_OFFSET cs, 0*/
  	/*
  	 * Push current_thread_info()->sysenter_return to the stack.
@@ -12042,7 +12105,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -431,12 +576,27 @@ sysenter_do_call:
+@@ -431,12 +585,27 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
@@ -12070,7 +12133,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -479,11 +639,17 @@ sysexit_audit:
+@@ -479,11 +648,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -12090,7 +12153,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -516,6 +682,14 @@ syscall_exit:
+@@ -516,6 +691,14 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
@@ -12105,7 +12168,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -575,14 +749,21 @@ ldt_ss:
+@@ -575,14 +758,21 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -12130,7 +12193,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	pushl_cfi $__ESPFIX_SS
  	pushl_cfi %eax			/* new kernel esp */
  	/* Disable interrupts, but do not irqtrace this section: we
-@@ -617,23 +798,17 @@ work_resched:
+@@ -617,23 +807,17 @@ work_resched:
  
  work_notifysig:				# deal with pending signals and
  					# notify-resume requests
@@ -12157,7 +12220,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  #endif
  	xorl %edx, %edx
  	call do_notify_resume
-@@ -668,6 +843,10 @@ END(syscall_exit_work)
+@@ -668,6 +852,10 @@ END(syscall_exit_work)
  
  	RING0_INT_FRAME			# can't unwind into user space anyway
  syscall_fault:
@@ -12168,7 +12231,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	GET_THREAD_INFO(%ebp)
  	movl $-EFAULT,PT_EAX(%esp)
  	jmp resume_userspace
-@@ -750,6 +929,36 @@ ptregs_clone:
+@@ -750,6 +938,36 @@ ptregs_clone:
  	CFI_ENDPROC
  ENDPROC(ptregs_clone)
  
@@ -12205,7 +12268,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -759,8 +968,15 @@ ENDPROC(ptregs_clone)
+@@ -759,8 +977,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -12223,7 +12286,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	shl $16, %eax
  	addl %esp, %eax			/* the adjusted stack pointer */
  	pushl_cfi $__KERNEL_DS
-@@ -1211,7 +1427,6 @@ return_to_handler:
+@@ -1211,7 +1436,6 @@ return_to_handler:
  	jmp *%ecx
  #endif
  
@@ -12231,7 +12294,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1257,9 +1472,12 @@ error_code:
+@@ -1257,9 +1481,12 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -12245,7 +12308,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	TRACE_IRQS_OFF
  	movl %esp,%eax			# pt_regs pointer
  	call *%edi
-@@ -1344,6 +1562,9 @@ nmi_stack_correct:
+@@ -1344,6 +1571,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -12255,7 +12318,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1380,6 +1601,9 @@ nmi_espfix_stack:
+@@ -1380,6 +1610,9 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -12265,9 +12328,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_32.S linux-2.6.38.4/arch/x86/ker
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/kernel/entry_64.S
---- linux-2.6.38.4/arch/x86/kernel/entry_64.S	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/entry_64.S	2011-05-02 19:08:17.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/entry_64.S linux-2.6.38.6/arch/x86/kernel/entry_64.S
+--- linux-2.6.38.6/arch/x86/kernel/entry_64.S	2011-04-18 17:27:13.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/entry_64.S	2011-05-10 21:12:16.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -12276,7 +12339,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -174,6 +175,242 @@ ENTRY(native_usergs_sysret64)
+@@ -174,6 +175,251 @@ ENTRY(native_usergs_sysret64)
  ENDPROC(native_usergs_sysret64)
  #endif /* CONFIG_PARAVIRT */
  
@@ -12385,6 +12448,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
 +	push %rdi
 +
 +	lea -128(%rsp), %rdi
++	and $-64, %rdi
 +	mov $-0xBEEF, %rax
 +	std
 +1:
@@ -12393,10 +12457,18 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
 +	shr $3, %ecx
 +	repne scasq
 +	jecxz 2f
-+	sub $8, %ecx
++
++	and $-64, %rdi
++	and $-8, %ecx
++
++	sub $64, %ecx
 +	jc 2f
 +	mov $8, %ecx
 +	repe scasq
++	jne 1b
++	sub $(512 - 64), %rdi
++	mov $8, %ecx
++	repe scasq
 +	jecxz 2f
 +	jne 1b
 +2:
@@ -12519,7 +12591,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -316,7 +553,7 @@ ENTRY(save_args)
+@@ -316,7 +562,7 @@ ENTRY(save_args)
  	leaq -RBP+8(%rsp),%rdi	/* arg1 for handler */
  	movq_cfi rbp, 8		/* push %rbp */
  	leaq 8(%rsp), %rbp		/* mov %rsp, %ebp */
@@ -12528,7 +12600,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	je 1f
  	SWAPGS
  	/*
-@@ -407,7 +644,7 @@ ENTRY(ret_from_fork)
+@@ -407,7 +653,7 @@ ENTRY(ret_from_fork)
  
  	RESTORE_REST
  
@@ -12537,7 +12609,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	je   int_ret_from_sys_call
  
  	testl $_TIF_IA32, TI_flags(%rcx)	# 32-bit compat task needs IRET
-@@ -453,7 +690,7 @@ END(ret_from_fork)
+@@ -453,7 +699,7 @@ END(ret_from_fork)
  ENTRY(system_call)
  	CFI_STARTPROC	simple
  	CFI_SIGNAL_FRAME
@@ -12546,7 +12618,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	CFI_REGISTER	rip,rcx
  	/*CFI_REGISTER	rflags,r11*/
  	SWAPGS_UNSAFE_STACK
-@@ -466,12 +703,13 @@ ENTRY(system_call_after_swapgs)
+@@ -466,12 +712,13 @@ ENTRY(system_call_after_swapgs)
  
  	movq	%rsp,PER_CPU_VAR(old_rsp)
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -12561,7 +12633,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	movq  %rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq  %rcx,RIP-ARGOFFSET(%rsp)
  	CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -500,6 +738,7 @@ sysret_check:
+@@ -500,6 +747,7 @@ sysret_check:
  	andl %edi,%edx
  	jnz  sysret_careful
  	CFI_REMEMBER_STATE
@@ -12569,7 +12641,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	/*
  	 * sysretq will re-enable interrupts:
  	 */
-@@ -609,7 +848,7 @@ tracesys:
+@@ -609,7 +857,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
@@ -12578,7 +12650,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	je retint_restore_args
  	movl $_TIF_ALLWORK_MASK,%edi
  	/* edi:	mask to check */
-@@ -791,6 +1030,16 @@ END(interrupt)
+@@ -791,6 +1039,16 @@ END(interrupt)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
  	call save_args
  	PARTIAL_FRAME 0
@@ -12595,7 +12667,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	call \func
  	.endm
  
-@@ -823,7 +1072,7 @@ ret_from_intr:
+@@ -823,7 +1081,7 @@ ret_from_intr:
  	CFI_ADJUST_CFA_OFFSET	-8
  exit_intr:
  	GET_THREAD_INFO(%rcx)
@@ -12604,7 +12676,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -845,12 +1094,14 @@ retint_swapgs:		/* return to user-space 
+@@ -845,12 +1103,14 @@ retint_swapgs:		/* return to user-space 
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -12619,7 +12691,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -1022,6 +1273,16 @@ ENTRY(\sym)
+@@ -1022,6 +1282,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -12636,7 +12708,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1039,6 +1300,16 @@ ENTRY(\sym)
+@@ -1039,6 +1309,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -12653,7 +12725,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1047,7 +1318,7 @@ ENTRY(\sym)
+@@ -1047,7 +1327,7 @@ ENTRY(\sym)
  END(\sym)
  .endm
  
@@ -12662,7 +12734,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
  	INTR_FRAME
-@@ -1057,8 +1328,24 @@ ENTRY(\sym)
+@@ -1057,8 +1337,24 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -12687,7 +12759,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
  	call \do_sym
  	addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
-@@ -1075,6 +1362,16 @@ ENTRY(\sym)
+@@ -1075,6 +1371,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -12704,7 +12776,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1094,6 +1391,16 @@ ENTRY(\sym)
+@@ -1094,6 +1400,16 @@ ENTRY(\sym)
  	call save_paranoid
  	DEFAULT_FRAME 0
  	TRACE_IRQS_OFF
@@ -12721,7 +12793,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1356,14 +1663,27 @@ ENTRY(paranoid_exit)
+@@ -1356,14 +1672,27 @@ ENTRY(paranoid_exit)
  	TRACE_IRQS_OFF
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
@@ -12750,7 +12822,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	TRACE_IRQS_IRETQ 0
  	RESTORE_ALL 8
  	jmp irq_return
-@@ -1421,7 +1741,7 @@ ENTRY(error_entry)
+@@ -1421,7 +1750,7 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -12759,7 +12831,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	je error_kernelspace
  error_swapgs:
  	SWAPGS
-@@ -1485,6 +1805,16 @@ ENTRY(nmi)
+@@ -1485,6 +1814,16 @@ ENTRY(nmi)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	DEFAULT_FRAME 0
@@ -12776,7 +12848,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1495,11 +1825,25 @@ ENTRY(nmi)
+@@ -1495,11 +1834,25 @@ ENTRY(nmi)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz nmi_restore
@@ -12803,9 +12875,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/entry_64.S linux-2.6.38.4/arch/x86/ker
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ftrace.c linux-2.6.38.4/arch/x86/kernel/ftrace.c
---- linux-2.6.38.4/arch/x86/kernel/ftrace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ftrace.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/ftrace.c linux-2.6.38.6/arch/x86/kernel/ftrace.c
+--- linux-2.6.38.6/arch/x86/kernel/ftrace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/ftrace.c	2011-04-28 19:57:25.000000000 -0400
 @@ -126,7 +126,7 @@ static void *mod_code_ip;		/* holds the 
  static void *mod_code_newcode;		/* holds the text to write to the IP */
  
@@ -12863,9 +12935,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/ftrace.c linux-2.6.38.4/arch/x86/kerne
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-2.6.38.4/arch/x86/kernel/head32.c linux-2.6.38.4/arch/x86/kernel/head32.c
---- linux-2.6.38.4/arch/x86/kernel/head32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/head32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/head32.c linux-2.6.38.6/arch/x86/kernel/head32.c
+--- linux-2.6.38.6/arch/x86/kernel/head32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/head32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -12883,9 +12955,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/head32.c linux-2.6.38.4/arch/x86/kerne
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4/arch/x86/kernel/head_32.S
---- linux-2.6.38.4/arch/x86/kernel/head_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/head_32.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/head_32.S linux-2.6.38.6/arch/x86/kernel/head_32.S
+--- linux-2.6.38.6/arch/x86/kernel/head_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/head_32.S	2011-05-11 18:34:57.000000000 -0400
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -13044,10 +13116,10 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4/arch/x86/kern
 -	.long lguest_entry		/* lguest hypervisor */
 -	.long xen_entry			/* Xen hypervisor */
 -	.long default_entry		/* Moorestown MID */
-+	.long pa(default_entry)		/* normal x86/PC */
-+	.long pa(lguest_entry)		/* lguest hypervisor */
-+	.long pa(xen_entry)		/* Xen hypervisor */
-+	.long pa(default_entry)		/* Moorestown MID */
++	.long ta(default_entry)		/* normal x86/PC */
++	.long ta(lguest_entry)		/* lguest hypervisor */
++	.long ta(xen_entry)		/* Xen hypervisor */
++	.long ta(default_entry)		/* Moorestown MID */
  num_subarch_entries = (. - subarch_entries) / 4
  .previous
  #else
@@ -13320,9 +13392,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/head_32.S linux-2.6.38.4/arch/x86/kern
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff -urNp linux-2.6.38.4/arch/x86/kernel/head_64.S linux-2.6.38.4/arch/x86/kernel/head_64.S
---- linux-2.6.38.4/arch/x86/kernel/head_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/head_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/head_64.S linux-2.6.38.6/arch/x86/kernel/head_64.S
+--- linux-2.6.38.6/arch/x86/kernel/head_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/head_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -13592,9 +13664,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/head_64.S linux-2.6.38.4/arch/x86/kern
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.6/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.38.6/arch/x86/kernel/i386_ksyms_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/i386_ksyms_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -13616,9 +13688,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.38.4/arch/x8
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.38.4/arch/x86/kernel/i8259.c linux-2.6.38.4/arch/x86/kernel/i8259.c
---- linux-2.6.38.4/arch/x86/kernel/i8259.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/i8259.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/i8259.c linux-2.6.38.6/arch/x86/kernel/i8259.c
+--- linux-2.6.38.6/arch/x86/kernel/i8259.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/i8259.c	2011-04-28 19:57:25.000000000 -0400
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
  			       "spurious 8259A interrupt: IRQ%d.\n", irq);
  			spurious_irq_mask |= irqmask;
@@ -13628,9 +13700,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/i8259.c linux-2.6.38.4/arch/x86/kernel
  		/*
  		 * Theoretically we do not have to handle this IRQ,
  		 * but in Linux this does not cause problems and is
-diff -urNp linux-2.6.38.4/arch/x86/kernel/init_task.c linux-2.6.38.4/arch/x86/kernel/init_task.c
---- linux-2.6.38.4/arch/x86/kernel/init_task.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/init_task.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/init_task.c linux-2.6.38.6/arch/x86/kernel/init_task.c
+--- linux-2.6.38.6/arch/x86/kernel/init_task.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/init_task.c	2011-04-28 19:34:14.000000000 -0400
 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
   * way process stacks are handled. This is done by having a special
   * "init_task" linker map entry..
@@ -13649,9 +13721,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/init_task.c linux-2.6.38.4/arch/x86/ke
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ioport.c linux-2.6.38.4/arch/x86/kernel/ioport.c
---- linux-2.6.38.4/arch/x86/kernel/ioport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ioport.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/ioport.c linux-2.6.38.6/arch/x86/kernel/ioport.c
+--- linux-2.6.38.6/arch/x86/kernel/ioport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/ioport.c	2011-04-28 19:34:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -13695,9 +13767,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/ioport.c linux-2.6.38.4/arch/x86/kerne
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-2.6.38.4/arch/x86/kernel/irq_32.c linux-2.6.38.4/arch/x86/kernel/irq_32.c
---- linux-2.6.38.4/arch/x86/kernel/irq_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/irq_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/irq_32.c linux-2.6.38.6/arch/x86/kernel/irq_32.c
+--- linux-2.6.38.6/arch/x86/kernel/irq_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/irq_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -13839,9 +13911,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/irq_32.c linux-2.6.38.4/arch/x86/kerne
  		/*
  		 * Shouldnt happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/irq.c linux-2.6.38.4/arch/x86/kernel/irq.c
---- linux-2.6.38.4/arch/x86/kernel/irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/irq.c linux-2.6.38.6/arch/x86/kernel/irq.c
+--- linux-2.6.38.6/arch/x86/kernel/irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -16,7 +16,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -13876,9 +13948,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/irq.c linux-2.6.38.4/arch/x86/kernel/i
  #endif
  	return sum;
  }
-diff -urNp linux-2.6.38.4/arch/x86/kernel/kgdb.c linux-2.6.38.4/arch/x86/kernel/kgdb.c
---- linux-2.6.38.4/arch/x86/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/kgdb.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/kgdb.c linux-2.6.38.6/arch/x86/kernel/kgdb.c
+--- linux-2.6.38.6/arch/x86/kernel/kgdb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/kgdb.c	2011-04-28 19:57:25.000000000 -0400
 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  	switch (regno) {
  #ifdef CONFIG_X86_32
@@ -13926,9 +13998,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/kgdb.c linux-2.6.38.4/arch/x86/kernel/
  	/* Breakpoint instruction: */
  	.gdb_bpt_instr		= { 0xcc },
  	.flags			= KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/kprobes.c linux-2.6.38.4/arch/x86/kernel/kprobes.c
---- linux-2.6.38.4/arch/x86/kernel/kprobes.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/kprobes.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/kprobes.c linux-2.6.38.6/arch/x86/kernel/kprobes.c
+--- linux-2.6.38.6/arch/x86/kernel/kprobes.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/kprobes.c	2011-04-28 19:34:14.000000000 -0400
 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
  	} __attribute__((packed)) *insn;
  
@@ -14062,9 +14134,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/kprobes.c linux-2.6.38.4/arch/x86/kern
  	       RELATIVE_ADDR_SIZE);
  
  	insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ldt.c linux-2.6.38.4/arch/x86/kernel/ldt.c
---- linux-2.6.38.4/arch/x86/kernel/ldt.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ldt.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/ldt.c linux-2.6.38.6/arch/x86/kernel/ldt.c
+--- linux-2.6.38.6/arch/x86/kernel/ldt.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/ldt.c	2011-04-28 19:34:14.000000000 -0400
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
@@ -14129,9 +14201,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/ldt.c linux-2.6.38.4/arch/x86/kernel/l
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.6/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.38.6/arch/x86/kernel/machine_kexec_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/machine_kexec_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -14159,9 +14231,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.38.4/arch
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_amd.c linux-2.6.38.4/arch/x86/kernel/microcode_amd.c
---- linux-2.6.38.4/arch/x86/kernel/microcode_amd.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/microcode_amd.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/microcode_amd.c linux-2.6.38.6/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.38.6/arch/x86/kernel/microcode_amd.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/microcode_amd.c	2011-04-28 19:34:14.000000000 -0400
 @@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int c
  	uci->mc = NULL;
  }
@@ -14180,9 +14252,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_amd.c linux-2.6.38.4/arch/x8
  {
  	return &microcode_amd_ops;
  }
-diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_core.c linux-2.6.38.4/arch/x86/kernel/microcode_core.c
---- linux-2.6.38.4/arch/x86/kernel/microcode_core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/microcode_core.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/microcode_core.c linux-2.6.38.6/arch/x86/kernel/microcode_core.c
+--- linux-2.6.38.6/arch/x86/kernel/microcode_core.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/microcode_core.c	2011-04-28 19:34:14.000000000 -0400
 @@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
  
  #define MICROCODE_VERSION	"2.00"
@@ -14192,9 +14264,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_core.c linux-2.6.38.4/arch/x
  
  /*
   * Synchronization.
-diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_intel.c linux-2.6.38.4/arch/x86/kernel/microcode_intel.c
---- linux-2.6.38.4/arch/x86/kernel/microcode_intel.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/microcode_intel.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/microcode_intel.c linux-2.6.38.6/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.38.6/arch/x86/kernel/microcode_intel.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/microcode_intel.c	2011-04-28 19:34:14.000000000 -0400
 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -14229,9 +14301,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/microcode_intel.c linux-2.6.38.4/arch/
  {
  	return &microcode_intel_ops;
  }
-diff -urNp linux-2.6.38.4/arch/x86/kernel/module.c linux-2.6.38.4/arch/x86/kernel/module.c
---- linux-2.6.38.4/arch/x86/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/module.c linux-2.6.38.6/arch/x86/kernel/module.c
+--- linux-2.6.38.6/arch/x86/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/module.c	2011-04-28 19:34:14.000000000 -0400
 @@ -35,21 +35,66 @@
  #define DEBUGP(fmt...)
  #endif
@@ -14370,9 +14442,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/module.c linux-2.6.38.4/arch/x86/kerne
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt.c linux-2.6.38.4/arch/x86/kernel/paravirt.c
---- linux-2.6.38.4/arch/x86/kernel/paravirt.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/paravirt.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/paravirt.c linux-2.6.38.6/arch/x86/kernel/paravirt.c
+--- linux-2.6.38.6/arch/x86/kernel/paravirt.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/paravirt.c	2011-04-28 19:34:14.000000000 -0400
 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
   * corresponding structure. */
  static void *get_call_destination(u8 type)
@@ -14476,9 +14548,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt.c linux-2.6.38.4/arch/x86/ker
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.6/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.38.6/arch/x86/kernel/paravirt-spinlocks.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/paravirt-spinlocks.c	2011-04-28 19:34:14.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
  	arch_spin_lock(lock);
  }
@@ -14488,9 +14560,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.38.4/ar
  #ifdef CONFIG_SMP
  	.spin_is_locked = __ticket_spin_is_locked,
  	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.6/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.38.6/arch/x86/kernel/pci-calgary_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/pci-calgary_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -476,7 +476,7 @@ static void calgary_free_coherent(struct
  	free_pages((unsigned long)vaddr, get_order(size));
  }
@@ -14500,9 +14572,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-calgary_64.c linux-2.6.38.4/arch/x
  	.alloc_coherent = calgary_alloc_coherent,
  	.free_coherent = calgary_free_coherent,
  	.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-dma.c linux-2.6.38.4/arch/x86/kernel/pci-dma.c
---- linux-2.6.38.4/arch/x86/kernel/pci-dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-dma.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/pci-dma.c linux-2.6.38.6/arch/x86/kernel/pci-dma.c
+--- linux-2.6.38.6/arch/x86/kernel/pci-dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/pci-dma.c	2011-04-28 19:34:14.000000000 -0400
 @@ -16,7 +16,7 @@
  
  static int forbid_dac __read_mostly;
@@ -14521,10 +14593,10 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-dma.c linux-2.6.38.4/arch/x86/kern
  
  #ifdef CONFIG_PCI
  	if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c	2011-04-28 19:34:14.000000000 -0400
-@@ -706,7 +706,7 @@ static __init int init_amd_gatt(struct a
+diff -urNp linux-2.6.38.6/arch/x86/kernel/pci-gart_64.c linux-2.6.38.6/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.38.6/arch/x86/kernel/pci-gart_64.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/pci-gart_64.c	2011-05-10 22:06:52.000000000 -0400
+@@ -713,7 +713,7 @@ static __init int init_amd_gatt(struct a
  	return -1;
  }
  
@@ -14533,9 +14605,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-gart_64.c linux-2.6.38.4/arch/x86/
  	.map_sg				= gart_map_sg,
  	.unmap_sg			= gart_unmap_sg,
  	.map_page			= gart_map_page,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-nommu.c linux-2.6.38.4/arch/x86/kernel/pci-nommu.c
---- linux-2.6.38.4/arch/x86/kernel/pci-nommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-nommu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/pci-nommu.c linux-2.6.38.6/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.38.6/arch/x86/kernel/pci-nommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/pci-nommu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
  	flush_write_buffers();
  }
@@ -14545,9 +14617,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-nommu.c linux-2.6.38.4/arch/x86/ke
  	.alloc_coherent		= dma_generic_alloc_coherent,
  	.free_coherent		= nommu_free_coherent,
  	.map_sg			= nommu_map_sg,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.6/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.38.6/arch/x86/kernel/pci-swiotlb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/pci-swiotlb.c	2011-04-28 19:34:14.000000000 -0400
 @@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(
  	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
  }
@@ -14557,9 +14629,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/pci-swiotlb.c linux-2.6.38.4/arch/x86/
  	.mapping_error = swiotlb_dma_mapping_error,
  	.alloc_coherent = x86_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.38.4/arch/x86/kernel/process_32.c linux-2.6.38.4/arch/x86/kernel/process_32.c
---- linux-2.6.38.4/arch/x86/kernel/process_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/process_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/process_32.c linux-2.6.38.6/arch/x86/kernel/process_32.c
+--- linux-2.6.38.6/arch/x86/kernel/process_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/process_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -14639,9 +14711,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/process_32.c linux-2.6.38.4/arch/x86/k
  	return 0;
  }
 -
-diff -urNp linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4/arch/x86/kernel/process_64.c
---- linux-2.6.38.4/arch/x86/kernel/process_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/process_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/process_64.c linux-2.6.38.6/arch/x86/kernel/process_64.c
+--- linux-2.6.38.6/arch/x86/kernel/process_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/process_64.c	2011-05-11 18:34:57.000000000 -0400
 @@ -87,7 +87,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -14657,7 +14729,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4/arch/x86/k
  
 -	childregs = ((struct pt_regs *)
 -			(THREAD_SIZE + task_stack_page(p))) - 1;
-+	childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
++	childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
  	*childregs = *regs;
  
  	childregs->ax = 0;
@@ -14688,19 +14760,19 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/process_64.c linux-2.6.38.4/arch/x86/k
  		return 0;
  	stack = (unsigned long)task_stack_page(p);
 -	if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
-+	if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-8-sizeof(u64))
++	if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
  		return 0;
  	fp = *(u64 *)(p->thread.sp);
  	do {
 -		if (fp < (unsigned long)stack ||
 -		    fp >= (unsigned long)stack+THREAD_SIZE)
-+		if (fp < stack || fp > stack+THREAD_SIZE-8-sizeof(u64))
++		if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/x86/kernel/process.c
---- linux-2.6.38.4/arch/x86/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/process.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/process.c linux-2.6.38.6/arch/x86/kernel/process.c
+--- linux-2.6.38.6/arch/x86/kernel/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/process.c	2011-05-11 18:34:57.000000000 -0400
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -14781,7 +14853,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/x86/kern
  #else
  	regs.ss = __KERNEL_DS;
  #endif
-@@ -668,16 +688,31 @@ static int __init idle_setup(char *str)
+@@ -668,16 +688,34 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
@@ -14808,10 +14880,13 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/x86/kern
 +
 +	/* P4 seems to return a 0 LSB, ignore it */
 +#ifdef CONFIG_MPENTIUM4
-+	time &= 0x1EUL;
++	time &= 0x3EUL;
 +	time <<= 2;
-+#else
++#elif defined(CONFIG_X86_64)
 +	time &= 0xFUL;
++	time <<= 4;
++#else
++	time &= 0x1FUL;
 +	time <<= 3;
 +#endif
 +
@@ -14823,9 +14898,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/process.c linux-2.6.38.4/arch/x86/kern
 +#endif
 +}
 +#endif
-diff -urNp linux-2.6.38.4/arch/x86/kernel/ptrace.c linux-2.6.38.4/arch/x86/kernel/ptrace.c
---- linux-2.6.38.4/arch/x86/kernel/ptrace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/ptrace.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/ptrace.c linux-2.6.38.6/arch/x86/kernel/ptrace.c
+--- linux-2.6.38.6/arch/x86/kernel/ptrace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/ptrace.c	2011-04-28 19:34:14.000000000 -0400
 @@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *chi
  		 unsigned long addr, unsigned long data)
  {
@@ -14879,9 +14954,40 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/ptrace.c linux-2.6.38.4/arch/x86/kerne
  {
  	bool step;
  
-diff -urNp linux-2.6.38.4/arch/x86/kernel/reboot.c linux-2.6.38.4/arch/x86/kernel/reboot.c
---- linux-2.6.38.4/arch/x86/kernel/reboot.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/reboot.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/pvclock.c linux-2.6.38.6/arch/x86/kernel/pvclock.c
+--- linux-2.6.38.6/arch/x86/kernel/pvclock.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/pvclock.c	2011-05-11 18:35:16.000000000 -0400
+@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
+ 	return pv_tsc_khz;
+ }
+ 
+-static atomic64_t last_value = ATOMIC64_INIT(0);
++static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
+ 
+ void pvclock_resume(void)
+ {
+-	atomic64_set(&last_value, 0);
++	atomic64_set_unchecked(&last_value, 0);
+ }
+ 
+ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
+@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct 
+ 	 * updating at the same time, and one of them could be slightly behind,
+ 	 * making the assumption that last_value always go forward fail to hold.
+ 	 */
+-	last = atomic64_read(&last_value);
++	last = atomic64_read_unchecked(&last_value);
+ 	do {
+ 		if (ret < last)
+ 			return last;
+-		last = atomic64_cmpxchg(&last_value, last, ret);
++		last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
+ 	} while (unlikely(last != ret));
+ 
+ 	return ret;
+diff -urNp linux-2.6.38.6/arch/x86/kernel/reboot.c linux-2.6.38.6/arch/x86/kernel/reboot.c
+--- linux-2.6.38.6/arch/x86/kernel/reboot.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/reboot.c	2011-04-28 19:34:14.000000000 -0400
 @@ -34,7 +34,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -14938,9 +15044,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/reboot.c linux-2.6.38.4/arch/x86/kerne
  
  	/* Set up the IDT for real mode. */
  	load_idt(&real_mode_idt);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/setup.c linux-2.6.38.4/arch/x86/kernel/setup.c
---- linux-2.6.38.4/arch/x86/kernel/setup.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/setup.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/setup.c linux-2.6.38.6/arch/x86/kernel/setup.c
+--- linux-2.6.38.6/arch/x86/kernel/setup.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/setup.c	2011-04-28 19:34:14.000000000 -0400
 @@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
  	 * area (640->1Mb) as ram even though it is not.
  	 * take them out.
@@ -14970,9 +15076,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/setup.c linux-2.6.38.4/arch/x86/kernel
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/setup_percpu.c linux-2.6.38.4/arch/x86/kernel/setup_percpu.c
---- linux-2.6.38.4/arch/x86/kernel/setup_percpu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/setup_percpu.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/setup_percpu.c linux-2.6.38.6/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.38.6/arch/x86/kernel/setup_percpu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/setup_percpu.c	2011-04-28 19:34:14.000000000 -0400
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -15036,9 +15142,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/setup_percpu.c linux-2.6.38.4/arch/x86
  		/*
  		 * Up to this point, the boot CPU has been using .init.data
  		 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.38.4/arch/x86/kernel/signal.c linux-2.6.38.4/arch/x86/kernel/signal.c
---- linux-2.6.38.4/arch/x86/kernel/signal.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/signal.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/signal.c linux-2.6.38.6/arch/x86/kernel/signal.c
+--- linux-2.6.38.6/arch/x86/kernel/signal.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/signal.c	2011-04-28 19:34:14.000000000 -0400
 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
  	 * Align the stack pointer according to the i386 ABI,
  	 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -15113,9 +15219,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/signal.c linux-2.6.38.4/arch/x86/kerne
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4/arch/x86/kernel/smpboot.c
---- linux-2.6.38.4/arch/x86/kernel/smpboot.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/smpboot.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/smpboot.c linux-2.6.38.6/arch/x86/kernel/smpboot.c
+--- linux-2.6.38.6/arch/x86/kernel/smpboot.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/smpboot.c	2011-05-11 18:34:57.000000000 -0400
 @@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int api
  	set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
@@ -15130,7 +15236,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4/arch/x86/kern
 -	per_cpu(kernel_stack, cpu) =
 -		(unsigned long)task_stack_page(c_idle.idle) -
 -		KERNEL_STACK_OFFSET + THREAD_SIZE;
-+	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 8 + THREAD_SIZE;
++	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
  #endif
 +
 +	pax_open_kernel();
@@ -15153,9 +15259,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/smpboot.c linux-2.6.38.4/arch/x86/kern
  	err = do_boot_cpu(apicid, cpu);
  	if (err) {
  		pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/step.c linux-2.6.38.4/arch/x86/kernel/step.c
---- linux-2.6.38.4/arch/x86/kernel/step.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/step.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/step.c linux-2.6.38.6/arch/x86/kernel/step.c
+--- linux-2.6.38.6/arch/x86/kernel/step.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/step.c	2011-04-28 19:34:14.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
@@ -15198,17 +15304,17 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/step.c linux-2.6.38.4/arch/x86/kernel/
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/syscall_table_32.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/syscall_table_32.S linux-2.6.38.6/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.38.6/arch/x86/kernel/syscall_table_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/syscall_table_32.S	2011-04-28 19:34:14.000000000 -0400
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
-diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/sys_i386_32.c linux-2.6.38.6/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.38.6/arch/x86/kernel/sys_i386_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/sys_i386_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -15446,9 +15552,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_i386_32.c linux-2.6.38.4/arch/x86/
 +
 +	return addr;
  }
-diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/sys_x86_64.c linux-2.6.38.6/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.38.6/arch/x86/kernel/sys_x86_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/sys_x86_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -15586,9 +15692,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/sys_x86_64.c linux-2.6.38.4/arch/x86/k
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/tboot.c linux-2.6.38.4/arch/x86/kernel/tboot.c
---- linux-2.6.38.4/arch/x86/kernel/tboot.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/tboot.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/tboot.c linux-2.6.38.6/arch/x86/kernel/tboot.c
+--- linux-2.6.38.6/arch/x86/kernel/tboot.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/tboot.c	2011-04-28 19:57:25.000000000 -0400
 @@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
  	tboot_shutdown(acpi_shutdown_map[sleep_state]);
  }
@@ -15619,9 +15725,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/tboot.c linux-2.6.38.4/arch/x86/kernel
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff -urNp linux-2.6.38.4/arch/x86/kernel/time.c linux-2.6.38.4/arch/x86/kernel/time.c
---- linux-2.6.38.4/arch/x86/kernel/time.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/time.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/time.c linux-2.6.38.6/arch/x86/kernel/time.c
+--- linux-2.6.38.6/arch/x86/kernel/time.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/time.c	2011-04-28 19:34:14.000000000 -0400
 @@ -22,17 +22,13 @@
  #include <asm/hpet.h>
  #include <asm/time.h>
@@ -15660,9 +15766,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/time.c linux-2.6.38.4/arch/x86/kernel/
  	}
  	return pc;
  }
-diff -urNp linux-2.6.38.4/arch/x86/kernel/tls.c linux-2.6.38.4/arch/x86/kernel/tls.c
---- linux-2.6.38.4/arch/x86/kernel/tls.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/tls.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/tls.c linux-2.6.38.6/arch/x86/kernel/tls.c
+--- linux-2.6.38.6/arch/x86/kernel/tls.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/tls.c	2011-04-28 19:34:14.000000000 -0400
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
  	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
  		return -EINVAL;
@@ -15675,9 +15781,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/tls.c linux-2.6.38.4/arch/x86/kernel/t
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_32.S linux-2.6.38.4/arch/x86/kernel/trampoline_32.S
---- linux-2.6.38.4/arch/x86/kernel/trampoline_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/trampoline_32.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/trampoline_32.S linux-2.6.38.6/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.38.6/arch/x86/kernel/trampoline_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/trampoline_32.S	2011-04-28 19:34:14.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -15700,9 +15806,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_32.S linux-2.6.38.4/arch/x8
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_64.S linux-2.6.38.4/arch/x86/kernel/trampoline_64.S
---- linux-2.6.38.4/arch/x86/kernel/trampoline_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/trampoline_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/trampoline_64.S linux-2.6.38.6/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.38.6/arch/x86/kernel/trampoline_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/trampoline_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -91,7 +91,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
@@ -15721,9 +15827,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/trampoline_64.S linux-2.6.38.4/arch/x8
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-2.6.38.4/arch/x86/kernel/traps.c linux-2.6.38.4/arch/x86/kernel/traps.c
---- linux-2.6.38.4/arch/x86/kernel/traps.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/traps.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/traps.c linux-2.6.38.6/arch/x86/kernel/traps.c
+--- linux-2.6.38.6/arch/x86/kernel/traps.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/traps.c	2011-04-28 19:34:14.000000000 -0400
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -15885,9 +15991,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/traps.c linux-2.6.38.4/arch/x86/kernel
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-2.6.38.4/arch/x86/kernel/vm86_32.c linux-2.6.38.4/arch/x86/kernel/vm86_32.c
---- linux-2.6.38.4/arch/x86/kernel/vm86_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/vm86_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/vm86_32.c linux-2.6.38.6/arch/x86/kernel/vm86_32.c
+--- linux-2.6.38.6/arch/x86/kernel/vm86_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/vm86_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -15952,9 +16058,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/vm86_32.c linux-2.6.38.4/arch/x86/kern
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.6/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.38.6/arch/x86/kernel/vmlinux.lds.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/vmlinux.lds.S	2011-04-28 19:34:14.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -16251,9 +16357,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.38.4/arch/x86/
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/vsyscall_64.c linux-2.6.38.6/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.38.6/arch/x86/kernel/vsyscall_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/vsyscall_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
  
  	write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -16271,9 +16377,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/vsyscall_64.c linux-2.6.38.4/arch/x86/
  		p = tcache->blob[1];
  	} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
  		/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.6/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.38.6/arch/x86/kernel/x8664_ksyms_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/x8664_ksyms_64.c	2011-04-28 19:34:14.000000000 -0400
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -16283,9 +16389,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.38.4/arch/x
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.38.4/arch/x86/kernel/xsave.c linux-2.6.38.4/arch/x86/kernel/xsave.c
---- linux-2.6.38.4/arch/x86/kernel/xsave.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kernel/xsave.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kernel/xsave.c linux-2.6.38.6/arch/x86/kernel/xsave.c
+--- linux-2.6.38.6/arch/x86/kernel/xsave.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kernel/xsave.c	2011-04-28 19:34:14.000000000 -0400
 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -EINVAL;
@@ -16313,9 +16419,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kernel/xsave.c linux-2.6.38.4/arch/x86/kernel
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-2.6.38.4/arch/x86/kvm/emulate.c linux-2.6.38.4/arch/x86/kvm/emulate.c
---- linux-2.6.38.4/arch/x86/kvm/emulate.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/emulate.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kvm/emulate.c linux-2.6.38.6/arch/x86/kvm/emulate.c
+--- linux-2.6.38.6/arch/x86/kvm/emulate.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/emulate.c	2011-04-28 19:34:14.000000000 -0400
 @@ -88,7 +88,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
@@ -16350,9 +16456,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/emulate.c linux-2.6.38.4/arch/x86/kvm/emu
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-2.6.38.4/arch/x86/kvm/lapic.c linux-2.6.38.4/arch/x86/kvm/lapic.c
---- linux-2.6.38.4/arch/x86/kvm/lapic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/lapic.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kvm/lapic.c linux-2.6.38.6/arch/x86/kvm/lapic.c
+--- linux-2.6.38.6/arch/x86/kvm/lapic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/lapic.c	2011-04-28 19:34:14.000000000 -0400
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -16362,9 +16468,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/lapic.c linux-2.6.38.4/arch/x86/kvm/lapic
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.38.4/arch/x86/kvm/mmu.c linux-2.6.38.4/arch/x86/kvm/mmu.c
---- linux-2.6.38.4/arch/x86/kvm/mmu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/mmu.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kvm/mmu.c linux-2.6.38.6/arch/x86/kvm/mmu.c
+--- linux-2.6.38.6/arch/x86/kvm/mmu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/mmu.c	2011-04-28 19:57:25.000000000 -0400
 @@ -3271,7 +3271,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
  	pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
@@ -16383,9 +16489,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/mmu.c linux-2.6.38.4/arch/x86/kvm/mmu.c
  		gentry = 0;
  	kvm_mmu_access_page(vcpu, gfn);
  	kvm_mmu_free_some_pages(vcpu);
-diff -urNp linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h
---- linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kvm/paging_tmpl.h linux-2.6.38.6/arch/x86/kvm/paging_tmpl.h
+--- linux-2.6.38.6/arch/x86/kvm/paging_tmpl.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/paging_tmpl.h	2011-04-28 19:57:25.000000000 -0400
 @@ -674,7 +674,7 @@ static void FNAME(invlpg)(struct kvm_vcp
  	if (need_flush)
  		kvm_flush_remote_tlbs(vcpu->kvm);
@@ -16395,10 +16501,10 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/paging_tmpl.h linux-2.6.38.4/arch/x86/kvm
  
  	spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm/svm.c
---- linux-2.6.38.4/arch/x86/kvm/svm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/svm.c	2011-04-28 19:57:25.000000000 -0400
-@@ -3273,7 +3273,11 @@ static void reload_tss(struct kvm_vcpu *
+diff -urNp linux-2.6.38.6/arch/x86/kvm/svm.c linux-2.6.38.6/arch/x86/kvm/svm.c
+--- linux-2.6.38.6/arch/x86/kvm/svm.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/svm.c	2011-05-10 22:08:57.000000000 -0400
+@@ -3276,7 +3276,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
  
  	struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -16410,7 +16516,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm/svm.c
  	load_TR_desc();
  }
  
-@@ -3643,6 +3647,10 @@ static void svm_vcpu_run(struct kvm_vcpu
+@@ -3651,6 +3655,10 @@ static void svm_vcpu_run(struct kvm_vcpu
  	loadsegment(fs, svm->host.fs);
  #endif
  
@@ -16421,7 +16527,7 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm/svm.c
  	reload_tss(vcpu);
  
  	local_irq_disable();
-@@ -3850,7 +3858,7 @@ static void svm_fpu_deactivate(struct kv
+@@ -3858,7 +3866,7 @@ static void svm_fpu_deactivate(struct kv
  	update_cr0_intercept(svm);
  }
  
@@ -16430,9 +16536,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/svm.c linux-2.6.38.4/arch/x86/kvm/svm.c
  	.cpu_has_kvm_support = has_svm,
  	.disabled_by_bios = is_disabled,
  	.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.38.4/arch/x86/kvm/vmx.c linux-2.6.38.4/arch/x86/kvm/vmx.c
---- linux-2.6.38.4/arch/x86/kvm/vmx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/vmx.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kvm/vmx.c linux-2.6.38.6/arch/x86/kvm/vmx.c
+--- linux-2.6.38.6/arch/x86/kvm/vmx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/vmx.c	2011-04-28 19:57:25.000000000 -0400
 @@ -725,7 +725,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
@@ -16520,9 +16626,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/vmx.c linux-2.6.38.4/arch/x86/kvm/vmx.c
  	.cpu_has_kvm_support = cpu_has_kvm_support,
  	.disabled_by_bios = vmx_disabled_by_bios,
  	.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.38.4/arch/x86/kvm/x86.c linux-2.6.38.4/arch/x86/kvm/x86.c
---- linux-2.6.38.4/arch/x86/kvm/x86.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/kvm/x86.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/kvm/x86.c linux-2.6.38.6/arch/x86/kvm/x86.c
+--- linux-2.6.38.6/arch/x86/kvm/x86.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/kvm/x86.c	2011-04-28 19:34:14.000000000 -0400
 @@ -93,7 +93,7 @@ static void update_cr8_intercept(struct 
  static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
  				    struct kvm_cpuid_entry2 __user *entries);
@@ -16610,9 +16716,9 @@ diff -urNp linux-2.6.38.4/arch/x86/kvm/x86.c linux-2.6.38.4/arch/x86/kvm/x86.c
  
  	if (kvm_x86_ops) {
  		printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_32.c linux-2.6.38.4/arch/x86/lib/atomic64_32.c
---- linux-2.6.38.4/arch/x86/lib/atomic64_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/atomic64_32.c	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/atomic64_32.c linux-2.6.38.6/arch/x86/lib/atomic64_32.c
+--- linux-2.6.38.6/arch/x86/lib/atomic64_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/atomic64_32.c	2011-05-02 19:07:09.000000000 -0400
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -16691,9 +16797,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_32.c linux-2.6.38.4/arch/x86/lib
  long long atomic64_dec_if_positive_386(atomic64_t *v);
  EXPORT_SYMBOL(atomic64_dec_if_positive_386);
  int atomic64_inc_not_zero_386(atomic64_t *v);
-diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_386_32.S linux-2.6.38.4/arch/x86/lib/atomic64_386_32.S
---- linux-2.6.38.4/arch/x86/lib/atomic64_386_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/atomic64_386_32.S	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/atomic64_386_32.S linux-2.6.38.6/arch/x86/lib/atomic64_386_32.S
+--- linux-2.6.38.6/arch/x86/lib/atomic64_386_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/atomic64_386_32.S	2011-05-02 19:07:09.000000000 -0400
 @@ -50,6 +50,10 @@ BEGIN(read)
  	movl  (v), %eax
  	movl 4(v), %edx
@@ -16949,9 +17055,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_386_32.S linux-2.6.38.4/arch/x86
  	js 1f
  	movl %eax,  (v)
  	movl %edx, 4(v)
-diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S
---- linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.6/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.38.6/arch/x86/lib/atomic64_cx8_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/atomic64_cx8_32.S	2011-05-02 19:07:09.000000000 -0400
 @@ -41,6 +41,14 @@ ENTRY(atomic64_read_cx8)
  	CFI_ENDPROC
  ENDPROC(atomic64_read_cx8)
@@ -17130,9 +17236,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/atomic64_cx8_32.S linux-2.6.38.4/arch/x86
  	LOCK_PREFIX
  	cmpxchg8b (%esi)
  	jne 1b
-diff -urNp linux-2.6.38.4/arch/x86/lib/checksum_32.S linux-2.6.38.4/arch/x86/lib/checksum_32.S
---- linux-2.6.38.4/arch/x86/lib/checksum_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/checksum_32.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/checksum_32.S linux-2.6.38.6/arch/x86/lib/checksum_32.S
+--- linux-2.6.38.6/arch/x86/lib/checksum_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/checksum_32.S	2011-04-28 19:34:14.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -17393,9 +17499,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/checksum_32.S linux-2.6.38.4/arch/x86/lib
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-2.6.38.4/arch/x86/lib/clear_page_64.S linux-2.6.38.4/arch/x86/lib/clear_page_64.S
---- linux-2.6.38.4/arch/x86/lib/clear_page_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/clear_page_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/clear_page_64.S linux-2.6.38.6/arch/x86/lib/clear_page_64.S
+--- linux-2.6.38.6/arch/x86/lib/clear_page_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/clear_page_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -17405,9 +17511,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/clear_page_64.S linux-2.6.38.4/arch/x86/l
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.38.4/arch/x86/lib/copy_page_64.S linux-2.6.38.4/arch/x86/lib/copy_page_64.S
---- linux-2.6.38.4/arch/x86/lib/copy_page_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/copy_page_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/copy_page_64.S linux-2.6.38.6/arch/x86/lib/copy_page_64.S
+--- linux-2.6.38.6/arch/x86/lib/copy_page_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/copy_page_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -17417,9 +17523,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/copy_page_64.S linux-2.6.38.4/arch/x86/li
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_64.S linux-2.6.38.4/arch/x86/lib/copy_user_64.S
---- linux-2.6.38.4/arch/x86/lib/copy_user_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/copy_user_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/copy_user_64.S linux-2.6.38.6/arch/x86/lib/copy_user_64.S
+--- linux-2.6.38.6/arch/x86/lib/copy_user_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/copy_user_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -15,13 +15,14 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17476,9 +17582,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_64.S linux-2.6.38.4/arch/x86/li
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.6/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.38.6/arch/x86/lib/copy_user_nocache_64.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/copy_user_nocache_64.S	2011-04-28 19:34:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -17503,9 +17609,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/copy_user_nocache_64.S linux-2.6.38.4/arc
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff -urNp linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.6/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.38.6/arch/x86/lib/csum-wrappers_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/csum-wrappers_64.c	2011-04-28 19:57:25.000000000 -0400
 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
@@ -17532,9 +17638,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/csum-wrappers_64.c linux-2.6.38.4/arch/x8
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff -urNp linux-2.6.38.4/arch/x86/lib/getuser.S linux-2.6.38.4/arch/x86/lib/getuser.S
---- linux-2.6.38.4/arch/x86/lib/getuser.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/getuser.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/getuser.S linux-2.6.38.6/arch/x86/lib/getuser.S
+--- linux-2.6.38.6/arch/x86/lib/getuser.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/getuser.S	2011-04-28 19:34:14.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17640,9 +17746,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/getuser.S linux-2.6.38.4/arch/x86/lib/get
  4:	movq -7(%_ASM_AX),%_ASM_DX
  	xor %eax,%eax
  	ret
-diff -urNp linux-2.6.38.4/arch/x86/lib/insn.c linux-2.6.38.4/arch/x86/lib/insn.c
---- linux-2.6.38.4/arch/x86/lib/insn.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/insn.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/insn.c linux-2.6.38.6/arch/x86/lib/insn.c
+--- linux-2.6.38.6/arch/x86/lib/insn.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/insn.c	2011-04-28 19:34:14.000000000 -0400
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -17666,9 +17772,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/insn.c linux-2.6.38.4/arch/x86/lib/insn.c
  	insn->x86_64 = x86_64 ? 1 : 0;
  	insn->opnd_bytes = 4;
  	if (x86_64)
-diff -urNp linux-2.6.38.4/arch/x86/lib/mmx_32.c linux-2.6.38.4/arch/x86/lib/mmx_32.c
---- linux-2.6.38.4/arch/x86/lib/mmx_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/mmx_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/mmx_32.c linux-2.6.38.6/arch/x86/lib/mmx_32.c
+--- linux-2.6.38.6/arch/x86/lib/mmx_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/mmx_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
@@ -17984,9 +18090,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/mmx_32.c linux-2.6.38.4/arch/x86/lib/mmx_
  
  		from += 64;
  		to += 64;
-diff -urNp linux-2.6.38.4/arch/x86/lib/putuser.S linux-2.6.38.4/arch/x86/lib/putuser.S
---- linux-2.6.38.4/arch/x86/lib/putuser.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/putuser.S	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/putuser.S linux-2.6.38.6/arch/x86/lib/putuser.S
+--- linux-2.6.38.6/arch/x86/lib/putuser.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/putuser.S	2011-04-28 19:34:14.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -18124,9 +18230,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/putuser.S linux-2.6.38.4/arch/x86/lib/put
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_32.c linux-2.6.38.4/arch/x86/lib/usercopy_32.c
---- linux-2.6.38.4/arch/x86/lib/usercopy_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/usercopy_32.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/usercopy_32.c linux-2.6.38.6/arch/x86/lib/usercopy_32.c
+--- linux-2.6.38.6/arch/x86/lib/usercopy_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/usercopy_32.c	2011-04-28 19:34:14.000000000 -0400
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -18747,9 +18853,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_32.c linux-2.6.38.4/arch/x86/lib
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_64.c linux-2.6.38.4/arch/x86/lib/usercopy_64.c
---- linux-2.6.38.4/arch/x86/lib/usercopy_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/lib/usercopy_64.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/lib/usercopy_64.c linux-2.6.38.6/arch/x86/lib/usercopy_64.c
+--- linux-2.6.38.6/arch/x86/lib/usercopy_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/lib/usercopy_64.c	2011-04-28 19:57:25.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -18798,9 +18904,9 @@ diff -urNp linux-2.6.38.4/arch/x86/lib/usercopy_64.c linux-2.6.38.4/arch/x86/lib
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.38.4/arch/x86/Makefile linux-2.6.38.4/arch/x86/Makefile
---- linux-2.6.38.4/arch/x86/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/Makefile	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/Makefile linux-2.6.38.6/arch/x86/Makefile
+--- linux-2.6.38.6/arch/x86/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/Makefile	2011-04-28 19:34:14.000000000 -0400
 @@ -195,3 +195,12 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
@@ -18814,9 +18920,9 @@ diff -urNp linux-2.6.38.4/arch/x86/Makefile linux-2.6.38.4/arch/x86/Makefile
 +
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.38.4/arch/x86/mm/extable.c linux-2.6.38.4/arch/x86/mm/extable.c
---- linux-2.6.38.4/arch/x86/mm/extable.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/extable.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/extable.c linux-2.6.38.6/arch/x86/mm/extable.c
+--- linux-2.6.38.6/arch/x86/mm/extable.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/extable.c	2011-04-28 19:34:14.000000000 -0400
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -18890,9 +18996,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/extable.c linux-2.6.38.4/arch/x86/mm/extab
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.38.4/arch/x86/mm/fault.c linux-2.6.38.4/arch/x86/mm/fault.c
---- linux-2.6.38.4/arch/x86/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/fault.c linux-2.6.38.6/arch/x86/mm/fault.c
+--- linux-2.6.38.6/arch/x86/mm/fault.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/fault.c	2011-04-28 19:34:14.000000000 -0400
 @@ -12,10 +12,18 @@
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
  #include <linux/perf_event.h>		/* perf_sw_event		*/
@@ -19562,9 +19668,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/fault.c linux-2.6.38.4/arch/x86/mm/fault.c
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.38.4/arch/x86/mm/gup.c linux-2.6.38.4/arch/x86/mm/gup.c
---- linux-2.6.38.4/arch/x86/mm/gup.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/gup.c	2011-04-28 19:34:14.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/gup.c linux-2.6.38.6/arch/x86/mm/gup.c
+--- linux-2.6.38.6/arch/x86/mm/gup.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/gup.c	2011-04-28 19:34:14.000000000 -0400
 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -19574,9 +19680,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/gup.c linux-2.6.38.4/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-2.6.38.4/arch/x86/mm/highmem_32.c linux-2.6.38.4/arch/x86/mm/highmem_32.c
---- linux-2.6.38.4/arch/x86/mm/highmem_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/highmem_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/highmem_32.c linux-2.6.38.6/arch/x86/mm/highmem_32.c
+--- linux-2.6.38.6/arch/x86/mm/highmem_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/highmem_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -19588,9 +19694,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/highmem_32.c linux-2.6.38.4/arch/x86/mm/hi
  
  	return (void *)vaddr;
  }
-diff -urNp linux-2.6.38.4/arch/x86/mm/hugetlbpage.c linux-2.6.38.4/arch/x86/mm/hugetlbpage.c
---- linux-2.6.38.4/arch/x86/mm/hugetlbpage.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/hugetlbpage.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/hugetlbpage.c linux-2.6.38.6/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.38.6/arch/x86/mm/hugetlbpage.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/hugetlbpage.c	2011-04-28 19:34:15.000000000 -0400
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -19798,9 +19904,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/hugetlbpage.c linux-2.6.38.4/arch/x86/mm/h
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.38.4/arch/x86/mm/init_32.c linux-2.6.38.4/arch/x86/mm/init_32.c
---- linux-2.6.38.4/arch/x86/mm/init_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/init_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/init_32.c linux-2.6.38.6/arch/x86/mm/init_32.c
+--- linux-2.6.38.6/arch/x86/mm/init_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/init_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -20075,9 +20181,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/init_32.c linux-2.6.38.4/arch/x86/mm/init_
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff -urNp linux-2.6.38.4/arch/x86/mm/init_64.c linux-2.6.38.4/arch/x86/mm/init_64.c
---- linux-2.6.38.4/arch/x86/mm/init_64.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/init_64.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/init_64.c linux-2.6.38.6/arch/x86/mm/init_64.c
+--- linux-2.6.38.6/arch/x86/mm/init_64.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/init_64.c	2011-04-28 19:34:15.000000000 -0400
 @@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -20189,9 +20295,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/init_64.c linux-2.6.38.4/arch/x86/mm/init_
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-2.6.38.4/arch/x86/mm/init.c linux-2.6.38.4/arch/x86/mm/init.c
---- linux-2.6.38.4/arch/x86/mm/init.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/init.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/init.c linux-2.6.38.6/arch/x86/mm/init.c
+--- linux-2.6.38.6/arch/x86/mm/init.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/init.c	2011-04-28 19:34:15.000000000 -0400
 @@ -72,11 +72,7 @@ static void __init find_early_table_spac
  	 * cause a hotspot and fill up ZONE_DMA. The page tables
  	 * need roughly 0.5KB per GB.
@@ -20310,9 +20416,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/init.c linux-2.6.38.4/arch/x86/mm/init.c
  	free_init_pages("unused kernel memory",
  			(unsigned long)(&__init_begin),
  			(unsigned long)(&__init_end));
-diff -urNp linux-2.6.38.4/arch/x86/mm/iomap_32.c linux-2.6.38.4/arch/x86/mm/iomap_32.c
---- linux-2.6.38.4/arch/x86/mm/iomap_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/iomap_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/iomap_32.c linux-2.6.38.6/arch/x86/mm/iomap_32.c
+--- linux-2.6.38.6/arch/x86/mm/iomap_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/iomap_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	type = kmap_atomic_idx_push();
  	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -20325,9 +20431,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/iomap_32.c linux-2.6.38.4/arch/x86/mm/ioma
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-2.6.38.4/arch/x86/mm/ioremap.c linux-2.6.38.4/arch/x86/mm/ioremap.c
---- linux-2.6.38.4/arch/x86/mm/ioremap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/ioremap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/ioremap.c linux-2.6.38.6/arch/x86/mm/ioremap.c
+--- linux-2.6.38.6/arch/x86/mm/ioremap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/ioremap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(re
  	for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
  		int is_ram = page_is_ram(pfn);
@@ -20356,9 +20462,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/ioremap.c linux-2.6.38.4/arch/x86/mm/iorem
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.6/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.38.6/arch/x86/mm/kmemcheck/kmemcheck.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/kmemcheck/kmemcheck.c	2011-04-28 19:34:15.000000000 -0400
 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
  	 * memory (e.g. tracked pages)? For now, we need this to avoid
  	 * invoking kmemcheck for PnP BIOS calls.
@@ -20371,9 +20477,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.38.4/arch/
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.38.4/arch/x86/mm/mmap.c linux-2.6.38.4/arch/x86/mm/mmap.c
---- linux-2.6.38.4/arch/x86/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/mmap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/mmap.c linux-2.6.38.6/arch/x86/mm/mmap.c
+--- linux-2.6.38.6/arch/x86/mm/mmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/mmap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -20455,9 +20561,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/mmap.c linux-2.6.38.4/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.38.4/arch/x86/mm/mmio-mod.c linux-2.6.38.4/arch/x86/mm/mmio-mod.c
---- linux-2.6.38.4/arch/x86/mm/mmio-mod.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/mmio-mod.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/mmio-mod.c linux-2.6.38.6/arch/x86/mm/mmio-mod.c
+--- linux-2.6.38.6/arch/x86/mm/mmio-mod.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/mmio-mod.c	2011-04-28 19:57:25.000000000 -0400
 @@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p, 
  static void ioremap_trace_core(resource_size_t offset, unsigned long size,
  							void __iomem *addr)
@@ -20476,9 +20582,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/mmio-mod.c linux-2.6.38.4/arch/x86/mm/mmio
  	};
  	map.map_id = trace->id;
  
-diff -urNp linux-2.6.38.4/arch/x86/mm/numa_32.c linux-2.6.38.4/arch/x86/mm/numa_32.c
---- linux-2.6.38.4/arch/x86/mm/numa_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/numa_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/numa_32.c linux-2.6.38.6/arch/x86/mm/numa_32.c
+--- linux-2.6.38.6/arch/x86/mm/numa_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/numa_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int
  }
  #endif
@@ -20487,9 +20593,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/numa_32.c linux-2.6.38.4/arch/x86/mm/numa_
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr.c linux-2.6.38.4/arch/x86/mm/pageattr.c
---- linux-2.6.38.4/arch/x86/mm/pageattr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pageattr.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/pageattr.c linux-2.6.38.6/arch/x86/mm/pageattr.c
+--- linux-2.6.38.6/arch/x86/mm/pageattr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/pageattr.c	2011-04-28 19:34:15.000000000 -0400
 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
  	 */
  #ifdef CONFIG_PCI_BIOS
@@ -20574,9 +20680,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr.c linux-2.6.38.4/arch/x86/mm/page
  }
  
  static int
-diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr-test.c linux-2.6.38.4/arch/x86/mm/pageattr-test.c
---- linux-2.6.38.4/arch/x86/mm/pageattr-test.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pageattr-test.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/pageattr-test.c linux-2.6.38.6/arch/x86/mm/pageattr-test.c
+--- linux-2.6.38.6/arch/x86/mm/pageattr-test.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/pageattr-test.c	2011-04-28 19:34:15.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -20586,9 +20692,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pageattr-test.c linux-2.6.38.4/arch/x86/mm
  }
  
  struct split_state {
-diff -urNp linux-2.6.38.4/arch/x86/mm/pat.c linux-2.6.38.4/arch/x86/mm/pat.c
---- linux-2.6.38.4/arch/x86/mm/pat.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pat.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/pat.c linux-2.6.38.6/arch/x86/mm/pat.c
+--- linux-2.6.38.6/arch/x86/mm/pat.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/pat.c	2011-04-28 19:34:15.000000000 -0400
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
  	if (!entry) {
@@ -20636,9 +20742,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pat.c linux-2.6.38.4/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable_32.c linux-2.6.38.4/arch/x86/mm/pgtable_32.c
---- linux-2.6.38.4/arch/x86/mm/pgtable_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pgtable_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/pgtable_32.c linux-2.6.38.6/arch/x86/mm/pgtable_32.c
+--- linux-2.6.38.6/arch/x86/mm/pgtable_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/pgtable_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
  		return;
  	}
@@ -20653,10 +20759,10 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable_32.c linux-2.6.38.4/arch/x86/mm/pg
  
  	/*
  	 * It's enough to flush this one mapping.
-diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtable.c
---- linux-2.6.38.4/arch/x86/mm/pgtable.c	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/pgtable.c	2011-04-28 19:34:15.000000000 -0400
-@@ -84,9 +84,58 @@ static inline void pgd_list_del(pgd_t *p
+diff -urNp linux-2.6.38.6/arch/x86/mm/pgtable.c linux-2.6.38.6/arch/x86/mm/pgtable.c
+--- linux-2.6.38.6/arch/x86/mm/pgtable.c	2011-04-18 17:27:13.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/pgtable.c	2011-05-11 18:34:57.000000000 -0400
+@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
  
@@ -20682,13 +20788,10 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
 +#else
 +		*dst++ = *src++;
 +#endif
-+
+ 
 +}
 +#endif
 +
-+#ifdef CONFIG_PAX_PER_CPU_PGD
-+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
-+static inline void pgd_dtor(pgd_t *pgd) {}
 +#ifdef CONFIG_X86_64
 +#define pxd_t				pud_t
 +#define pyd_t				pgd_t
@@ -20706,18 +20809,15 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
 +#define pyd_offset(mm ,address)		pud_offset((mm), (address))
 +#define PYD_SIZE			PUD_SIZE
 +#endif
++
++#ifdef CONFIG_PAX_PER_CPU_PGD
++static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
++static inline void pgd_dtor(pgd_t *pgd) {}
 +#else
-+#define pxd_t				pmd_t
-+#define pyd_t				pud_t
-+#define paravirt_release_pxd(pfn)	paravirt_release_pmd(pfn)
-+#define pxd_free(mm, pmd)		pmd_free((mm), (pmd))
-+#define pyd_populate(mm, pud, pmd)	pud_populate((mm), (pud), (pmd))
-+#define pyd_offset(mm ,address)		pud_offset((mm), (address))
-+#define PYD_SIZE			PUD_SIZE
- 
  static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
  {
-@@ -128,6 +177,7 @@ static void pgd_dtor(pgd_t *pgd)
+ 	BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
+@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
  	pgd_list_del(pgd);
  	spin_unlock(&pgd_lock);
  }
@@ -20725,7 +20825,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  
  /*
   * List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -140,7 +190,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
   * -- wli
   */
  
@@ -20734,7 +20834,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  /*
   * In PAE mode, we need to do a cr3 reload (=tlb flush) when
   * updating the top-level pagetable entries to guarantee the
-@@ -152,7 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
   * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
   * and initialize the kernel pmds here.
   */
@@ -20743,7 +20843,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  
  void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  {
-@@ -170,36 +220,38 @@ void pud_populate(struct mm_struct *mm, 
+@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, 
  	 */
  	flush_tlb_mm(mm);
  }
@@ -20793,7 +20893,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  		return -ENOMEM;
  	}
  
-@@ -212,51 +264,55 @@ static int preallocate_pmds(pmd_t *pmds[
+@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -20866,7 +20966,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  
  	pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
  
-@@ -265,11 +321,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
  	mm->pgd = pgd;
  
@@ -20880,7 +20980,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  
  	/*
  	 * Make sure that pre-populating the pmds is atomic with
-@@ -279,14 +335,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  	spin_lock(&pgd_lock);
  
  	pgd_ctor(mm, pgd);
@@ -20898,7 +20998,7 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  out_free_pgd:
  	free_page((unsigned long)pgd);
  out:
-@@ -295,7 +351,7 @@ out:
+@@ -295,7 +344,7 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)
  {
@@ -20907,9 +21007,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/pgtable.c linux-2.6.38.4/arch/x86/mm/pgtab
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-2.6.38.4/arch/x86/mm/setup_nx.c linux-2.6.38.4/arch/x86/mm/setup_nx.c
---- linux-2.6.38.4/arch/x86/mm/setup_nx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/setup_nx.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/setup_nx.c linux-2.6.38.6/arch/x86/mm/setup_nx.c
+--- linux-2.6.38.6/arch/x86/mm/setup_nx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/setup_nx.c	2011-04-28 19:34:15.000000000 -0400
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -20939,9 +21039,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/setup_nx.c linux-2.6.38.4/arch/x86/mm/setu
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-2.6.38.4/arch/x86/mm/tlb.c linux-2.6.38.4/arch/x86/mm/tlb.c
---- linux-2.6.38.4/arch/x86/mm/tlb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/mm/tlb.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/mm/tlb.c linux-2.6.38.6/arch/x86/mm/tlb.c
+--- linux-2.6.38.6/arch/x86/mm/tlb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/mm/tlb.c	2011-04-28 19:34:15.000000000 -0400
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -20954,9 +21054,9 @@ diff -urNp linux-2.6.38.4/arch/x86/mm/tlb.c linux-2.6.38.4/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-2.6.38.4/arch/x86/oprofile/backtrace.c linux-2.6.38.4/arch/x86/oprofile/backtrace.c
---- linux-2.6.38.4/arch/x86/oprofile/backtrace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/oprofile/backtrace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/oprofile/backtrace.c linux-2.6.38.6/arch/x86/oprofile/backtrace.c
+--- linux-2.6.38.6/arch/x86/oprofile/backtrace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/oprofile/backtrace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_fram
  	struct stack_frame_ia32 *fp;
  
@@ -20975,9 +21075,9 @@ diff -urNp linux-2.6.38.4/arch/x86/oprofile/backtrace.c linux-2.6.38.4/arch/x86/
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack,
-diff -urNp linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/oprofile/op_model_p4.c linux-2.6.38.6/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.38.6/arch/x86/oprofile/op_model_p4.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/oprofile/op_model_p4.c	2011-04-28 19:34:15.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
  #endif
  }
@@ -20987,9 +21087,9 @@ diff -urNp linux-2.6.38.4/arch/x86/oprofile/op_model_p4.c linux-2.6.38.4/arch/x8
  {
  #ifdef CONFIG_SMP
  	return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.38.4/arch/x86/pci/ce4100.c linux-2.6.38.4/arch/x86/pci/ce4100.c
---- linux-2.6.38.4/arch/x86/pci/ce4100.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/ce4100.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/ce4100.c linux-2.6.38.6/arch/x86/pci/ce4100.c
+--- linux-2.6.38.6/arch/x86/pci/ce4100.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/ce4100.c	2011-04-28 19:34:15.000000000 -0400
 @@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned in
  	return pci_direct_conf1.write(seg, bus, devfn, reg, len, value);
  }
@@ -20999,9 +21099,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/ce4100.c linux-2.6.38.4/arch/x86/pci/ce41
  	.read =	ce4100_conf_read,
  	.write = ce4100_conf_write,
  };
-diff -urNp linux-2.6.38.4/arch/x86/pci/common.c linux-2.6.38.4/arch/x86/pci/common.c
---- linux-2.6.38.4/arch/x86/pci/common.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/common.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/common.c linux-2.6.38.6/arch/x86/pci/common.c
+--- linux-2.6.38.6/arch/x86/pci/common.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/common.c	2011-04-28 19:34:15.000000000 -0400
 @@ -33,8 +33,8 @@ int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
@@ -21013,9 +21113,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/common.c linux-2.6.38.4/arch/x86/pci/comm
  
  int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
  						int reg, int len, u32 *val)
-diff -urNp linux-2.6.38.4/arch/x86/pci/direct.c linux-2.6.38.4/arch/x86/pci/direct.c
---- linux-2.6.38.4/arch/x86/pci/direct.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/direct.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/direct.c linux-2.6.38.6/arch/x86/pci/direct.c
+--- linux-2.6.38.6/arch/x86/pci/direct.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/direct.c	2011-04-28 19:34:15.000000000 -0400
 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
  
  #undef PCI_CONF1_ADDRESS
@@ -21043,9 +21143,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/direct.c linux-2.6.38.4/arch/x86/pci/dire
  {
  	u32 x = 0;
  	int year, devfn;
-diff -urNp linux-2.6.38.4/arch/x86/pci/fixup.c linux-2.6.38.4/arch/x86/pci/fixup.c
---- linux-2.6.38.4/arch/x86/pci/fixup.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/fixup.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/fixup.c linux-2.6.38.6/arch/x86/pci/fixup.c
+--- linux-2.6.38.6/arch/x86/pci/fixup.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/fixup.c	2011-04-28 19:34:15.000000000 -0400
 @@ -435,7 +435,7 @@ static const struct dmi_system_id __devi
  			DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"),
  		},
@@ -21055,9 +21155,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/fixup.c linux-2.6.38.4/arch/x86/pci/fixup
  };
  
  static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_32.c linux-2.6.38.4/arch/x86/pci/mmconfig_32.c
---- linux-2.6.38.4/arch/x86/pci/mmconfig_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/mmconfig_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/mmconfig_32.c linux-2.6.38.6/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.38.6/arch/x86/pci/mmconfig_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/mmconfig_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int 
  	return 0;
  }
@@ -21067,9 +21167,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_32.c linux-2.6.38.4/arch/x86/pci
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_64.c linux-2.6.38.4/arch/x86/pci/mmconfig_64.c
---- linux-2.6.38.4/arch/x86/pci/mmconfig_64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/mmconfig_64.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/mmconfig_64.c linux-2.6.38.6/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.38.6/arch/x86/pci/mmconfig_64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/mmconfig_64.c	2011-04-28 19:34:15.000000000 -0400
 @@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int 
  	return 0;
  }
@@ -21079,9 +21179,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/mmconfig_64.c linux-2.6.38.4/arch/x86/pci
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.38.4/arch/x86/pci/numaq_32.c linux-2.6.38.4/arch/x86/pci/numaq_32.c
---- linux-2.6.38.4/arch/x86/pci/numaq_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/numaq_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/numaq_32.c linux-2.6.38.6/arch/x86/pci/numaq_32.c
+--- linux-2.6.38.6/arch/x86/pci/numaq_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/numaq_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
  
  #undef PCI_CONF1_MQ_ADDRESS
@@ -21091,9 +21191,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/numaq_32.c linux-2.6.38.4/arch/x86/pci/nu
  	.read	= pci_conf1_mq_read,
  	.write	= pci_conf1_mq_write
  };
-diff -urNp linux-2.6.38.4/arch/x86/pci/olpc.c linux-2.6.38.4/arch/x86/pci/olpc.c
---- linux-2.6.38.4/arch/x86/pci/olpc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/olpc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/olpc.c linux-2.6.38.6/arch/x86/pci/olpc.c
+--- linux-2.6.38.6/arch/x86/pci/olpc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/olpc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
  	return 0;
  }
@@ -21103,9 +21203,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/olpc.c linux-2.6.38.4/arch/x86/pci/olpc.c
  	.read =	pci_olpc_read,
  	.write = pci_olpc_write,
  };
-diff -urNp linux-2.6.38.4/arch/x86/pci/pcbios.c linux-2.6.38.4/arch/x86/pci/pcbios.c
---- linux-2.6.38.4/arch/x86/pci/pcbios.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/pci/pcbios.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/pci/pcbios.c linux-2.6.38.6/arch/x86/pci/pcbios.c
+--- linux-2.6.38.6/arch/x86/pci/pcbios.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/pci/pcbios.c	2011-04-28 19:34:15.000000000 -0400
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -21428,9 +21528,9 @@ diff -urNp linux-2.6.38.4/arch/x86/pci/pcbios.c linux-2.6.38.4/arch/x86/pci/pcbi
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_32.c linux-2.6.38.4/arch/x86/platform/efi/efi_32.c
---- linux-2.6.38.4/arch/x86/platform/efi/efi_32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/platform/efi/efi_32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/platform/efi/efi_32.c linux-2.6.38.6/arch/x86/platform/efi/efi_32.c
+--- linux-2.6.38.6/arch/x86/platform/efi/efi_32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/platform/efi/efi_32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -38,70 +38,37 @@
   */
  
@@ -21511,9 +21611,9 @@ diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_32.c linux-2.6.38.4/arch/x86
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S
---- linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.6/arch/x86/platform/efi/efi_stub_32.S
+--- linux-2.6.38.6/arch/x86/platform/efi/efi_stub_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/platform/efi/efi_stub_32.S	2011-04-28 19:34:15.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -21612,9 +21712,9 @@ diff -urNp linux-2.6.38.4/arch/x86/platform/efi/efi_stub_32.S linux-2.6.38.4/arc
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-2.6.38.4/arch/x86/power/cpu.c linux-2.6.38.4/arch/x86/power/cpu.c
---- linux-2.6.38.4/arch/x86/power/cpu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/power/cpu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/power/cpu.c linux-2.6.38.6/arch/x86/power/cpu.c
+--- linux-2.6.38.6/arch/x86/power/cpu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/power/cpu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -21634,9 +21734,9 @@ diff -urNp linux-2.6.38.4/arch/x86/power/cpu.c linux-2.6.38.4/arch/x86/power/cpu
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.38.4/arch/x86/vdso/Makefile linux-2.6.38.4/arch/x86/vdso/Makefile
---- linux-2.6.38.4/arch/x86/vdso/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/Makefile	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/vdso/Makefile linux-2.6.38.6/arch/x86/vdso/Makefile
+--- linux-2.6.38.6/arch/x86/vdso/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/vdso/Makefile	2011-04-28 19:34:15.000000000 -0400
 @@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO    $@
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
  		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -21646,9 +21746,9 @@ diff -urNp linux-2.6.38.4/arch/x86/vdso/Makefile linux-2.6.38.4/arch/x86/vdso/Ma
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/vdso/vclock_gettime.c linux-2.6.38.6/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.38.6/arch/x86/vdso/vclock_gettime.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/vdso/vclock_gettime.c	2011-04-28 19:34:15.000000000 -0400
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -21747,9 +21847,9 @@ diff -urNp linux-2.6.38.4/arch/x86/vdso/vclock_gettime.c linux-2.6.38.4/arch/x86
  }
  int gettimeofday(struct timeval *, struct timezone *)
  	__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/vdso/vdso32-setup.c linux-2.6.38.6/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.38.6/arch/x86/vdso/vdso32-setup.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/vdso/vdso32-setup.c	2011-04-28 19:34:15.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -21832,9 +21932,9 @@ diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso32-setup.c linux-2.6.38.4/arch/x86/v
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso.lds.S linux-2.6.38.4/arch/x86/vdso/vdso.lds.S
---- linux-2.6.38.4/arch/x86/vdso/vdso.lds.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vdso.lds.S	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/vdso/vdso.lds.S linux-2.6.38.6/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.38.6/arch/x86/vdso/vdso.lds.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/vdso/vdso.lds.S	2011-04-28 19:34:15.000000000 -0400
 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
  #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
  #include "vextern.h"
@@ -21845,9 +21945,9 @@ diff -urNp linux-2.6.38.4/arch/x86/vdso/vdso.lds.S linux-2.6.38.4/arch/x86/vdso/
 +VEXTERN(fallback_time)
 +VEXTERN(getcpu)
 +#undef	VEXTERN
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vextern.h linux-2.6.38.4/arch/x86/vdso/vextern.h
---- linux-2.6.38.4/arch/x86/vdso/vextern.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vextern.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/vdso/vextern.h linux-2.6.38.6/arch/x86/vdso/vextern.h
+--- linux-2.6.38.6/arch/x86/vdso/vextern.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/vdso/vextern.h	2011-04-28 19:34:15.000000000 -0400
 @@ -11,6 +11,5 @@
     put into vextern.h and be referenced as a pointer with vdso prefix.
     The main kernel later fills in the values.   */
@@ -21855,9 +21955,9 @@ diff -urNp linux-2.6.38.4/arch/x86/vdso/vextern.h linux-2.6.38.4/arch/x86/vdso/v
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.38.4/arch/x86/vdso/vma.c linux-2.6.38.4/arch/x86/vdso/vma.c
---- linux-2.6.38.4/arch/x86/vdso/vma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/vdso/vma.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/vdso/vma.c linux-2.6.38.6/arch/x86/vdso/vma.c
+--- linux-2.6.38.6/arch/x86/vdso/vma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/vdso/vma.c	2011-04-28 19:34:15.000000000 -0400
 @@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
  	if (!vbase)
  		goto oom;
@@ -21896,9 +21996,9 @@ diff -urNp linux-2.6.38.4/arch/x86/vdso/vma.c linux-2.6.38.4/arch/x86/vdso/vma.c
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.38.4/arch/x86/xen/enlighten.c linux-2.6.38.4/arch/x86/xen/enlighten.c
---- linux-2.6.38.4/arch/x86/xen/enlighten.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/enlighten.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/enlighten.c linux-2.6.38.6/arch/x86/xen/enlighten.c
+--- linux-2.6.38.6/arch/x86/xen/enlighten.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/enlighten.c	2011-04-28 19:34:15.000000000 -0400
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -21941,9 +22041,9 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/enlighten.c linux-2.6.38.4/arch/x86/xen/e
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-2.6.38.4/arch/x86/xen/mmu.c linux-2.6.38.4/arch/x86/xen/mmu.c
---- linux-2.6.38.4/arch/x86/xen/mmu.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/mmu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/mmu.c linux-2.6.38.6/arch/x86/xen/mmu.c
+--- linux-2.6.38.6/arch/x86/xen/mmu.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/mmu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
@@ -21964,9 +22064,9 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/mmu.c linux-2.6.38.4/arch/x86/xen/mmu.c
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff -urNp linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c
---- linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.6/arch/x86/xen/pci-swiotlb-xen.c
+--- linux-2.6.38.6/arch/x86/xen/pci-swiotlb-xen.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/pci-swiotlb-xen.c	2011-04-28 19:34:15.000000000 -0400
 @@ -10,7 +10,7 @@
  
  int xen_swiotlb __read_mostly;
@@ -21976,9 +22076,9 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/pci-swiotlb-xen.c linux-2.6.38.4/arch/x86
  	.mapping_error = xen_swiotlb_dma_mapping_error,
  	.alloc_coherent = xen_swiotlb_alloc_coherent,
  	.free_coherent = xen_swiotlb_free_coherent,
-diff -urNp linux-2.6.38.4/arch/x86/xen/smp.c linux-2.6.38.4/arch/x86/xen/smp.c
---- linux-2.6.38.4/arch/x86/xen/smp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/smp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/smp.c linux-2.6.38.6/arch/x86/xen/smp.c
+--- linux-2.6.38.6/arch/x86/xen/smp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/smp.c	2011-05-11 18:34:57.000000000 -0400
 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
@@ -22019,13 +22119,13 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/smp.c linux-2.6.38.4/arch/x86/xen/smp.c
 -	per_cpu(kernel_stack, cpu) =
 -		(unsigned long)task_stack_page(idle) -
 -		KERNEL_STACK_OFFSET + THREAD_SIZE;
-+	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 8 + THREAD_SIZE;
++	per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-2.6.38.4/arch/x86/xen/xen-asm_32.S linux-2.6.38.4/arch/x86/xen/xen-asm_32.S
---- linux-2.6.38.4/arch/x86/xen/xen-asm_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/xen-asm_32.S	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/xen-asm_32.S linux-2.6.38.6/arch/x86/xen/xen-asm_32.S
+--- linux-2.6.38.6/arch/x86/xen/xen-asm_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/xen-asm_32.S	2011-04-28 19:34:15.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -22047,9 +22147,9 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/xen-asm_32.S linux-2.6.38.4/arch/x86/xen/
  #else
  	movl xen_vcpu, %eax
  #endif
-diff -urNp linux-2.6.38.4/arch/x86/xen/xen-head.S linux-2.6.38.4/arch/x86/xen/xen-head.S
---- linux-2.6.38.4/arch/x86/xen/xen-head.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/xen-head.S	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/xen-head.S linux-2.6.38.6/arch/x86/xen/xen-head.S
+--- linux-2.6.38.6/arch/x86/xen/xen-head.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/xen-head.S	2011-04-28 19:34:15.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -22068,9 +22168,9 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/xen-head.S linux-2.6.38.4/arch/x86/xen/xe
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.38.4/arch/x86/xen/xen-ops.h linux-2.6.38.4/arch/x86/xen/xen-ops.h
---- linux-2.6.38.4/arch/x86/xen/xen-ops.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/arch/x86/xen/xen-ops.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/arch/x86/xen/xen-ops.h linux-2.6.38.6/arch/x86/xen/xen-ops.h
+--- linux-2.6.38.6/arch/x86/xen/xen-ops.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/arch/x86/xen/xen-ops.h	2011-04-28 19:34:15.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -22080,9 +22180,9 @@ diff -urNp linux-2.6.38.4/arch/x86/xen/xen-ops.h linux-2.6.38.4/arch/x86/xen/xen
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.38.4/block/blk-iopoll.c linux-2.6.38.4/block/blk-iopoll.c
---- linux-2.6.38.4/block/blk-iopoll.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/blk-iopoll.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/block/blk-iopoll.c linux-2.6.38.6/block/blk-iopoll.c
+--- linux-2.6.38.6/block/blk-iopoll.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/block/blk-iopoll.c	2011-04-28 19:34:15.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -22092,9 +22192,9 @@ diff -urNp linux-2.6.38.4/block/blk-iopoll.c linux-2.6.38.4/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.38.4/block/blk-map.c linux-2.6.38.4/block/blk-map.c
---- linux-2.6.38.4/block/blk-map.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/blk-map.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/block/blk-map.c linux-2.6.38.6/block/blk-map.c
+--- linux-2.6.38.6/block/blk-map.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/block/blk-map.c	2011-04-28 19:34:15.000000000 -0400
 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
  	if (!len || !kbuf)
  		return -EINVAL;
@@ -22104,9 +22204,9 @@ diff -urNp linux-2.6.38.4/block/blk-map.c linux-2.6.38.4/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-2.6.38.4/block/blk-softirq.c linux-2.6.38.4/block/blk-softirq.c
---- linux-2.6.38.4/block/blk-softirq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/blk-softirq.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/block/blk-softirq.c linux-2.6.38.6/block/blk-softirq.c
+--- linux-2.6.38.6/block/blk-softirq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/block/blk-softirq.c	2011-04-28 19:34:15.000000000 -0400
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -22116,9 +22216,9 @@ diff -urNp linux-2.6.38.4/block/blk-softirq.c linux-2.6.38.4/block/blk-softirq.c
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.38.4/block/bsg.c linux-2.6.38.4/block/bsg.c
---- linux-2.6.38.4/block/bsg.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/bsg.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/block/bsg.c linux-2.6.38.6/block/bsg.c
+--- linux-2.6.38.6/block/bsg.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/block/bsg.c	2011-04-28 19:34:15.000000000 -0400
 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
  				struct sg_io_v4 *hdr, struct bsg_device *bd,
  				fmode_t has_write_perm)
@@ -22146,9 +22246,9 @@ diff -urNp linux-2.6.38.4/block/bsg.c linux-2.6.38.4/block/bsg.c
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-diff -urNp linux-2.6.38.4/block/scsi_ioctl.c linux-2.6.38.4/block/scsi_ioctl.c
---- linux-2.6.38.4/block/scsi_ioctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/block/scsi_ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/block/scsi_ioctl.c linux-2.6.38.6/block/scsi_ioctl.c
+--- linux-2.6.38.6/block/scsi_ioctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/block/scsi_ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -22200,9 +22300,9 @@ diff -urNp linux-2.6.38.4/block/scsi_ioctl.c linux-2.6.38.4/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-2.6.38.4/Documentation/dontdiff linux-2.6.38.4/Documentation/dontdiff
---- linux-2.6.38.4/Documentation/dontdiff	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/Documentation/dontdiff	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/Documentation/dontdiff linux-2.6.38.6/Documentation/dontdiff
+--- linux-2.6.38.6/Documentation/dontdiff	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/Documentation/dontdiff	2011-04-28 19:34:15.000000000 -0400
 @@ -3,6 +3,7 @@
  *.bin
  *.cpio
@@ -22328,9 +22428,9 @@ diff -urNp linux-2.6.38.4/Documentation/dontdiff linux-2.6.38.4/Documentation/do
  wakeup.bin
  wakeup.elf
  wakeup.lds
-diff -urNp linux-2.6.38.4/Documentation/filesystems/sysfs.txt linux-2.6.38.4/Documentation/filesystems/sysfs.txt
---- linux-2.6.38.4/Documentation/filesystems/sysfs.txt	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/Documentation/filesystems/sysfs.txt	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/Documentation/filesystems/sysfs.txt linux-2.6.38.6/Documentation/filesystems/sysfs.txt
+--- linux-2.6.38.6/Documentation/filesystems/sysfs.txt	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/Documentation/filesystems/sysfs.txt	2011-04-28 19:34:15.000000000 -0400
 @@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
  show and store methods of the attribute owners. 
  
@@ -22342,9 +22442,9 @@ diff -urNp linux-2.6.38.4/Documentation/filesystems/sysfs.txt linux-2.6.38.4/Doc
  };
  
  [ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.38.4/Documentation/kernel-parameters.txt linux-2.6.38.4/Documentation/kernel-parameters.txt
---- linux-2.6.38.4/Documentation/kernel-parameters.txt	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/Documentation/kernel-parameters.txt	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/Documentation/kernel-parameters.txt linux-2.6.38.6/Documentation/kernel-parameters.txt
+--- linux-2.6.38.6/Documentation/kernel-parameters.txt	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/Documentation/kernel-parameters.txt	2011-04-28 19:34:15.000000000 -0400
 @@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes
  			the specified number of seconds.  This is to be used if
  			your oopses keep scrolling off the screen.
@@ -22359,9 +22459,9 @@ diff -urNp linux-2.6.38.4/Documentation/kernel-parameters.txt linux-2.6.38.4/Doc
  	pcbit=		[HW,ISDN]
  
  	pcd.		[PARIDE]
-diff -urNp linux-2.6.38.4/drivers/acpi/apei/cper.c linux-2.6.38.4/drivers/acpi/apei/cper.c
---- linux-2.6.38.4/drivers/acpi/apei/cper.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/apei/cper.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/apei/cper.c linux-2.6.38.6/drivers/acpi/apei/cper.c
+--- linux-2.6.38.6/drivers/acpi/apei/cper.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/apei/cper.c	2011-04-28 19:57:25.000000000 -0400
 @@ -37,12 +37,12 @@
   */
  u64 cper_next_record_id(void)
@@ -22379,10 +22479,10 @@ diff -urNp linux-2.6.38.4/drivers/acpi/apei/cper.c linux-2.6.38.4/drivers/acpi/a
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-2.6.38.4/drivers/acpi/battery.c linux-2.6.38.4/drivers/acpi/battery.c
---- linux-2.6.38.4/drivers/acpi/battery.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/battery.c	2011-04-28 19:34:15.000000000 -0400
-@@ -862,7 +862,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
+diff -urNp linux-2.6.38.6/drivers/acpi/battery.c linux-2.6.38.6/drivers/acpi/battery.c
+--- linux-2.6.38.6/drivers/acpi/battery.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/battery.c	2011-05-10 22:06:52.000000000 -0400
+@@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
  	}
  
  static struct battery_file {
@@ -22391,9 +22491,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/battery.c linux-2.6.38.4/drivers/acpi/bat
  	mode_t mode;
  	const char *name;
  } acpi_battery_file[] = {
-diff -urNp linux-2.6.38.4/drivers/acpi/dock.c linux-2.6.38.4/drivers/acpi/dock.c
---- linux-2.6.38.4/drivers/acpi/dock.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/dock.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/dock.c linux-2.6.38.6/drivers/acpi/dock.c
+--- linux-2.6.38.6/drivers/acpi/dock.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/dock.c	2011-04-28 19:34:15.000000000 -0400
 @@ -77,7 +77,7 @@ struct dock_dependent_device {
  	struct list_head list;
  	struct list_head hotplug_list;
@@ -22412,9 +22512,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/dock.c linux-2.6.38.4/drivers/acpi/dock.c
  			     void *context)
  {
  	struct dock_dependent_device *dd;
-diff -urNp linux-2.6.38.4/drivers/acpi/ec_sys.c linux-2.6.38.4/drivers/acpi/ec_sys.c
---- linux-2.6.38.4/drivers/acpi/ec_sys.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/ec_sys.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/ec_sys.c linux-2.6.38.6/drivers/acpi/ec_sys.c
+--- linux-2.6.38.6/drivers/acpi/ec_sys.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/ec_sys.c	2011-04-28 19:34:15.000000000 -0400
 @@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct f
  	return count;
  }
@@ -22424,9 +22524,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/ec_sys.c linux-2.6.38.4/drivers/acpi/ec_s
  	.owner = THIS_MODULE,
  	.open  = acpi_ec_open_io,
  	.read  = acpi_ec_read_io,
-diff -urNp linux-2.6.38.4/drivers/acpi/power_meter.c linux-2.6.38.4/drivers/acpi/power_meter.c
---- linux-2.6.38.4/drivers/acpi/power_meter.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/power_meter.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/power_meter.c linux-2.6.38.6/drivers/acpi/power_meter.c
+--- linux-2.6.38.6/drivers/acpi/power_meter.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/power_meter.c	2011-04-28 19:34:15.000000000 -0400
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
  		return res;
  
@@ -22436,9 +22536,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/power_meter.c linux-2.6.38.4/drivers/acpi
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.38.4/drivers/acpi/proc.c linux-2.6.38.4/drivers/acpi/proc.c
---- linux-2.6.38.4/drivers/acpi/proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/proc.c linux-2.6.38.6/drivers/acpi/proc.c
+--- linux-2.6.38.6/drivers/acpi/proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
@@ -22473,9 +22573,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/proc.c linux-2.6.38.4/drivers/acpi/proc.c
  			if (device_can_wakeup(&dev->dev)) {
  				bool enable = !device_may_wakeup(&dev->dev);
  				device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-2.6.38.4/drivers/acpi/processor_driver.c linux-2.6.38.4/drivers/acpi/processor_driver.c
---- linux-2.6.38.4/drivers/acpi/processor_driver.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/processor_driver.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/processor_driver.c linux-2.6.38.6/drivers/acpi/processor_driver.c
+--- linux-2.6.38.6/drivers/acpi/processor_driver.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/processor_driver.c	2011-04-28 19:34:15.000000000 -0400
 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  #endif
@@ -22485,9 +22585,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/processor_driver.c linux-2.6.38.4/drivers
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-2.6.38.4/drivers/acpi/processor_idle.c linux-2.6.38.4/drivers/acpi/processor_idle.c
---- linux-2.6.38.4/drivers/acpi/processor_idle.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/acpi/processor_idle.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/acpi/processor_idle.c linux-2.6.38.6/drivers/acpi/processor_idle.c
+--- linux-2.6.38.6/drivers/acpi/processor_idle.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/acpi/processor_idle.c	2011-04-28 19:34:15.000000000 -0400
 @@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdat
  	  DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
  	  DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -22497,9 +22597,9 @@ diff -urNp linux-2.6.38.4/drivers/acpi/processor_idle.c linux-2.6.38.4/drivers/a
  };
  
  
-diff -urNp linux-2.6.38.4/drivers/ata/acard-ahci.c linux-2.6.38.4/drivers/ata/acard-ahci.c
---- linux-2.6.38.4/drivers/ata/acard-ahci.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/acard-ahci.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/acard-ahci.c linux-2.6.38.6/drivers/ata/acard-ahci.c
+--- linux-2.6.38.6/drivers/ata/acard-ahci.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/acard-ahci.c	2011-04-28 19:34:15.000000000 -0400
 @@ -87,7 +87,7 @@ static struct scsi_host_template acard_a
  	AHCI_SHT("acard-ahci"),
  };
@@ -22509,9 +22609,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/acard-ahci.c linux-2.6.38.4/drivers/ata/ac
  	.inherits		= &ahci_ops,
  	.qc_prep		= acard_ahci_qc_prep,
  	.qc_fill_rtf		= acard_ahci_qc_fill_rtf,
-diff -urNp linux-2.6.38.4/drivers/ata/ahci.c linux-2.6.38.4/drivers/ata/ahci.c
---- linux-2.6.38.4/drivers/ata/ahci.c	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ahci.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/ahci.c linux-2.6.38.6/drivers/ata/ahci.c
+--- linux-2.6.38.6/drivers/ata/ahci.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/ahci.c	2011-05-10 22:06:52.000000000 -0400
 @@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sh
  	AHCI_SHT("ahci"),
  };
@@ -22533,9 +22633,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/ahci.c linux-2.6.38.4/drivers/ata/ahci.c
  	.inherits		= &ahci_ops,
  	.softreset		= ahci_sb600_softreset,
  	.pmp_softreset		= ahci_sb600_softreset,
-diff -urNp linux-2.6.38.4/drivers/ata/ahci.h linux-2.6.38.4/drivers/ata/ahci.h
---- linux-2.6.38.4/drivers/ata/ahci.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ahci.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/ahci.h linux-2.6.38.6/drivers/ata/ahci.h
+--- linux-2.6.38.6/drivers/ata/ahci.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/ahci.h	2011-04-28 19:34:15.000000000 -0400
 @@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sde
  	.shost_attrs		= ahci_shost_attrs,			\
  	.sdev_attrs		= ahci_sdev_attrs
@@ -22545,9 +22645,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/ahci.h linux-2.6.38.4/drivers/ata/ahci.h
  
  void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,
  			u32 opts);
-diff -urNp linux-2.6.38.4/drivers/ata/ata_generic.c linux-2.6.38.4/drivers/ata/ata_generic.c
---- linux-2.6.38.4/drivers/ata/ata_generic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ata_generic.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/ata_generic.c linux-2.6.38.6/drivers/ata/ata_generic.c
+--- linux-2.6.38.6/drivers/ata/ata_generic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/ata_generic.c	2011-04-28 19:34:15.000000000 -0400
 @@ -101,7 +101,7 @@ static struct scsi_host_template generic
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22557,9 +22657,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/ata_generic.c linux-2.6.38.4/drivers/ata/a
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_unknown,
  	.set_mode	= generic_set_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/ata_piix.c linux-2.6.38.4/drivers/ata/ata_piix.c
---- linux-2.6.38.4/drivers/ata/ata_piix.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/ata_piix.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/ata_piix.c linux-2.6.38.6/drivers/ata/ata_piix.c
+--- linux-2.6.38.6/drivers/ata/ata_piix.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/ata_piix.c	2011-04-28 19:34:15.000000000 -0400
 @@ -327,12 +327,12 @@ static struct scsi_host_template piix_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22599,9 +22699,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/ata_piix.c linux-2.6.38.4/drivers/ata/ata_
  	.inherits		= &piix_sata_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= piix_sidpr_scr_read,
-diff -urNp linux-2.6.38.4/drivers/ata/libahci.c linux-2.6.38.4/drivers/ata/libahci.c
---- linux-2.6.38.4/drivers/ata/libahci.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libahci.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/libahci.c linux-2.6.38.6/drivers/ata/libahci.c
+--- linux-2.6.38.6/drivers/ata/libahci.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/libahci.c	2011-05-10 22:06:52.000000000 -0400
 @@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs
  };
  EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
@@ -22611,9 +22711,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/libahci.c linux-2.6.38.4/drivers/ata/libah
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer		= ahci_pmp_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/libata-acpi.c linux-2.6.38.4/drivers/ata/libata-acpi.c
---- linux-2.6.38.4/drivers/ata/libata-acpi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-acpi.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/libata-acpi.c linux-2.6.38.6/drivers/ata/libata-acpi.c
+--- linux-2.6.38.6/drivers/ata/libata-acpi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/libata-acpi.c	2011-04-28 19:34:15.000000000 -0400
 @@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_han
  	ata_acpi_uevent(dev->link->ap, dev, event);
  }
@@ -22629,9 +22729,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/libata-acpi.c linux-2.6.38.4/drivers/ata/l
  	.handler = ata_acpi_ap_notify_dock,
  	.uevent = ata_acpi_ap_uevent,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/libata-core.c linux-2.6.38.4/drivers/ata/libata-core.c
---- linux-2.6.38.4/drivers/ata/libata-core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-core.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/libata-core.c linux-2.6.38.6/drivers/ata/libata-core.c
+--- linux-2.6.38.6/drivers/ata/libata-core.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/libata-core.c	2011-05-10 22:06:52.000000000 -0400
 @@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
@@ -22696,10 +22796,10 @@ diff -urNp linux-2.6.38.4/drivers/ata/libata-core.c linux-2.6.38.4/drivers/ata/l
  	.qc_prep		= ata_noop_qc_prep,
  	.qc_issue		= ata_dummy_qc_issue,
  	.error_handler		= ata_dummy_error_handler,
-diff -urNp linux-2.6.38.4/drivers/ata/libata-eh.c linux-2.6.38.4/drivers/ata/libata-eh.c
---- linux-2.6.38.4/drivers/ata/libata-eh.c	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-eh.c	2011-04-28 19:34:15.000000000 -0400
-@@ -3880,7 +3880,7 @@ void ata_do_eh(struct ata_port *ap, ata_
+diff -urNp linux-2.6.38.6/drivers/ata/libata-eh.c linux-2.6.38.6/drivers/ata/libata-eh.c
+--- linux-2.6.38.6/drivers/ata/libata-eh.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/libata-eh.c	2011-05-10 22:06:52.000000000 -0400
+@@ -3882,7 +3882,7 @@ void ata_do_eh(struct ata_port *ap, ata_
   */
  void ata_std_error_handler(struct ata_port *ap)
  {
@@ -22708,9 +22808,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/libata-eh.c linux-2.6.38.4/drivers/ata/lib
  	ata_reset_fn_t hardreset = ops->hardreset;
  
  	/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.38.4/drivers/ata/libata-pmp.c linux-2.6.38.4/drivers/ata/libata-pmp.c
---- linux-2.6.38.4/drivers/ata/libata-pmp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/libata-pmp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/libata-pmp.c linux-2.6.38.6/drivers/ata/libata-pmp.c
+--- linux-2.6.38.6/drivers/ata/libata-pmp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/libata-pmp.c	2011-04-28 19:34:15.000000000 -0400
 @@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(str
   */
  static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -22720,9 +22820,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/libata-pmp.c linux-2.6.38.4/drivers/ata/li
  	int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
  	struct ata_link *pmp_link = &ap->link;
  	struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.38.4/drivers/ata/pata_acpi.c linux-2.6.38.4/drivers/ata/pata_acpi.c
---- linux-2.6.38.4/drivers/ata/pata_acpi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_acpi.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_acpi.c linux-2.6.38.6/drivers/ata/pata_acpi.c
+--- linux-2.6.38.6/drivers/ata/pata_acpi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_acpi.c	2011-04-28 19:34:15.000000000 -0400
 @@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22732,9 +22832,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_acpi.c linux-2.6.38.4/drivers/ata/pat
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= pacpi_qc_issue,
  	.cable_detect		= pacpi_cable_detect,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ali.c linux-2.6.38.4/drivers/ata/pata_ali.c
---- linux-2.6.38.4/drivers/ata/pata_ali.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ali.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_ali.c linux-2.6.38.6/drivers/ata/pata_ali.c
+--- linux-2.6.38.6/drivers/ata/pata_ali.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_ali.c	2011-04-28 19:34:15.000000000 -0400
 @@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
   *	Port operations for PIO only ALi
   */
@@ -22780,9 +22880,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_ali.c linux-2.6.38.4/drivers/ata/pata
  	.inherits	= &ali_dma_base_ops,
  	.check_atapi_dma = ali_check_atapi_dma,
  	.dev_config	= ali_warn_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_amd.c linux-2.6.38.4/drivers/ata/pata_amd.c
---- linux-2.6.38.4/drivers/ata/pata_amd.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_amd.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_amd.c linux-2.6.38.6/drivers/ata/pata_amd.c
+--- linux-2.6.38.6/drivers/ata/pata_amd.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_amd.c	2011-04-28 19:34:15.000000000 -0400
 @@ -397,28 +397,28 @@ static const struct ata_port_operations 
  	.prereset	= amd_pre_reset,
  };
@@ -22832,9 +22932,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_amd.c linux-2.6.38.4/drivers/ata/pata
  	.inherits	= &nv_base_port_ops,
  	.set_piomode	= nv133_set_piomode,
  	.set_dmamode	= nv133_set_dmamode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_artop.c linux-2.6.38.4/drivers/ata/pata_artop.c
---- linux-2.6.38.4/drivers/ata/pata_artop.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_artop.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_artop.c linux-2.6.38.6/drivers/ata/pata_artop.c
+--- linux-2.6.38.6/drivers/ata/pata_artop.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_artop.c	2011-04-28 19:34:15.000000000 -0400
 @@ -312,7 +312,7 @@ static struct scsi_host_template artop_s
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22853,9 +22953,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_artop.c linux-2.6.38.4/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= artop6260_cable_detect,
  	.set_piomode		= artop6260_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_at32.c linux-2.6.38.4/drivers/ata/pata_at32.c
---- linux-2.6.38.4/drivers/ata/pata_at32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_at32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_at32.c linux-2.6.38.6/drivers/ata/pata_at32.c
+--- linux-2.6.38.6/drivers/ata/pata_at32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_at32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22865,9 +22965,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_at32.c linux-2.6.38.4/drivers/ata/pat
  	.inherits		= &ata_sff_port_ops,
  	.cable_detect		= ata_cable_40wire,
  	.set_piomode		= pata_at32_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_at91.c linux-2.6.38.4/drivers/ata/pata_at91.c
---- linux-2.6.38.4/drivers/ata/pata_at91.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_at91.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_at91.c linux-2.6.38.6/drivers/ata/pata_at91.c
+--- linux-2.6.38.6/drivers/ata/pata_at91.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_at91.c	2011-04-28 19:34:15.000000000 -0400
 @@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22877,9 +22977,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_at91.c linux-2.6.38.4/drivers/ata/pat
  	.inherits	= &ata_sff_port_ops,
  
  	.sff_data_xfer	= pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_atiixp.c linux-2.6.38.4/drivers/ata/pata_atiixp.c
---- linux-2.6.38.4/drivers/ata/pata_atiixp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_atiixp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_atiixp.c linux-2.6.38.6/drivers/ata/pata_atiixp.c
+--- linux-2.6.38.6/drivers/ata/pata_atiixp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_atiixp.c	2011-04-28 19:34:15.000000000 -0400
 @@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
@@ -22889,9 +22989,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_atiixp.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  
  	.qc_prep 	= ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_atp867x.c linux-2.6.38.4/drivers/ata/pata_atp867x.c
---- linux-2.6.38.4/drivers/ata/pata_atp867x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_atp867x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_atp867x.c linux-2.6.38.6/drivers/ata/pata_atp867x.c
+--- linux-2.6.38.6/drivers/ata/pata_atp867x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_atp867x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22901,9 +23001,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_atp867x.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= atp867x_cable_detect,
  	.set_piomode		= atp867x_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_bf54x.c linux-2.6.38.4/drivers/ata/pata_bf54x.c
---- linux-2.6.38.4/drivers/ata/pata_bf54x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_bf54x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_bf54x.c linux-2.6.38.6/drivers/ata/pata_bf54x.c
+--- linux-2.6.38.6/drivers/ata/pata_bf54x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_bf54x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -22913,9 +23013,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_bf54x.c linux-2.6.38.4/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  
  	.set_piomode		= bfin_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd640.c linux-2.6.38.4/drivers/ata/pata_cmd640.c
---- linux-2.6.38.4/drivers/ata/pata_cmd640.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cmd640.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cmd640.c linux-2.6.38.6/drivers/ata/pata_cmd640.c
+--- linux-2.6.38.6/drivers/ata/pata_cmd640.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cmd640.c	2011-04-28 19:34:15.000000000 -0400
 @@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -22925,9 +23025,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd640.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  	/* In theory xfer_noirq is not needed once we kill the prefetcher */
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd64x.c linux-2.6.38.4/drivers/ata/pata_cmd64x.c
---- linux-2.6.38.4/drivers/ata/pata_cmd64x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cmd64x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cmd64x.c linux-2.6.38.6/drivers/ata/pata_cmd64x.c
+--- linux-2.6.38.6/drivers/ata/pata_cmd64x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cmd64x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -268,18 +268,18 @@ static const struct ata_port_operations 
  	.set_dmamode	= cmd64x_set_dmamode,
  };
@@ -22950,9 +23050,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cmd64x.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &cmd64x_base_ops,
  	.bmdma_stop	= cmd648_bmdma_stop,
  	.cable_detect	= cmd648_cable_detect,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5520.c linux-2.6.38.4/drivers/ata/pata_cs5520.c
---- linux-2.6.38.4/drivers/ata/pata_cs5520.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5520.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cs5520.c linux-2.6.38.6/drivers/ata/pata_cs5520.c
+--- linux-2.6.38.6/drivers/ata/pata_cs5520.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cs5520.c	2011-04-28 19:34:15.000000000 -0400
 @@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
@@ -22962,9 +23062,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5520.c linux-2.6.38.4/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_prep		= ata_bmdma_dumb_qc_prep,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5530.c linux-2.6.38.4/drivers/ata/pata_cs5530.c
---- linux-2.6.38.4/drivers/ata/pata_cs5530.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5530.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cs5530.c linux-2.6.38.6/drivers/ata/pata_cs5530.c
+--- linux-2.6.38.6/drivers/ata/pata_cs5530.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cs5530.c	2011-04-28 19:34:15.000000000 -0400
 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
@@ -22974,9 +23074,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5530.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  
  	.qc_prep 	= ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5535.c linux-2.6.38.4/drivers/ata/pata_cs5535.c
---- linux-2.6.38.4/drivers/ata/pata_cs5535.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5535.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cs5535.c linux-2.6.38.6/drivers/ata/pata_cs5535.c
+--- linux-2.6.38.6/drivers/ata/pata_cs5535.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cs5535.c	2011-04-28 19:34:15.000000000 -0400
 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22986,9 +23086,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5535.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= cs5535_cable_detect,
  	.set_piomode	= cs5535_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5536.c linux-2.6.38.4/drivers/ata/pata_cs5536.c
---- linux-2.6.38.4/drivers/ata/pata_cs5536.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cs5536.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cs5536.c linux-2.6.38.6/drivers/ata/pata_cs5536.c
+--- linux-2.6.38.6/drivers/ata/pata_cs5536.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cs5536.c	2011-04-28 19:34:15.000000000 -0400
 @@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -22998,9 +23098,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cs5536.c linux-2.6.38.4/drivers/ata/p
  	.inherits		= &ata_bmdma32_port_ops,
  	.cable_detect		= cs5536_cable_detect,
  	.set_piomode		= cs5536_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_cypress.c linux-2.6.38.4/drivers/ata/pata_cypress.c
---- linux-2.6.38.4/drivers/ata/pata_cypress.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_cypress.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_cypress.c linux-2.6.38.6/drivers/ata/pata_cypress.c
+--- linux-2.6.38.6/drivers/ata/pata_cypress.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_cypress.c	2011-04-28 19:34:15.000000000 -0400
 @@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23010,9 +23110,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_cypress.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= cy82c693_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_efar.c linux-2.6.38.4/drivers/ata/pata_efar.c
---- linux-2.6.38.4/drivers/ata/pata_efar.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_efar.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_efar.c linux-2.6.38.6/drivers/ata/pata_efar.c
+--- linux-2.6.38.6/drivers/ata/pata_efar.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_efar.c	2011-04-28 19:34:15.000000000 -0400
 @@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23022,9 +23122,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_efar.c linux-2.6.38.4/drivers/ata/pat
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= efar_cable_detect,
  	.set_piomode		= efar_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt366.c linux-2.6.38.4/drivers/ata/pata_hpt366.c
---- linux-2.6.38.4/drivers/ata/pata_hpt366.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt366.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_hpt366.c linux-2.6.38.6/drivers/ata/pata_hpt366.c
+--- linux-2.6.38.6/drivers/ata/pata_hpt366.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_hpt366.c	2011-04-28 19:34:15.000000000 -0400
 @@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_
   *	Configuration for HPT366/68
   */
@@ -23034,9 +23134,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt366.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= hpt36x_cable_detect,
  	.mode_filter	= hpt366_filter,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt37x.c linux-2.6.38.4/drivers/ata/pata_hpt37x.c
---- linux-2.6.38.4/drivers/ata/pata_hpt37x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt37x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_hpt37x.c linux-2.6.38.6/drivers/ata/pata_hpt37x.c
+--- linux-2.6.38.6/drivers/ata/pata_hpt37x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_hpt37x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_
   *	Configuration for HPT370
   */
@@ -23082,9 +23182,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt37x.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &hpt372_port_ops,
  	.cable_detect	= hpt374_fn1_cable_detect,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_hpt3x2n.c linux-2.6.38.6/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.38.6/drivers/ata/pata_hpt3x2n.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_hpt3x2n.c	2011-04-28 19:34:15.000000000 -0400
 @@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n
   *	Configuration for HPT302N/371N.
   */
@@ -23103,9 +23203,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x2n.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &hpt3xxn_port_ops,
  	.mode_filter	= &hpt372n_filter,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x3.c linux-2.6.38.4/drivers/ata/pata_hpt3x3.c
---- linux-2.6.38.4/drivers/ata/pata_hpt3x3.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_hpt3x3.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_hpt3x3.c linux-2.6.38.6/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.38.6/drivers/ata/pata_hpt3x3.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_hpt3x3.c	2011-04-28 19:34:15.000000000 -0400
 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23115,9 +23215,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_hpt3x3.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= hpt3x3_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_icside.c linux-2.6.38.4/drivers/ata/pata_icside.c
---- linux-2.6.38.4/drivers/ata/pata_icside.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_icside.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_icside.c linux-2.6.38.6/drivers/ata/pata_icside.c
+--- linux-2.6.38.6/drivers/ata/pata_icside.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_icside.c	2011-04-28 19:34:15.000000000 -0400
 @@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
  	}
  }
@@ -23127,9 +23227,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_icside.c linux-2.6.38.4/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	/* no need to build any PRD tables for DMA */
  	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_isapnp.c linux-2.6.38.4/drivers/ata/pata_isapnp.c
---- linux-2.6.38.4/drivers/ata/pata_isapnp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_isapnp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_isapnp.c linux-2.6.38.6/drivers/ata/pata_isapnp.c
+--- linux-2.6.38.6/drivers/ata/pata_isapnp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_isapnp.c	2011-04-28 19:34:15.000000000 -0400
 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23145,9 +23245,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_isapnp.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.38.4/drivers/ata/pata_it8213.c linux-2.6.38.4/drivers/ata/pata_it8213.c
---- linux-2.6.38.4/drivers/ata/pata_it8213.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_it8213.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_it8213.c linux-2.6.38.6/drivers/ata/pata_it8213.c
+--- linux-2.6.38.6/drivers/ata/pata_it8213.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_it8213.c	2011-04-28 19:34:15.000000000 -0400
 @@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
  };
  
@@ -23157,9 +23257,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_it8213.c linux-2.6.38.4/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= it8213_cable_detect,
  	.set_piomode		= it8213_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_it821x.c linux-2.6.38.4/drivers/ata/pata_it821x.c
---- linux-2.6.38.4/drivers/ata/pata_it821x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_it821x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_it821x.c linux-2.6.38.6/drivers/ata/pata_it821x.c
+--- linux-2.6.38.6/drivers/ata/pata_it821x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_it821x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23187,9 +23287,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_it821x.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  
  	.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.6/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.38.6/drivers/ata/pata_ixp4xx_cf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_ixp4xx_cf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23199,9 +23299,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_ixp4xx_cf.c linux-2.6.38.4/drivers/at
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ixp4xx_mmio_data_xfer,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_jmicron.c linux-2.6.38.4/drivers/ata/pata_jmicron.c
---- linux-2.6.38.4/drivers/ata/pata_jmicron.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_jmicron.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_jmicron.c linux-2.6.38.6/drivers/ata/pata_jmicron.c
+--- linux-2.6.38.6/drivers/ata/pata_jmicron.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_jmicron.c	2011-04-28 19:34:15.000000000 -0400
 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23211,9 +23311,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_jmicron.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= jmicron_pre_reset,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_legacy.c linux-2.6.38.4/drivers/ata/pata_legacy.c
---- linux-2.6.38.4/drivers/ata/pata_legacy.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_legacy.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_legacy.c linux-2.6.38.6/drivers/ata/pata_legacy.c
+--- linux-2.6.38.6/drivers/ata/pata_legacy.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_legacy.c	2011-04-28 19:34:15.000000000 -0400
 @@ -116,7 +116,7 @@ struct legacy_probe {
  
  struct legacy_controller {
@@ -23325,9 +23425,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_legacy.c linux-2.6.38.4/drivers/ata/p
  	struct legacy_data *ld = &legacy_data[probe->slot];
  	struct ata_host *host = NULL;
  	struct ata_port *ap;
-diff -urNp linux-2.6.38.4/drivers/ata/pata_macio.c linux-2.6.38.4/drivers/ata/pata_macio.c
---- linux-2.6.38.4/drivers/ata/pata_macio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_macio.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_macio.c linux-2.6.38.6/drivers/ata/pata_macio.c
+--- linux-2.6.38.6/drivers/ata/pata_macio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_macio.c	2011-04-28 19:34:15.000000000 -0400
 @@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
  	.slave_configure	= pata_macio_slave_config,
  };
@@ -23339,9 +23439,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_macio.c linux-2.6.38.4/drivers/ata/pa
  	.freeze			= pata_macio_freeze,
  	.set_piomode		= pata_macio_set_timings,
  	.set_dmamode		= pata_macio_set_timings,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_marvell.c linux-2.6.38.4/drivers/ata/pata_marvell.c
---- linux-2.6.38.4/drivers/ata/pata_marvell.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_marvell.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_marvell.c linux-2.6.38.6/drivers/ata/pata_marvell.c
+--- linux-2.6.38.6/drivers/ata/pata_marvell.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_marvell.c	2011-04-28 19:34:15.000000000 -0400
 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23351,9 +23451,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_marvell.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= marvell_cable_detect,
  	.prereset		= marvell_pre_reset,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_mpc52xx.c linux-2.6.38.4/drivers/ata/pata_mpc52xx.c
---- linux-2.6.38.4/drivers/ata/pata_mpc52xx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_mpc52xx.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_mpc52xx.c linux-2.6.38.6/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.38.6/drivers/ata/pata_mpc52xx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_mpc52xx.c	2011-04-28 19:34:15.000000000 -0400
 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23363,9 +23463,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_mpc52xx.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_dev_select		= mpc52xx_ata_dev_select,
  	.set_piomode		= mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_mpiix.c linux-2.6.38.4/drivers/ata/pata_mpiix.c
---- linux-2.6.38.4/drivers/ata/pata_mpiix.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_mpiix.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_mpiix.c linux-2.6.38.6/drivers/ata/pata_mpiix.c
+--- linux-2.6.38.6/drivers/ata/pata_mpiix.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_mpiix.c	2011-04-28 19:34:15.000000000 -0400
 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23375,9 +23475,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_mpiix.c linux-2.6.38.4/drivers/ata/pa
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= mpiix_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_netcell.c linux-2.6.38.4/drivers/ata/pata_netcell.c
---- linux-2.6.38.4/drivers/ata/pata_netcell.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_netcell.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_netcell.c linux-2.6.38.6/drivers/ata/pata_netcell.c
+--- linux-2.6.38.6/drivers/ata/pata_netcell.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_netcell.c	2011-04-28 19:34:15.000000000 -0400
 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23387,9 +23487,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_netcell.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_80wire,
  	.read_id	= netcell_read_id,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ninja32.c linux-2.6.38.4/drivers/ata/pata_ninja32.c
---- linux-2.6.38.4/drivers/ata/pata_ninja32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ninja32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_ninja32.c linux-2.6.38.6/drivers/ata/pata_ninja32.c
+--- linux-2.6.38.6/drivers/ata/pata_ninja32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_ninja32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23399,9 +23499,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_ninja32.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &ata_bmdma_port_ops,
  	.sff_dev_select = ninja32_dev_select,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87410.c linux-2.6.38.4/drivers/ata/pata_ns87410.c
---- linux-2.6.38.4/drivers/ata/pata_ns87410.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ns87410.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_ns87410.c linux-2.6.38.6/drivers/ata/pata_ns87410.c
+--- linux-2.6.38.6/drivers/ata/pata_ns87410.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_ns87410.c	2011-04-28 19:34:15.000000000 -0400
 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23411,9 +23511,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87410.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= ns87410_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87415.c linux-2.6.38.4/drivers/ata/pata_ns87415.c
---- linux-2.6.38.4/drivers/ata/pata_ns87415.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_ns87415.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_ns87415.c linux-2.6.38.6/drivers/ata/pata_ns87415.c
+--- linux-2.6.38.6/drivers/ata/pata_ns87415.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_ns87415.c	2011-04-28 19:34:15.000000000 -0400
 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
  }
  #endif		/* 87560 SuperIO Support */
@@ -23432,9 +23532,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_ns87415.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ns87415_pata_ops,
  	.sff_tf_read		= ns87560_tf_read,
  	.sff_check_status	= ns87560_check_status,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_octeon_cf.c linux-2.6.38.4/drivers/ata/pata_octeon_cf.c
---- linux-2.6.38.4/drivers/ata/pata_octeon_cf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_octeon_cf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_octeon_cf.c linux-2.6.38.6/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.38.6/drivers/ata/pata_octeon_cf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_octeon_cf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(s
  	return 0;
  }
@@ -23444,9 +23544,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_octeon_cf.c linux-2.6.38.4/drivers/at
  	.inherits		= &ata_sff_port_ops,
  	.check_atapi_dma	= octeon_cf_check_atapi_dma,
  	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_oldpiix.c linux-2.6.38.4/drivers/ata/pata_oldpiix.c
---- linux-2.6.38.4/drivers/ata/pata_oldpiix.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_oldpiix.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_oldpiix.c linux-2.6.38.6/drivers/ata/pata_oldpiix.c
+--- linux-2.6.38.6/drivers/ata/pata_oldpiix.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_oldpiix.c	2011-04-28 19:34:15.000000000 -0400
 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23456,9 +23556,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_oldpiix.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= oldpiix_qc_issue,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_opti.c linux-2.6.38.4/drivers/ata/pata_opti.c
---- linux-2.6.38.4/drivers/ata/pata_opti.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_opti.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_opti.c linux-2.6.38.6/drivers/ata/pata_opti.c
+--- linux-2.6.38.6/drivers/ata/pata_opti.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_opti.c	2011-04-28 19:34:15.000000000 -0400
 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23468,9 +23568,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_opti.c linux-2.6.38.4/drivers/ata/pat
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= opti_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_optidma.c linux-2.6.38.4/drivers/ata/pata_optidma.c
---- linux-2.6.38.4/drivers/ata/pata_optidma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_optidma.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_optidma.c linux-2.6.38.6/drivers/ata/pata_optidma.c
+--- linux-2.6.38.6/drivers/ata/pata_optidma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_optidma.c	2011-04-28 19:34:15.000000000 -0400
 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23489,9 +23589,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_optidma.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &optidma_port_ops,
  	.set_piomode	= optiplus_set_pio_mode,
  	.set_dmamode	= optiplus_set_dma_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_palmld.c linux-2.6.38.4/drivers/ata/pata_palmld.c
---- linux-2.6.38.4/drivers/ata/pata_palmld.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_palmld.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_palmld.c linux-2.6.38.6/drivers/ata/pata_palmld.c
+--- linux-2.6.38.6/drivers/ata/pata_palmld.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_palmld.c	2011-04-28 19:34:15.000000000 -0400
 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23501,9 +23601,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_palmld.c linux-2.6.38.4/drivers/ata/p
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pcmcia.c linux-2.6.38.4/drivers/ata/pata_pcmcia.c
---- linux-2.6.38.4/drivers/ata/pata_pcmcia.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pcmcia.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_pcmcia.c linux-2.6.38.6/drivers/ata/pata_pcmcia.c
+--- linux-2.6.38.6/drivers/ata/pata_pcmcia.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_pcmcia.c	2011-04-28 19:34:15.000000000 -0400
 @@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23530,9 +23630,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_pcmcia.c linux-2.6.38.4/drivers/ata/p
  
  	/* Set up attributes in order to probe card and get resources */
  	pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc2027x.c linux-2.6.38.4/drivers/ata/pata_pdc2027x.c
---- linux-2.6.38.4/drivers/ata/pata_pdc2027x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pdc2027x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_pdc2027x.c linux-2.6.38.6/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.38.6/drivers/ata/pata_pdc2027x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_pdc2027x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23550,9 +23650,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc2027x.c linux-2.6.38.4/drivers/ata
  	.inherits		= &pdc2027x_pata100_ops,
  	.mode_filter		= pdc2027x_mode_filter,
  	.set_piomode		= pdc2027x_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.6/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.38.6/drivers/ata/pata_pdc202xx_old.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_pdc202xx_old.c	2011-04-28 19:34:15.000000000 -0400
 @@ -295,7 +295,7 @@ static struct scsi_host_template pdc202x
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23571,9 +23671,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_pdc202xx_old.c linux-2.6.38.4/drivers
  	.inherits		= &pdc2024x_port_ops,
  
  	.check_atapi_dma	= pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_piccolo.c linux-2.6.38.4/drivers/ata/pata_piccolo.c
---- linux-2.6.38.4/drivers/ata/pata_piccolo.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_piccolo.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_piccolo.c linux-2.6.38.6/drivers/ata/pata_piccolo.c
+--- linux-2.6.38.6/drivers/ata/pata_piccolo.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_piccolo.c	2011-04-28 19:34:15.000000000 -0400
 @@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23583,9 +23683,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_piccolo.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_unknown,
  	.set_piomode	= tosh_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_platform.c linux-2.6.38.4/drivers/ata/pata_platform.c
---- linux-2.6.38.4/drivers/ata/pata_platform.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_platform.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_platform.c linux-2.6.38.6/drivers/ata/pata_platform.c
+--- linux-2.6.38.6/drivers/ata/pata_platform.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_platform.c	2011-04-28 19:34:15.000000000 -0400
 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23595,9 +23695,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_platform.c linux-2.6.38.4/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_pxa.c linux-2.6.38.4/drivers/ata/pata_pxa.c
---- linux-2.6.38.4/drivers/ata/pata_pxa.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_pxa.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_pxa.c linux-2.6.38.6/drivers/ata/pata_pxa.c
+--- linux-2.6.38.6/drivers/ata/pata_pxa.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_pxa.c	2011-04-28 19:34:15.000000000 -0400
 @@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23607,9 +23707,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_pxa.c linux-2.6.38.4/drivers/ata/pata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= ata_cable_40wire,
  
-diff -urNp linux-2.6.38.4/drivers/ata/pata_qdi.c linux-2.6.38.4/drivers/ata/pata_qdi.c
---- linux-2.6.38.4/drivers/ata/pata_qdi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_qdi.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_qdi.c linux-2.6.38.6/drivers/ata/pata_qdi.c
+--- linux-2.6.38.6/drivers/ata/pata_qdi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_qdi.c	2011-04-28 19:34:15.000000000 -0400
 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23628,9 +23728,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_qdi.c linux-2.6.38.4/drivers/ata/pata
  	.inherits	= &qdi6500_port_ops,
  	.set_piomode	= qdi6580_set_piomode,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_radisys.c linux-2.6.38.4/drivers/ata/pata_radisys.c
---- linux-2.6.38.4/drivers/ata/pata_radisys.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_radisys.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_radisys.c linux-2.6.38.6/drivers/ata/pata_radisys.c
+--- linux-2.6.38.6/drivers/ata/pata_radisys.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_radisys.c	2011-04-28 19:34:15.000000000 -0400
 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23640,9 +23740,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_radisys.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= radisys_qc_issue,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_rb532_cf.c linux-2.6.38.4/drivers/ata/pata_rb532_cf.c
---- linux-2.6.38.4/drivers/ata/pata_rb532_cf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_rb532_cf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_rb532_cf.c linux-2.6.38.6/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.38.6/drivers/ata/pata_rb532_cf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_rb532_cf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
  	return IRQ_HANDLED;
  }
@@ -23652,9 +23752,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_rb532_cf.c linux-2.6.38.4/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer32,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_rdc.c linux-2.6.38.4/drivers/ata/pata_rdc.c
---- linux-2.6.38.4/drivers/ata/pata_rdc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_rdc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_rdc.c linux-2.6.38.6/drivers/ata/pata_rdc.c
+--- linux-2.6.38.6/drivers/ata/pata_rdc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_rdc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
  	pci_write_config_byte(dev, 0x48, udma_enable);
  }
@@ -23664,9 +23764,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_rdc.c linux-2.6.38.4/drivers/ata/pata
  	.inherits		= &ata_bmdma32_port_ops,
  	.cable_detect		= rdc_pata_cable_detect,
  	.set_piomode		= rdc_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_rz1000.c linux-2.6.38.4/drivers/ata/pata_rz1000.c
---- linux-2.6.38.4/drivers/ata/pata_rz1000.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_rz1000.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_rz1000.c linux-2.6.38.6/drivers/ata/pata_rz1000.c
+--- linux-2.6.38.6/drivers/ata/pata_rz1000.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_rz1000.c	2011-04-28 19:34:15.000000000 -0400
 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23676,9 +23776,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_rz1000.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_mode	= rz1000_set_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_samsung_cf.c linux-2.6.38.4/drivers/ata/pata_samsung_cf.c
---- linux-2.6.38.4/drivers/ata/pata_samsung_cf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_samsung_cf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_samsung_cf.c linux-2.6.38.6/drivers/ata/pata_samsung_cf.c
+--- linux-2.6.38.6/drivers/ata/pata_samsung_cf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_samsung_cf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -23697,9 +23797,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_samsung_cf.c linux-2.6.38.4/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.set_piomode		= pata_s3c_set_piomode,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sc1200.c linux-2.6.38.4/drivers/ata/pata_sc1200.c
---- linux-2.6.38.4/drivers/ata/pata_sc1200.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sc1200.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_sc1200.c linux-2.6.38.6/drivers/ata/pata_sc1200.c
+--- linux-2.6.38.6/drivers/ata/pata_sc1200.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_sc1200.c	2011-04-28 19:34:15.000000000 -0400
 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
@@ -23709,9 +23809,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_sc1200.c linux-2.6.38.4/drivers/ata/p
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_prep 	= ata_bmdma_dumb_qc_prep,
  	.qc_issue	= sc1200_qc_issue,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_scc.c linux-2.6.38.4/drivers/ata/pata_scc.c
---- linux-2.6.38.4/drivers/ata/pata_scc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_scc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_scc.c linux-2.6.38.6/drivers/ata/pata_scc.c
+--- linux-2.6.38.6/drivers/ata/pata_scc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_scc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23721,9 +23821,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_scc.c linux-2.6.38.4/drivers/ata/pata
  	.inherits		= &ata_bmdma_port_ops,
  
  	.set_piomode		= scc_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sch.c linux-2.6.38.4/drivers/ata/pata_sch.c
---- linux-2.6.38.4/drivers/ata/pata_sch.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sch.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_sch.c linux-2.6.38.6/drivers/ata/pata_sch.c
+--- linux-2.6.38.6/drivers/ata/pata_sch.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_sch.c	2011-04-28 19:34:15.000000000 -0400
 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23733,9 +23833,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_sch.c linux-2.6.38.4/drivers/ata/pata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= ata_cable_unknown,
  	.set_piomode		= sch_set_piomode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_serverworks.c linux-2.6.38.4/drivers/ata/pata_serverworks.c
---- linux-2.6.38.4/drivers/ata/pata_serverworks.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_serverworks.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_serverworks.c linux-2.6.38.6/drivers/ata/pata_serverworks.c
+--- linux-2.6.38.6/drivers/ata/pata_serverworks.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_serverworks.c	2011-04-28 19:34:15.000000000 -0400
 @@ -300,7 +300,7 @@ static struct scsi_host_template serverw
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23754,9 +23854,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_serverworks.c linux-2.6.38.4/drivers/
  	.inherits	= &serverworks_osb4_port_ops,
  	.mode_filter	= serverworks_csb_filter,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sil680.c linux-2.6.38.4/drivers/ata/pata_sil680.c
---- linux-2.6.38.4/drivers/ata/pata_sil680.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sil680.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_sil680.c linux-2.6.38.6/drivers/ata/pata_sil680.c
+--- linux-2.6.38.6/drivers/ata/pata_sil680.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_sil680.c	2011-04-28 19:34:15.000000000 -0400
 @@ -225,8 +225,7 @@ static struct scsi_host_template sil680_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23767,9 +23867,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_sil680.c linux-2.6.38.4/drivers/ata/p
  	.inherits		= &ata_bmdma32_port_ops,
  	.sff_exec_command	= sil680_sff_exec_command,
  	.sff_irq_check		= sil680_sff_irq_check,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sis.c linux-2.6.38.4/drivers/ata/pata_sis.c
---- linux-2.6.38.4/drivers/ata/pata_sis.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sis.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_sis.c linux-2.6.38.6/drivers/ata/pata_sis.c
+--- linux-2.6.38.6/drivers/ata/pata_sis.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_sis.c	2011-04-28 19:34:15.000000000 -0400
 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23825,9 +23925,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_sis.c linux-2.6.38.4/drivers/ata/pata
  	.inherits		= &sis_base_ops,
  	.set_piomode		= sis_old_set_piomode,
  	.set_dmamode		= sis_old_set_dmamode,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_sl82c105.c linux-2.6.38.4/drivers/ata/pata_sl82c105.c
---- linux-2.6.38.4/drivers/ata/pata_sl82c105.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_sl82c105.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_sl82c105.c linux-2.6.38.6/drivers/ata/pata_sl82c105.c
+--- linux-2.6.38.6/drivers/ata/pata_sl82c105.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_sl82c105.c	2011-04-28 19:34:15.000000000 -0400
 @@ -241,7 +241,7 @@ static struct scsi_host_template sl82c10
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23837,9 +23937,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_sl82c105.c linux-2.6.38.4/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_defer	= sl82c105_qc_defer,
  	.bmdma_start 	= sl82c105_bmdma_start,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_triflex.c linux-2.6.38.4/drivers/ata/pata_triflex.c
---- linux-2.6.38.4/drivers/ata/pata_triflex.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_triflex.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_triflex.c linux-2.6.38.6/drivers/ata/pata_triflex.c
+--- linux-2.6.38.6/drivers/ata/pata_triflex.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_triflex.c	2011-04-28 19:34:15.000000000 -0400
 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23849,9 +23949,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_triflex.c linux-2.6.38.4/drivers/ata/
  	.inherits	= &ata_bmdma_port_ops,
  	.bmdma_start 	= triflex_bmdma_start,
  	.bmdma_stop	= triflex_bmdma_stop,
-diff -urNp linux-2.6.38.4/drivers/ata/pata_via.c linux-2.6.38.4/drivers/ata/pata_via.c
---- linux-2.6.38.4/drivers/ata/pata_via.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pata_via.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pata_via.c linux-2.6.38.6/drivers/ata/pata_via.c
+--- linux-2.6.38.6/drivers/ata/pata_via.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pata_via.c	2011-04-28 19:34:15.000000000 -0400
 @@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -23870,9 +23970,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pata_via.c linux-2.6.38.4/drivers/ata/pata
  	.inherits	= &via_port_ops,
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
  };
-diff -urNp linux-2.6.38.4/drivers/ata/pdc_adma.c linux-2.6.38.4/drivers/ata/pdc_adma.c
---- linux-2.6.38.4/drivers/ata/pdc_adma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/pdc_adma.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/pdc_adma.c linux-2.6.38.6/drivers/ata/pdc_adma.c
+--- linux-2.6.38.6/drivers/ata/pdc_adma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/pdc_adma.c	2011-04-28 19:34:15.000000000 -0400
 @@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
  	.dma_boundary		= ADMA_DMA_BOUNDARY,
  };
@@ -23882,9 +23982,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/pdc_adma.c linux-2.6.38.4/drivers/ata/pdc_
  	.inherits		= &ata_sff_port_ops,
  
  	.lost_interrupt		= ATA_OP_NULL,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c
---- linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_dwc_460ex.c linux-2.6.38.6/drivers/ata/sata_dwc_460ex.c
+--- linux-2.6.38.6/drivers/ata/sata_dwc_460ex.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_dwc_460ex.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dw
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -23894,9 +23994,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_dwc_460ex.c linux-2.6.38.4/drivers/at
  	.inherits		= &ata_sff_port_ops,
  
  	.error_handler		= sata_dwc_error_handler,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_fsl.c linux-2.6.38.4/drivers/ata/sata_fsl.c
---- linux-2.6.38.4/drivers/ata/sata_fsl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_fsl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_fsl.c linux-2.6.38.6/drivers/ata/sata_fsl.c
+--- linux-2.6.38.6/drivers/ata/sata_fsl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_fsl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
  	.dma_boundary = ATA_DMA_BOUNDARY,
  };
@@ -23906,9 +24006,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_fsl.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_inic162x.c linux-2.6.38.4/drivers/ata/sata_inic162x.c
---- linux-2.6.38.4/drivers/ata/sata_inic162x.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_inic162x.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_inic162x.c linux-2.6.38.6/drivers/ata/sata_inic162x.c
+--- linux-2.6.38.6/drivers/ata/sata_inic162x.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_inic162x.c	2011-04-28 19:34:15.000000000 -0400
 @@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
  	return 0;
  }
@@ -23918,9 +24018,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_inic162x.c linux-2.6.38.4/drivers/ata
  	.inherits		= &sata_port_ops,
  
  	.check_atapi_dma	= inic_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_mv.c linux-2.6.38.4/drivers/ata/sata_mv.c
---- linux-2.6.38.4/drivers/ata/sata_mv.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_mv.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_mv.c linux-2.6.38.6/drivers/ata/sata_mv.c
+--- linux-2.6.38.6/drivers/ata/sata_mv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_mv.c	2011-04-28 19:34:15.000000000 -0400
 @@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
  	.dma_boundary		= MV_DMA_BOUNDARY,
  };
@@ -23948,9 +24048,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_mv.c linux-2.6.38.4/drivers/ata/sata_
  	.inherits		= &mv6_ops,
  	.dev_config		= ATA_OP_NULL,
  	.qc_prep		= mv_qc_prep_iie,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_nv.c linux-2.6.38.4/drivers/ata/sata_nv.c
---- linux-2.6.38.4/drivers/ata/sata_nv.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_nv.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_nv.c linux-2.6.38.6/drivers/ata/sata_nv.c
+--- linux-2.6.38.6/drivers/ata/sata_nv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_nv.c	2011-04-28 19:34:15.000000000 -0400
 @@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc
   * cases.  Define nv_hardreset() which only kicks in for post-boot
   * probing and use it for all variants.
@@ -23993,9 +24093,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_nv.c linux-2.6.38.4/drivers/ata/sata_
  	.inherits		= &nv_generic_ops,
  
  	.qc_defer		= ata_std_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_promise.c linux-2.6.38.4/drivers/ata/sata_promise.c
---- linux-2.6.38.4/drivers/ata/sata_promise.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_promise.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_promise.c linux-2.6.38.6/drivers/ata/sata_promise.c
+--- linux-2.6.38.6/drivers/ata/sata_promise.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_promise.c	2011-04-28 19:34:15.000000000 -0400
 @@ -196,7 +196,7 @@ static const struct ata_port_operations 
  	.error_handler		= pdc_error_handler,
  };
@@ -24022,9 +24122,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_promise.c linux-2.6.38.4/drivers/ata/
  	.inherits		= &pdc_common_ops,
  	.cable_detect		= pdc_pata_cable_detect,
  	.freeze			= pdc_freeze,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_qstor.c linux-2.6.38.4/drivers/ata/sata_qstor.c
---- linux-2.6.38.4/drivers/ata/sata_qstor.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_qstor.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_qstor.c linux-2.6.38.6/drivers/ata/sata_qstor.c
+--- linux-2.6.38.6/drivers/ata/sata_qstor.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_qstor.c	2011-04-28 19:34:15.000000000 -0400
 @@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
  	.dma_boundary		= QS_DMA_BOUNDARY,
  };
@@ -24034,9 +24134,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_qstor.c linux-2.6.38.4/drivers/ata/sa
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= qs_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sil24.c linux-2.6.38.4/drivers/ata/sata_sil24.c
---- linux-2.6.38.4/drivers/ata/sata_sil24.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sil24.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_sil24.c linux-2.6.38.6/drivers/ata/sata_sil24.c
+--- linux-2.6.38.6/drivers/ata/sata_sil24.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_sil24.c	2011-04-28 19:34:15.000000000 -0400
 @@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -24046,9 +24146,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_sil24.c linux-2.6.38.4/drivers/ata/sa
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer		= sil24_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sil.c linux-2.6.38.4/drivers/ata/sata_sil.c
---- linux-2.6.38.4/drivers/ata/sata_sil.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sil.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_sil.c linux-2.6.38.6/drivers/ata/sata_sil.c
+--- linux-2.6.38.6/drivers/ata/sata_sil.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_sil.c	2011-04-28 19:34:15.000000000 -0400
 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
  	.sg_tablesize		= ATA_MAX_PRD
  };
@@ -24058,9 +24158,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_sil.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &ata_bmdma32_port_ops,
  	.dev_config		= sil_dev_config,
  	.set_mode		= sil_set_mode,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sis.c linux-2.6.38.4/drivers/ata/sata_sis.c
---- linux-2.6.38.4/drivers/ata/sata_sis.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sis.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_sis.c linux-2.6.38.6/drivers/ata/sata_sis.c
+--- linux-2.6.38.6/drivers/ata/sata_sis.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_sis.c	2011-04-28 19:34:15.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24070,9 +24170,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_sis.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= sis_scr_read,
  	.scr_write		= sis_scr_write,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_svw.c linux-2.6.38.4/drivers/ata/sata_svw.c
---- linux-2.6.38.4/drivers/ata/sata_svw.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_svw.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_svw.c linux-2.6.38.6/drivers/ata/sata_svw.c
+--- linux-2.6.38.6/drivers/ata/sata_svw.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_svw.c	2011-04-28 19:34:15.000000000 -0400
 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
  };
  
@@ -24082,9 +24182,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_svw.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_tf_load		= k2_sata_tf_load,
  	.sff_tf_read		= k2_sata_tf_read,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_sx4.c linux-2.6.38.4/drivers/ata/sata_sx4.c
---- linux-2.6.38.4/drivers/ata/sata_sx4.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_sx4.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_sx4.c linux-2.6.38.6/drivers/ata/sata_sx4.c
+--- linux-2.6.38.6/drivers/ata/sata_sx4.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_sx4.c	2011-04-28 19:34:15.000000000 -0400
 @@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
  };
  
@@ -24094,9 +24194,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_sx4.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= pdc_check_atapi_dma,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_uli.c linux-2.6.38.4/drivers/ata/sata_uli.c
---- linux-2.6.38.4/drivers/ata/sata_uli.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_uli.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_uli.c linux-2.6.38.6/drivers/ata/sata_uli.c
+--- linux-2.6.38.6/drivers/ata/sata_uli.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_uli.c	2011-04-28 19:34:15.000000000 -0400
 @@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24106,9 +24206,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_uli.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= uli_scr_read,
  	.scr_write		= uli_scr_write,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_via.c linux-2.6.38.4/drivers/ata/sata_via.c
---- linux-2.6.38.4/drivers/ata/sata_via.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_via.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_via.c linux-2.6.38.6/drivers/ata/sata_via.c
+--- linux-2.6.38.6/drivers/ata/sata_via.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_via.c	2011-04-28 19:34:15.000000000 -0400
 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24147,9 +24247,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_via.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &svia_base_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= vt8251_scr_read,
-diff -urNp linux-2.6.38.4/drivers/ata/sata_vsc.c linux-2.6.38.4/drivers/ata/sata_vsc.c
---- linux-2.6.38.4/drivers/ata/sata_vsc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ata/sata_vsc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ata/sata_vsc.c linux-2.6.38.6/drivers/ata/sata_vsc.c
+--- linux-2.6.38.6/drivers/ata/sata_vsc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ata/sata_vsc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
  };
  
@@ -24159,9 +24259,9 @@ diff -urNp linux-2.6.38.4/drivers/ata/sata_vsc.c linux-2.6.38.4/drivers/ata/sata
  	.inherits		= &ata_bmdma_port_ops,
  	/* The IRQ handling is not quite standard SFF behaviour so we
  	   cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.38.4/drivers/atm/adummy.c linux-2.6.38.4/drivers/atm/adummy.c
---- linux-2.6.38.4/drivers/atm/adummy.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/adummy.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/adummy.c linux-2.6.38.6/drivers/atm/adummy.c
+--- linux-2.6.38.6/drivers/atm/adummy.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/adummy.c	2011-04-28 19:34:15.000000000 -0400
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
@@ -24171,9 +24271,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/adummy.c linux-2.6.38.4/drivers/atm/adummy
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/drivers/atm/ambassador.c linux-2.6.38.4/drivers/atm/ambassador.c
---- linux-2.6.38.4/drivers/atm/ambassador.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/ambassador.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/ambassador.c linux-2.6.38.6/drivers/atm/ambassador.c
+--- linux-2.6.38.6/drivers/atm/ambassador.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/ambassador.c	2011-04-28 19:34:15.000000000 -0400
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -24210,9 +24310,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/ambassador.c linux-2.6.38.4/drivers/atm/am
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.38.4/drivers/atm/atmtcp.c linux-2.6.38.4/drivers/atm/atmtcp.c
---- linux-2.6.38.4/drivers/atm/atmtcp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/atmtcp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/atmtcp.c linux-2.6.38.6/drivers/atm/atmtcp.c
+--- linux-2.6.38.6/drivers/atm/atmtcp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/atmtcp.c	2011-04-28 19:34:15.000000000 -0400
 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -24262,9 +24362,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/atmtcp.c linux-2.6.38.4/drivers/atm/atmtcp
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-2.6.38.4/drivers/atm/eni.c linux-2.6.38.4/drivers/atm/eni.c
---- linux-2.6.38.4/drivers/atm/eni.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/eni.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/eni.c linux-2.6.38.6/drivers/atm/eni.c
+--- linux-2.6.38.6/drivers/atm/eni.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/eni.c	2011-04-28 19:34:15.000000000 -0400
 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
@@ -24310,9 +24410,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/eni.c linux-2.6.38.4/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-2.6.38.4/drivers/atm/firestream.c linux-2.6.38.4/drivers/atm/firestream.c
---- linux-2.6.38.4/drivers/atm/firestream.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/firestream.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/firestream.c linux-2.6.38.6/drivers/atm/firestream.c
+--- linux-2.6.38.6/drivers/atm/firestream.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/firestream.c	2011-04-28 19:34:15.000000000 -0400
 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
  				}
  			}
@@ -24346,9 +24446,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/firestream.c linux-2.6.38.4/drivers/atm/fi
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-2.6.38.4/drivers/atm/fore200e.c linux-2.6.38.4/drivers/atm/fore200e.c
---- linux-2.6.38.4/drivers/atm/fore200e.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/fore200e.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/fore200e.c linux-2.6.38.6/drivers/atm/fore200e.c
+--- linux-2.6.38.6/drivers/atm/fore200e.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/fore200e.c	2011-04-28 19:34:15.000000000 -0400
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
@@ -24405,9 +24505,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/fore200e.c linux-2.6.38.4/drivers/atm/fore
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.38.4/drivers/atm/he.c linux-2.6.38.4/drivers/atm/he.c
---- linux-2.6.38.4/drivers/atm/he.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/he.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/he.c linux-2.6.38.6/drivers/atm/he.c
+--- linux-2.6.38.6/drivers/atm/he.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/he.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -24489,9 +24589,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/he.c linux-2.6.38.4/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/drivers/atm/horizon.c linux-2.6.38.4/drivers/atm/horizon.c
---- linux-2.6.38.4/drivers/atm/horizon.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/horizon.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/horizon.c linux-2.6.38.6/drivers/atm/horizon.c
+--- linux-2.6.38.6/drivers/atm/horizon.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/horizon.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -24510,9 +24610,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/horizon.c linux-2.6.38.4/drivers/atm/horiz
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-2.6.38.4/drivers/atm/idt77252.c linux-2.6.38.4/drivers/atm/idt77252.c
---- linux-2.6.38.4/drivers/atm/idt77252.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/idt77252.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/idt77252.c linux-2.6.38.6/drivers/atm/idt77252.c
+--- linux-2.6.38.6/drivers/atm/idt77252.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/idt77252.c	2011-04-28 19:34:15.000000000 -0400
 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
@@ -24667,9 +24767,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/idt77252.c linux-2.6.38.4/drivers/atm/idt7
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.38.4/drivers/atm/iphase.c linux-2.6.38.4/drivers/atm/iphase.c
---- linux-2.6.38.4/drivers/atm/iphase.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/iphase.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/iphase.c linux-2.6.38.6/drivers/atm/iphase.c
+--- linux-2.6.38.6/drivers/atm/iphase.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/iphase.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	status = (u_short) (buf_desc_ptr->desc_mode);  
  	if (status & (RX_CER | RX_PTE | RX_OFL))  
@@ -24766,9 +24866,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/iphase.c linux-2.6.38.4/drivers/atm/iphase
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.38.4/drivers/atm/lanai.c linux-2.6.38.4/drivers/atm/lanai.c
---- linux-2.6.38.4/drivers/atm/lanai.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/lanai.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/lanai.c linux-2.6.38.6/drivers/atm/lanai.c
+--- linux-2.6.38.6/drivers/atm/lanai.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/lanai.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
  	vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
  	lanai_endtx(lanai, lvcc);
@@ -24823,9 +24923,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/lanai.c linux-2.6.38.4/drivers/atm/lanai.c
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.38.4/drivers/atm/nicstar.c linux-2.6.38.4/drivers/atm/nicstar.c
---- linux-2.6.38.4/drivers/atm/nicstar.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/nicstar.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/nicstar.c linux-2.6.38.6/drivers/atm/nicstar.c
+--- linux-2.6.38.6/drivers/atm/nicstar.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/nicstar.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 
  	if ((vc = (vc_map *) vcc->dev_data) == NULL) {
  		printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
@@ -25027,9 +25127,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/nicstar.c linux-2.6.38.4/drivers/atm/nicst
  			}
  		}
  
-diff -urNp linux-2.6.38.4/drivers/atm/solos-pci.c linux-2.6.38.4/drivers/atm/solos-pci.c
---- linux-2.6.38.4/drivers/atm/solos-pci.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/solos-pci.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/solos-pci.c linux-2.6.38.6/drivers/atm/solos-pci.c
+--- linux-2.6.38.6/drivers/atm/solos-pci.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/solos-pci.c	2011-04-28 19:34:15.000000000 -0400
 @@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
@@ -25048,9 +25148,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/solos-pci.c linux-2.6.38.4/drivers/atm/sol
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.38.4/drivers/atm/suni.c linux-2.6.38.4/drivers/atm/suni.c
---- linux-2.6.38.4/drivers/atm/suni.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/suni.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/suni.c linux-2.6.38.6/drivers/atm/suni.c
+--- linux-2.6.38.6/drivers/atm/suni.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/suni.c	2011-04-28 19:34:15.000000000 -0400
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -25062,9 +25162,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/suni.c linux-2.6.38.4/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.38.4/drivers/atm/uPD98402.c linux-2.6.38.4/drivers/atm/uPD98402.c
---- linux-2.6.38.4/drivers/atm/uPD98402.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/uPD98402.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/uPD98402.c linux-2.6.38.6/drivers/atm/uPD98402.c
+--- linux-2.6.38.6/drivers/atm/uPD98402.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/uPD98402.c	2011-04-28 19:34:15.000000000 -0400
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
@@ -25109,9 +25209,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/uPD98402.c linux-2.6.38.4/drivers/atm/uPD9
  	return 0;
  }
  
-diff -urNp linux-2.6.38.4/drivers/atm/zatm.c linux-2.6.38.4/drivers/atm/zatm.c
---- linux-2.6.38.4/drivers/atm/zatm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/atm/zatm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/atm/zatm.c linux-2.6.38.6/drivers/atm/zatm.c
+--- linux-2.6.38.6/drivers/atm/zatm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/atm/zatm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
@@ -25139,9 +25239,9 @@ diff -urNp linux-2.6.38.4/drivers/atm/zatm.c linux-2.6.38.4/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.38.4/drivers/base/power/wakeup.c linux-2.6.38.4/drivers/base/power/wakeup.c
---- linux-2.6.38.4/drivers/base/power/wakeup.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/base/power/wakeup.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/base/power/wakeup.c linux-2.6.38.6/drivers/base/power/wakeup.c
+--- linux-2.6.38.6/drivers/base/power/wakeup.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/base/power/wakeup.c	2011-04-28 19:57:25.000000000 -0400
 @@ -25,7 +25,7 @@
  bool events_check_enabled;
  
@@ -25187,9 +25287,9 @@ diff -urNp linux-2.6.38.4/drivers/base/power/wakeup.c linux-2.6.38.4/drivers/bas
  	    && !atomic_read(&events_in_progress)) {
  		saved_count = count;
  		events_check_enabled = true;
-diff -urNp linux-2.6.38.4/drivers/block/cciss.c linux-2.6.38.4/drivers/block/cciss.c
---- linux-2.6.38.4/drivers/block/cciss.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/cciss.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/block/cciss.c linux-2.6.38.6/drivers/block/cciss.c
+--- linux-2.6.38.6/drivers/block/cciss.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/block/cciss.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -25199,9 +25299,9 @@ diff -urNp linux-2.6.38.4/drivers/block/cciss.c linux-2.6.38.4/drivers/block/cci
  	err = 0;
  	err |=
  	    copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_int.h linux-2.6.38.4/drivers/block/drbd/drbd_int.h
---- linux-2.6.38.4/drivers/block/drbd/drbd_int.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_int.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/block/drbd/drbd_int.h linux-2.6.38.6/drivers/block/drbd/drbd_int.h
+--- linux-2.6.38.6/drivers/block/drbd/drbd_int.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/block/drbd/drbd_int.h	2011-04-28 19:57:25.000000000 -0400
 @@ -742,7 +742,7 @@ struct drbd_request;
  struct drbd_epoch {
  	struct list_head list;
@@ -25220,9 +25320,9 @@ diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_int.h linux-2.6.38.4/drivers/b
  	unsigned int peer_seq;
  	spinlock_t peer_seq_lock;
  	unsigned int minor;
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_main.c linux-2.6.38.4/drivers/block/drbd/drbd_main.c
---- linux-2.6.38.4/drivers/block/drbd/drbd_main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_main.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/block/drbd/drbd_main.c linux-2.6.38.6/drivers/block/drbd/drbd_main.c
+--- linux-2.6.38.6/drivers/block/drbd/drbd_main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/block/drbd/drbd_main.c	2011-04-28 19:57:25.000000000 -0400
 @@ -2217,7 +2217,7 @@ static int _drbd_send_ack(struct drbd_co
  	p.sector   = sector;
  	p.block_id = block_id;
@@ -25261,9 +25361,9 @@ diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_main.c linux-2.6.38.4/drivers/
  	mdev->al_writ_cnt  =
  	mdev->bm_writ_cnt  =
  	mdev->read_cnt     =
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_nl.c linux-2.6.38.4/drivers/block/drbd/drbd_nl.c
---- linux-2.6.38.4/drivers/block/drbd/drbd_nl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_nl.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/block/drbd/drbd_nl.c linux-2.6.38.6/drivers/block/drbd/drbd_nl.c
+--- linux-2.6.38.6/drivers/block/drbd/drbd_nl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/block/drbd/drbd_nl.c	2011-04-28 19:57:25.000000000 -0400
 @@ -2238,7 +2238,7 @@ static void drbd_connector_callback(stru
  	module_put(THIS_MODULE);
  }
@@ -25309,9 +25409,9 @@ diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_nl.c linux-2.6.38.4/drivers/bl
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c
---- linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/block/drbd/drbd_receiver.c linux-2.6.38.6/drivers/block/drbd/drbd_receiver.c
+--- linux-2.6.38.6/drivers/block/drbd/drbd_receiver.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/block/drbd/drbd_receiver.c	2011-04-28 19:57:25.000000000 -0400
 @@ -907,7 +907,7 @@ retry:
  	sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
  	sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -25406,9 +25506,9 @@ diff -urNp linux-2.6.38.4/drivers/block/drbd/drbd_receiver.c linux-2.6.38.4/driv
  	D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-2.6.38.4/drivers/char/agp/frontend.c linux-2.6.38.4/drivers/char/agp/frontend.c
---- linux-2.6.38.4/drivers/char/agp/frontend.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/agp/frontend.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/agp/frontend.c linux-2.6.38.6/drivers/char/agp/frontend.c
+--- linux-2.6.38.6/drivers/char/agp/frontend.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/agp/frontend.c	2011-04-28 19:34:15.000000000 -0400
 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
@@ -25418,70 +25518,9 @@ diff -urNp linux-2.6.38.4/drivers/char/agp/frontend.c linux-2.6.38.4/drivers/cha
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.38.4/drivers/char/agp/generic.c linux-2.6.38.4/drivers/char/agp/generic.c
---- linux-2.6.38.4/drivers/char/agp/generic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/agp/generic.c	2011-04-28 19:34:15.000000000 -0400
-@@ -115,6 +115,9 @@ static struct agp_memory *agp_create_use
- 	struct agp_memory *new;
- 	unsigned long alloc_size = num_agp_pages*sizeof(struct page *);
- 
-+	if (INT_MAX/sizeof(struct page *) < num_agp_pages)
-+		return NULL;
-+
- 	new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
- 	if (new == NULL)
- 		return NULL;
-@@ -234,11 +237,14 @@ struct agp_memory *agp_allocate_memory(s
- 	int scratch_pages;
- 	struct agp_memory *new;
- 	size_t i;
-+	int cur_memory;
- 
- 	if (!bridge)
- 		return NULL;
- 
--	if ((atomic_read(&bridge->current_memory_agp) + page_count) > bridge->max_memory_agp)
-+	cur_memory = atomic_read(&bridge->current_memory_agp);
-+	if ((cur_memory + page_count > bridge->max_memory_agp) ||
-+	    (cur_memory + page_count < page_count))
- 		return NULL;
- 
- 	if (type >= AGP_USER_TYPES) {
-@@ -1089,8 +1095,8 @@ int agp_generic_insert_memory(struct agp
- 		return -EINVAL;
- 	}
- 
--	/* AK: could wrap */
--	if ((pg_start + mem->page_count) > num_entries)
-+	if (((pg_start + mem->page_count) > num_entries) ||
-+	    ((pg_start + mem->page_count) < pg_start))
- 		return -EINVAL;
- 
- 	j = pg_start;
-@@ -1124,7 +1130,7 @@ int agp_generic_remove_memory(struct agp
- {
- 	size_t i;
- 	struct agp_bridge_data *bridge;
--	int mask_type;
-+	int mask_type, num_entries;
- 
- 	bridge = mem->bridge;
- 	if (!bridge)
-@@ -1136,6 +1142,11 @@ int agp_generic_remove_memory(struct agp
- 	if (type != mem->type)
- 		return -EINVAL;
- 
-+	num_entries = agp_num_entries();
-+	if (((pg_start + mem->page_count) > num_entries) ||
-+	    ((pg_start + mem->page_count) < pg_start))
-+		return -EINVAL;
-+
- 	mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
- 	if (mask_type != 0) {
- 		/* The generic routines know nothing of memory types */
-diff -urNp linux-2.6.38.4/drivers/char/briq_panel.c linux-2.6.38.4/drivers/char/briq_panel.c
---- linux-2.6.38.4/drivers/char/briq_panel.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/briq_panel.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/briq_panel.c linux-2.6.38.6/drivers/char/briq_panel.c
+--- linux-2.6.38.6/drivers/char/briq_panel.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/briq_panel.c	2011-04-28 19:34:15.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -25523,9 +25562,9 @@ diff -urNp linux-2.6.38.4/drivers/char/briq_panel.c linux-2.6.38.4/drivers/char/
  
  	return len;
  }
-diff -urNp linux-2.6.38.4/drivers/char/genrtc.c linux-2.6.38.4/drivers/char/genrtc.c
---- linux-2.6.38.4/drivers/char/genrtc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/genrtc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/genrtc.c linux-2.6.38.6/drivers/char/genrtc.c
+--- linux-2.6.38.6/drivers/char/genrtc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/genrtc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
  	switch (cmd) {
  
@@ -25534,9 +25573,9 @@ diff -urNp linux-2.6.38.4/drivers/char/genrtc.c linux-2.6.38.4/drivers/char/genr
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-2.6.38.4/drivers/char/hpet.c linux-2.6.38.4/drivers/char/hpet.c
---- linux-2.6.38.4/drivers/char/hpet.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/hpet.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/hpet.c linux-2.6.38.6/drivers/char/hpet.c
+--- linux-2.6.38.6/drivers/char/hpet.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/hpet.c	2011-04-28 19:34:15.000000000 -0400
 @@ -553,7 +553,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -25546,9 +25585,9 @@ diff -urNp linux-2.6.38.4/drivers/char/hpet.c linux-2.6.38.4/drivers/char/hpet.c
  		  struct hpet_info *info)
  {
  	struct hpet_timer __iomem *timer;
-diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.6/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.38.6/drivers/char/ipmi/ipmi_msghandler.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/ipmi/ipmi_msghandler.c	2011-04-28 19:34:15.000000000 -0400
 @@ -414,7 +414,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -25579,9 +25618,9 @@ diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.38.4/dri
  
  	intf->proc_dir = NULL;
  
-diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.6/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.38.6/drivers/char/ipmi/ipmi_si_intf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/ipmi/ipmi_si_intf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -285,7 +285,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
@@ -25612,9 +25651,9 @@ diff -urNp linux-2.6.38.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.38.4/driver
  
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.38.4/drivers/char/istallion.c linux-2.6.38.4/drivers/char/istallion.c
---- linux-2.6.38.4/drivers/char/istallion.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/istallion.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/istallion.c linux-2.6.38.6/drivers/char/istallion.c
+--- linux-2.6.38.6/drivers/char/istallion.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/istallion.c	2011-04-28 19:34:15.000000000 -0400
 @@ -186,7 +186,6 @@ static struct ktermios		stli_deftermios 
   *	re-used for each stats call.
   */
@@ -25631,9 +25670,9 @@ diff -urNp linux-2.6.38.4/drivers/char/istallion.c linux-2.6.38.4/drivers/char/i
  
  	if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
  		return -EFAULT;
-diff -urNp linux-2.6.38.4/drivers/char/Kconfig linux-2.6.38.4/drivers/char/Kconfig
---- linux-2.6.38.4/drivers/char/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/Kconfig linux-2.6.38.6/drivers/char/Kconfig
+--- linux-2.6.38.6/drivers/char/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/Kconfig	2011-04-28 19:34:15.000000000 -0400
 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
  
  config DEVKMEM
@@ -25652,9 +25691,9 @@ diff -urNp linux-2.6.38.4/drivers/char/Kconfig linux-2.6.38.4/drivers/char/Kconf
  	default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-2.6.38.4/drivers/char/mem.c linux-2.6.38.4/drivers/char/mem.c
---- linux-2.6.38.4/drivers/char/mem.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/mem.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/mem.c linux-2.6.38.6/drivers/char/mem.c
+--- linux-2.6.38.6/drivers/char/mem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/mem.c	2011-04-28 19:34:15.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -25787,9 +25826,9 @@ diff -urNp linux-2.6.38.4/drivers/char/mem.c linux-2.6.38.4/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.38.4/drivers/char/nvram.c linux-2.6.38.4/drivers/char/nvram.c
---- linux-2.6.38.4/drivers/char/nvram.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/nvram.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/nvram.c linux-2.6.38.6/drivers/char/nvram.c
+--- linux-2.6.38.6/drivers/char/nvram.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/nvram.c	2011-04-28 19:34:15.000000000 -0400
 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
  
  	spin_unlock_irq(&rtc_lock);
@@ -25799,9 +25838,9 @@ diff -urNp linux-2.6.38.4/drivers/char/nvram.c linux-2.6.38.4/drivers/char/nvram
  		return -EFAULT;
  
  	*ppos = i;
-diff -urNp linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.6/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.38.6/drivers/char/pcmcia/ipwireless/tty.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/pcmcia/ipwireless/tty.c	2011-04-28 19:34:15.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -25924,9 +25963,9 @@ diff -urNp linux-2.6.38.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.38.4/dr
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-2.6.38.4/drivers/char/random.c linux-2.6.38.4/drivers/char/random.c
---- linux-2.6.38.4/drivers/char/random.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/random.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/random.c linux-2.6.38.6/drivers/char/random.c
+--- linux-2.6.38.6/drivers/char/random.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/random.c	2011-04-28 19:34:15.000000000 -0400
 @@ -254,8 +254,13 @@
  /*
   * Configuration information
@@ -25977,9 +26016,9 @@ diff -urNp linux-2.6.38.4/drivers/char/random.c linux-2.6.38.4/drivers/char/rand
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.38.4/drivers/char/sonypi.c linux-2.6.38.4/drivers/char/sonypi.c
---- linux-2.6.38.4/drivers/char/sonypi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/sonypi.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/sonypi.c linux-2.6.38.6/drivers/char/sonypi.c
+--- linux-2.6.38.6/drivers/char/sonypi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/sonypi.c	2011-04-28 19:34:15.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -26018,9 +26057,9 @@ diff -urNp linux-2.6.38.4/drivers/char/sonypi.c linux-2.6.38.4/drivers/char/sony
  	mutex_unlock(&sonypi_device.lock);
  
  	return 0;
-diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm_bios.c linux-2.6.38.4/drivers/char/tpm/tpm_bios.c
---- linux-2.6.38.4/drivers/char/tpm/tpm_bios.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/tpm/tpm_bios.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/tpm/tpm_bios.c linux-2.6.38.6/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.38.6/drivers/char/tpm/tpm_bios.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/char/tpm/tpm_bios.c	2011-04-28 19:34:15.000000000 -0400
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -26061,9 +26100,9 @@ diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm_bios.c linux-2.6.38.4/drivers/cha
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm.c linux-2.6.38.4/drivers/char/tpm/tpm.c
---- linux-2.6.38.4/drivers/char/tpm/tpm.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/char/tpm/tpm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/char/tpm/tpm.c linux-2.6.38.6/drivers/char/tpm/tpm.c
+--- linux-2.6.38.6/drivers/char/tpm/tpm.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/char/tpm/tpm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
  		    chip->vendor.req_complete_val)
  			goto out_recv;
@@ -26073,9 +26112,9 @@ diff -urNp linux-2.6.38.4/drivers/char/tpm/tpm.c linux-2.6.38.4/drivers/char/tpm
  			dev_err(chip->dev, "Operation Canceled\n");
  			rc = -ECANCELED;
  			goto out;
-diff -urNp linux-2.6.38.4/drivers/cpuidle/sysfs.c linux-2.6.38.4/drivers/cpuidle/sysfs.c
---- linux-2.6.38.4/drivers/cpuidle/sysfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/cpuidle/sysfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/cpuidle/sysfs.c linux-2.6.38.6/drivers/cpuidle/sysfs.c
+--- linux-2.6.38.6/drivers/cpuidle/sysfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/cpuidle/sysfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
  	.release = cpuidle_state_sysfs_release,
  };
@@ -26085,9 +26124,9 @@ diff -urNp linux-2.6.38.4/drivers/cpuidle/sysfs.c linux-2.6.38.4/drivers/cpuidle
  {
  	kobject_put(&device->kobjs[i]->kobj);
  	wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/edac/edac_mc_sysfs.c linux-2.6.38.6/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.38.6/drivers/edac/edac_mc_sysfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/edac/edac_mc_sysfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct
  }
  
@@ -26097,9 +26136,9 @@ diff -urNp linux-2.6.38.4/drivers/edac/edac_mc_sysfs.c linux-2.6.38.4/drivers/ed
  	.show = inst_grp_show,
  	.store = inst_grp_store
  };
-diff -urNp linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/edac/edac_pci_sysfs.c linux-2.6.38.6/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.38.6/drivers/edac/edac_pci_sysfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/edac/edac_pci_sysfs.c	2011-04-28 19:57:25.000000000 -0400
 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;		/* log 
  static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000;	/* one second workq period */
@@ -26183,9 +26222,9 @@ diff -urNp linux-2.6.38.4/drivers/edac/edac_pci_sysfs.c linux-2.6.38.4/drivers/e
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff -urNp linux-2.6.38.4/drivers/firewire/core-cdev.c linux-2.6.38.4/drivers/firewire/core-cdev.c
---- linux-2.6.38.4/drivers/firewire/core-cdev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/firewire/core-cdev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/firewire/core-cdev.c linux-2.6.38.6/drivers/firewire/core-cdev.c
+--- linux-2.6.38.6/drivers/firewire/core-cdev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/firewire/core-cdev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1329,8 +1329,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
@@ -26196,9 +26235,9 @@ diff -urNp linux-2.6.38.4/drivers/firewire/core-cdev.c linux-2.6.38.4/drivers/fi
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.38.4/drivers/firmware/dmi_scan.c linux-2.6.38.4/drivers/firmware/dmi_scan.c
---- linux-2.6.38.4/drivers/firmware/dmi_scan.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/firmware/dmi_scan.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/firmware/dmi_scan.c linux-2.6.38.6/drivers/firmware/dmi_scan.c
+--- linux-2.6.38.6/drivers/firmware/dmi_scan.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/firmware/dmi_scan.c	2011-04-28 19:34:15.000000000 -0400
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -26211,9 +26250,9 @@ diff -urNp linux-2.6.38.4/drivers/firmware/dmi_scan.c linux-2.6.38.4/drivers/fir
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff -urNp linux-2.6.38.4/drivers/gpio/vr41xx_giu.c linux-2.6.38.4/drivers/gpio/vr41xx_giu.c
---- linux-2.6.38.4/drivers/gpio/vr41xx_giu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpio/vr41xx_giu.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpio/vr41xx_giu.c linux-2.6.38.6/drivers/gpio/vr41xx_giu.c
+--- linux-2.6.38.6/drivers/gpio/vr41xx_giu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpio/vr41xx_giu.c	2011-04-28 19:57:25.000000000 -0400
 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
  	printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
  	       maskl, pendl, maskh, pendh);
@@ -26223,9 +26262,9 @@ diff -urNp linux-2.6.38.4/drivers/gpio/vr41xx_giu.c linux-2.6.38.4/drivers/gpio/
  
  	return -EINVAL;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.6/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_crtc_helper.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_crtc_helper.c	2011-04-28 19:34:15.000000000 -0400
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
@@ -26235,9 +26274,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.38.4/drive
  
  	dev = crtc->dev;
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_drv.c linux-2.6.38.4/drivers/gpu/drm/drm_drv.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_drv.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_drv.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_drv.c linux-2.6.38.6/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_drv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_drv.c	2011-04-28 19:34:15.000000000 -0400
 @@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
  
  	dev = file_priv->minor->dev;
@@ -26247,9 +26286,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_drv.c linux-2.6.38.4/drivers/gpu/d
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_fops.c linux-2.6.38.4/drivers/gpu/drm/drm_fops.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_fops.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_fops.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_fops.c linux-2.6.38.6/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_fops.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_fops.c	2011-04-28 19:34:15.000000000 -0400
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -26299,9 +26338,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_fops.c linux-2.6.38.4/drivers/gpu/
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_global.c linux-2.6.38.4/drivers/gpu/drm/drm_global.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_global.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_global.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_global.c linux-2.6.38.6/drivers/gpu/drm/drm_global.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_global.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_global.c	2011-04-28 19:34:15.000000000 -0400
 @@ -36,7 +36,7 @@
  struct drm_global_item {
  	struct mutex mutex;
@@ -26359,9 +26398,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_global.c linux-2.6.38.4/drivers/gp
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_info.c linux-2.6.38.4/drivers/gpu/drm/drm_info.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_info.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_info.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_info.c linux-2.6.38.6/drivers/gpu/drm/drm_info.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_info.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_info.c	2011-04-28 19:34:15.000000000 -0400
 @@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void
  	struct drm_local_map *map;
  	struct drm_map_list *r_list;
@@ -26402,9 +26441,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_info.c linux-2.6.38.4/drivers/gpu/
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.6/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_ioctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -26414,9 +26453,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.38.4/drivers/gpu
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_lock.c linux-2.6.38.4/drivers/gpu/drm/drm_lock.c
---- linux-2.6.38.4/drivers/gpu/drm/drm_lock.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/drm_lock.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/drm_lock.c linux-2.6.38.6/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.38.6/drivers/gpu/drm/drm_lock.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/drm_lock.c	2011-04-28 19:34:15.000000000 -0400
 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
  		if (drm_lock_take(&master->lock, lock->context)) {
  			master->lock.file_priv = file_priv;
@@ -26435,9 +26474,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/drm_lock.c linux-2.6.38.4/drivers/gpu/
  
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.6/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.38.6/drivers/gpu/drm/i810/i810_dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i810/i810_dma.c	2011-04-28 19:34:15.000000000 -0400
 @@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
@@ -26460,9 +26499,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.38.4/drivers
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i810/i810_drv.h linux-2.6.38.6/drivers/gpu/drm/i810/i810_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/i810/i810_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i810/i810_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
  	int page_flipping;
  
@@ -26474,9 +26513,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i810/i810_drv.h linux-2.6.38.4/drivers
  
  	int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i830/i830_drv.h linux-2.6.38.6/drivers/gpu/drm/i830/i830_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/i830/i830_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i830/i830_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -115,8 +115,8 @@ typedef struct drm_i830_private {
  	int page_flipping;
  
@@ -26488,9 +26527,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i830/i830_drv.h linux-2.6.38.4/drivers
  
  	int use_mi_batchbuffer_start;
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.6/drivers/gpu/drm/i830/i830_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/i830/i830_irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i830/i830_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_
  
  	I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
@@ -26546,9 +26585,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i830/i830_irq.c linux-2.6.38.4/drivers
  	init_waitqueue_head(&dev_priv->irq_queue);
  }
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-28 19:34:15.000000000 -0400
 @@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_
  	}
  }
@@ -26558,9 +26597,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.38.4/drive
  	.init = ch7017_init,
  	.detect = ch7017_detect,
  	.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-28 19:34:15.000000000 -0400
 @@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_
  	}
  }
@@ -26570,9 +26609,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.38.4/drive
  	.init = ch7xxx_init,
  	.detect = ch7xxx_detect,
  	.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/dvo.h linux-2.6.38.6/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.38.6/drivers/gpu/drm/i915/dvo.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/dvo.h	2011-04-28 19:34:15.000000000 -0400
 @@ -122,23 +122,23 @@ struct intel_dvo_dev_ops {
  	 *
  	 * \return singly-linked list of modes or NULL if no modes found.
@@ -26605,9 +26644,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo.h linux-2.6.38.4/drivers/gpu/
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-28 19:34:15.000000000 -0400
 @@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dv
  	}
  }
@@ -26617,9 +26656,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.38.4/drivers
  	.init = ivch_init,
  	.dpms = ivch_dpms,
  	.mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.6/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/dvo_sil164.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/dvo_sil164.c	2011-04-28 19:34:15.000000000 -0400
 @@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_
  	}
  }
@@ -26629,9 +26668,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.38.4/drive
  	.init = sil164_init,
  	.detect = sil164_detect,
  	.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.6/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/dvo_tfp410.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/dvo_tfp410.c	2011-04-28 19:34:15.000000000 -0400
 @@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_
  	}
  }
@@ -26641,9 +26680,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.38.4/drive
  	.init = tfp410_init,
  	.detect = tfp410_detect,
  	.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.38.6/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/i915_debugfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/i915_debugfs.c	2011-04-28 19:57:25.000000000 -0400
 @@ -496,7 +496,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
@@ -26653,9 +26692,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.38.4/dri
  	for (i = 0; i < I915_NUM_RINGS; i++) {
  		if (IS_GEN6(dev)) {
  			seq_printf(m, "Graphics Interrupt mask (%s):	%08x\n",
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.6/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/i915_dma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/i915_dma.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(s
  	bool can_switch;
  
@@ -26665,9 +26704,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_dma.c linux-2.6.38.4/drivers
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.c	2011-04-28 19:34:15.000000000 -0400
 @@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_o
       .restore = i915_pm_resume,
  };
@@ -26677,9 +26716,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.38.4/drivers
  	.fault = i915_gem_fault,
  	.open = drm_gem_vm_open,
  	.close = drm_gem_vm_close,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/i915_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -288,7 +288,7 @@ typedef struct drm_i915_private {
  	int current_page;
  	int page_flipping;
@@ -26707,9 +26746,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_drv.h linux-2.6.38.4/drivers
  {
  	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.38.6/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-04-28 19:57:25.000000000 -0400
 @@ -904,7 +904,7 @@ i915_gem_execbuffer_wait_for_flips(struc
  	flips = 0;
  	list_for_each_entry(obj, objects, exec_list) {
@@ -26719,9 +26758,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-2.6.3
  	}
  	if (flips) {
  		int plane, flip_mask, ret;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c	2011-04-18 17:27:13.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.6/drivers/gpu/drm/i915/i915_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/i915_irq.c	2011-04-18 17:27:13.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/i915_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1106,7 +1106,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
  	int irq_received;
  	int ret = IRQ_NONE;
@@ -26740,9 +26779,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/i915_irq.c linux-2.6.38.4/drivers
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.6/drivers/gpu/drm/i915/intel_display.c
+--- linux-2.6.38.6/drivers/gpu/drm/i915/intel_display.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/i915/intel_display.c	2011-05-10 22:06:56.000000000 -0400
 @@ -1631,7 +1631,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
  		wait_event(dev_priv->pending_flip_queue,
@@ -26779,9 +26818,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/i915/intel_display.c linux-2.6.38.4/dr
  
  	switch (INTEL_INFO(dev)->gen) {
  	case 2:
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/mga/mga_drv.h linux-2.6.38.6/drivers/gpu/drm/mga/mga_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/mga/mga_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/mga/mga_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
  	u32 clear_cmd;
  	u32 maccess;
@@ -26794,9 +26833,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/mga/mga_drv.h linux-2.6.38.4/drivers/g
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.6/drivers/gpu/drm/mga/mga_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/mga/mga_irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/mga/mga_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -26833,9 +26872,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/mga/mga_irq.c linux-2.6.38.4/drivers/g
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -226,7 +226,7 @@ struct nouveau_channel {
  		struct list_head pending;
  		uint32_t sequence;
@@ -26854,9 +26893,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.38.4/d
  	} ttm;
  
  	struct {
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-04-28 19:57:25.000000000 -0400
 @@ -83,7 +83,7 @@ nouveau_fence_update(struct nouveau_chan
  		if (USE_REFCNT(dev))
  			sequence = nvchan_rd32(chan, 0x48);
@@ -26875,9 +26914,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.38.4
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-04-28 19:57:25.000000000 -0400
 @@ -241,7 +241,7 @@ validate_init(struct nouveau_channel *ch
  	int trycnt = 0;
  	int ret, i;
@@ -26887,9 +26926,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.38.4/d
  retry:
  	if (++trycnt > 100000) {
  		NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_state.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/nouveau/nouveau_state.c	2011-04-28 19:34:15.000000000 -0400
 @@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switc
  	bool can_switch;
  
@@ -26899,9 +26938,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.38.4
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.38.6/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-2.6.38.6/drivers/gpu/drm/nouveau/nv04_graph.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/nouveau/nv04_graph.c	2011-04-28 19:57:25.000000000 -0400
 @@ -552,7 +552,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
  			u32 class, u32 mthd, u32 data)
@@ -26911,9 +26950,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.38.4/dr
  	return 0;
  }
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/r128/r128_cce.c linux-2.6.38.6/drivers/gpu/drm/r128/r128_cce.c
+--- linux-2.6.38.6/drivers/gpu/drm/r128/r128_cce.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/r128/r128_cce.c	2011-04-28 19:57:25.000000000 -0400
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
  	/* GH: Simple idle check.
@@ -26923,9 +26962,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_cce.c linux-2.6.38.4/drivers
  
  	/* We don't support anything other than bus-mastering ring mode,
  	 * but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/r128/r128_drv.h linux-2.6.38.6/drivers/gpu/drm/r128/r128_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/r128/r128_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/r128/r128_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
  	int is_pci;
  	unsigned long cce_buffers_offset;
@@ -26943,9 +26982,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_drv.h linux-2.6.38.4/drivers
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.6/drivers/gpu/drm/r128/r128_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/r128/r128_irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/r128/r128_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
  	if (crtc != 0)
  		return 0;
@@ -26964,9 +27003,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_irq.c linux-2.6.38.4/drivers
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c
---- linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/r128/r128_state.c linux-2.6.38.6/drivers/gpu/drm/r128/r128_state.c
+--- linux-2.6.38.6/drivers/gpu/drm/r128/r128_state.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/r128/r128_state.c	2011-04-28 19:57:25.000000000 -0400
 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -26980,9 +27019,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/r128/r128_state.c linux-2.6.38.4/drive
  }
  
  #endif
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.6/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/mkregtable.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/mkregtable.c	2011-04-28 19:34:15.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
@@ -27000,9 +27039,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.38.4/dri
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_device.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_device.c	2011-04-28 19:34:15.000000000 -0400
 @@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch
  	bool can_switch;
  
@@ -27012,9 +27051,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.38.4/
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
  	/* SW interrupt */
@@ -27024,9 +27063,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.38.4/dri
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_fence.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_fence.c	2011-04-28 19:57:25.000000000 -0400
 @@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_devi
  		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
  		return 0;
@@ -27045,9 +27084,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.38.4/d
  	INIT_LIST_HEAD(&rdev->fence_drv.created);
  	INIT_LIST_HEAD(&rdev->fence_drv.emited);
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon.h linux-2.6.38.6/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon.h	2011-04-28 19:57:25.000000000 -0400
 @@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_d
   */
  struct radeon_fence_driver {
@@ -27057,9 +27096,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon.h linux-2.6.38.4/drivers
  	uint32_t			last_seq;
  	unsigned long			last_jiffies;
  	unsigned long			last_timeout;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
  	request = compat_alloc_user_space(sizeof(*request));
  	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -27069,9 +27108,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.38.4/d
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
  	unsigned int ret;
  	RING_LOCALS;
@@ -27092,9 +27131,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.38.4/dri
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_state.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_state.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
  	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
  		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -27113,9 +27152,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.38.4/d
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ttm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/radeon_ttm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(str
  	man->size = size >> PAGE_SHIFT;
  }
@@ -27176,9 +27215,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.38.4/dri
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
  }
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c
---- linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.6/drivers/gpu/drm/radeon/rs690.c
+--- linux-2.6.38.6/drivers/gpu/drm/radeon/rs690.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/radeon/rs690.c	2011-04-28 19:34:15.000000000 -0400
 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
  		if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
  			rdev->pm.sideport_bandwidth.full)
@@ -27192,9 +27231,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/radeon/rs690.c linux-2.6.38.4/drivers/
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
  	return best_bo;
  }
@@ -27252,9 +27291,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.38.4/drivers
  
  static const struct vm_operations_struct ttm_bo_vm_ops = {
  	.fault = ttm_bo_vm_fault,
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -396,9 +396,9 @@ static int ttm_pool_get_num_unused_pages
   */
  static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)
@@ -27267,9 +27306,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-2.6.38.4/dr
  	struct ttm_page_pool *pool;
  
  	pool_offset = pool_offset % NUM_POOLS;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/via/via_drv.h linux-2.6.38.6/drivers/gpu/drm/via/via_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/via/via_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/via/via_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -27288,9 +27327,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/via/via_drv.h linux-2.6.38.4/drivers/g
  	drm_via_state_t hc_state;
  	char pci_buf[VIA_PCI_BUF_SIZE];
  	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/via/via_irq.c linux-2.6.38.6/drivers/gpu/drm/via/via_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/via/via_irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/via/via_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -27361,9 +27400,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/via/via_irq.c linux-2.6.38.4/drivers/g
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -240,7 +240,7 @@ struct vmw_private {
  	 * Fencing and IRQs.
  	 */
@@ -27373,9 +27412,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-2.6.38.4/dri
  	wait_queue_head_t fence_queue;
  	wait_queue_head_t fifo_queue;
  	atomic_t fence_queue_waiters;
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-04-28 19:57:25.000000000 -0400
 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
  	while (!vmw_lag_lt(queue, us)) {
  		spin_lock(&queue->lock);
@@ -27385,9 +27424,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-2.6.38.4/d
  		else {
  			fence = list_first_entry(&queue->head,
  						 struct vmw_fence, head);
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-04-28 19:57:25.000000000 -0400
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
  		 (unsigned int) min,
  		 (unsigned int) fifo->capabilities);
@@ -27424,9 +27463,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-2.6.38.4/dr
  	.fault = vmw_fifo_vm_fault,
  	.open = NULL,
  	.close = NULL
-diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-04-28 19:57:25.000000000 -0400
 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
  	 * emitted. Then the fence is stale and signaled.
  	 */
@@ -27445,9 +27484,9 @@ diff -urNp linux-2.6.38.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-2.6.38.4/dri
  	ret = 0;
  
  	for (;;) {
-diff -urNp linux-2.6.38.4/drivers/hid/hid-core.c linux-2.6.38.4/drivers/hid/hid-core.c
---- linux-2.6.38.4/drivers/hid/hid-core.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/drivers/hid/hid-core.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/hid/hid-core.c linux-2.6.38.6/drivers/hid/hid-core.c
+--- linux-2.6.38.6/drivers/hid/hid-core.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/drivers/hid/hid-core.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1846,7 +1846,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
@@ -27466,9 +27505,9 @@ diff -urNp linux-2.6.38.4/drivers/hid/hid-core.c linux-2.6.38.4/drivers/hid/hid-
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff -urNp linux-2.6.38.4/drivers/hid/usbhid/hiddev.c linux-2.6.38.4/drivers/hid/usbhid/hiddev.c
---- linux-2.6.38.4/drivers/hid/usbhid/hiddev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hid/usbhid/hiddev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/hid/usbhid/hiddev.c linux-2.6.38.6/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.38.6/drivers/hid/usbhid/hiddev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/hid/usbhid/hiddev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *fi
  		break;
  
@@ -27478,9 +27517,9 @@ diff -urNp linux-2.6.38.4/drivers/hid/usbhid/hiddev.c linux-2.6.38.4/drivers/hid
  			break;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.38.4/drivers/hwmon/lis3lv02d.c linux-2.6.38.4/drivers/hwmon/lis3lv02d.c
---- linux-2.6.38.4/drivers/hwmon/lis3lv02d.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/lis3lv02d.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/hwmon/lis3lv02d.c linux-2.6.38.6/drivers/hwmon/lis3lv02d.c
+--- linux-2.6.38.6/drivers/hwmon/lis3lv02d.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/hwmon/lis3lv02d.c	2011-04-28 19:57:25.000000000 -0400
 @@ -436,7 +436,7 @@ static irqreturn_t lis302dl_interrupt(in
  	 * the lid is closed. This leads to interrupts as soon as a little move
  	 * is done.
@@ -27517,9 +27556,9 @@ diff -urNp linux-2.6.38.4/drivers/hwmon/lis3lv02d.c linux-2.6.38.4/drivers/hwmon
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-diff -urNp linux-2.6.38.4/drivers/hwmon/lis3lv02d.h linux-2.6.38.4/drivers/hwmon/lis3lv02d.h
---- linux-2.6.38.4/drivers/hwmon/lis3lv02d.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/lis3lv02d.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/hwmon/lis3lv02d.h linux-2.6.38.6/drivers/hwmon/lis3lv02d.h
+--- linux-2.6.38.6/drivers/hwmon/lis3lv02d.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/hwmon/lis3lv02d.h	2011-04-28 19:57:25.000000000 -0400
 @@ -265,7 +265,7 @@ struct lis3lv02d {
  	struct input_polled_dev	*idev;     /* input device */
  	struct platform_device	*pdev;     /* platform device */
@@ -27529,9 +27568,9 @@ diff -urNp linux-2.6.38.4/drivers/hwmon/lis3lv02d.h linux-2.6.38.4/drivers/hwmon
  	union axis_conversion	ac;        /* hw -> logical axis */
  	int			mapped_btns[3];
  
-diff -urNp linux-2.6.38.4/drivers/hwmon/sht15.c linux-2.6.38.4/drivers/hwmon/sht15.c
---- linux-2.6.38.4/drivers/hwmon/sht15.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/sht15.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/hwmon/sht15.c linux-2.6.38.6/drivers/hwmon/sht15.c
+--- linux-2.6.38.6/drivers/hwmon/sht15.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/drivers/hwmon/sht15.c	2011-04-28 19:57:25.000000000 -0400
 @@ -113,7 +113,7 @@ struct sht15_data {
  	int				supply_uV;
  	int				supply_uV_valid;
@@ -27580,9 +27619,9 @@ diff -urNp linux-2.6.38.4/drivers/hwmon/sht15.c linux-2.6.38.4/drivers/hwmon/sht
  			return;
  	}
  	/* Read the data back from the device */
-diff -urNp linux-2.6.38.4/drivers/hwmon/w83791d.c linux-2.6.38.4/drivers/hwmon/w83791d.c
---- linux-2.6.38.4/drivers/hwmon/w83791d.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/hwmon/w83791d.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/hwmon/w83791d.c linux-2.6.38.6/drivers/hwmon/w83791d.c
+--- linux-2.6.38.6/drivers/hwmon/w83791d.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/hwmon/w83791d.c	2011-04-28 19:34:15.000000000 -0400
 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
  			  struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
@@ -27594,9 +27633,9 @@ diff -urNp linux-2.6.38.4/drivers/hwmon/w83791d.c linux-2.6.38.4/drivers/hwmon/w
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.38.4/drivers/ide/ide-cd.c linux-2.6.38.4/drivers/ide/ide-cd.c
---- linux-2.6.38.4/drivers/ide/ide-cd.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/ide/ide-cd.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/ide/ide-cd.c linux-2.6.38.6/drivers/ide/ide-cd.c
+--- linux-2.6.38.6/drivers/ide/ide-cd.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/ide/ide-cd.c	2011-04-28 19:34:15.000000000 -0400
 @@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
@@ -27606,9 +27645,9 @@ diff -urNp linux-2.6.38.4/drivers/ide/ide-cd.c linux-2.6.38.4/drivers/ide/ide-cd
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-2.6.38.4/drivers/infiniband/core/cm.c linux-2.6.38.4/drivers/infiniband/core/cm.c
---- linux-2.6.38.4/drivers/infiniband/core/cm.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/core/cm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/core/cm.c linux-2.6.38.6/drivers/infiniband/core/cm.c
+--- linux-2.6.38.6/drivers/infiniband/core/cm.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/core/cm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -27748,9 +27787,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/core/cm.c linux-2.6.38.4/drivers/in
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c
---- linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/core/fmr_pool.c linux-2.6.38.6/drivers/infiniband/core/fmr_pool.c
+--- linux-2.6.38.6/drivers/infiniband/core/fmr_pool.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/core/fmr_pool.c	2011-04-28 19:57:25.000000000 -0400
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
  	struct task_struct       *thread;
@@ -27818,9 +27857,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/core/fmr_pool.c linux-2.6.38.4/driv
  				wake_up_process(pool->thread);
  			}
  		}
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c
---- linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.6/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-2.6.38.6/drivers/infiniband/hw/cxgb4/mem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/cxgb4/mem.c	2011-04-28 19:57:25.000000000 -0400
 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
  	int err;
  	struct fw_ri_tpte tpt;
@@ -27839,9 +27878,61 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/cxgb4/mem.c linux-2.6.38.4/drive
  	}
  	PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
  	     __func__, stag_state, type, pdid, stag_idx);
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_rc.c linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_rc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_rc.c	2011-05-11 18:35:16.000000000 -0400
+@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
+ 		struct ib_atomic_eth *ateth;
+ 		struct ipath_ack_entry *e;
+ 		u64 vaddr;
+-		atomic64_t *maddr;
++		atomic64_unchecked_t *maddr;
+ 		u64 sdata;
+ 		u32 rkey;
+ 		u8 next;
+@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *de
+ 					    IB_ACCESS_REMOTE_ATOMIC)))
+ 			goto nack_acc_unlck;
+ 		/* Perform atomic OP and save result. */
+-		maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
++		maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
+ 		sdata = be64_to_cpu(ateth->swap_data);
+ 		e = &qp->s_ack_queue[qp->r_head_ack_queue];
+ 		e->atomic_data = (opcode == OP(FETCH_ADD)) ?
+-			(u64) atomic64_add_return(sdata, maddr) - sdata :
++			(u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
+ 			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
+ 				      be64_to_cpu(ateth->compare_data),
+ 				      sdata);
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_ruc.c linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-05-11 18:35:16.000000000 -0400
+@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
+ 	unsigned long flags;
+ 	struct ib_wc wc;
+ 	u64 sdata;
+-	atomic64_t *maddr;
++	atomic64_unchecked_t *maddr;
+ 	enum ib_wc_status send_status;
+ 
+ 	/*
+@@ -382,11 +382,11 @@ again:
+ 					    IB_ACCESS_REMOTE_ATOMIC)))
+ 			goto acc_err;
+ 		/* Perform atomic OP and save result. */
+-		maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
++		maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
+ 		sdata = wqe->wr.wr.atomic.compare_add;
+ 		*(u64 *) sqp->s_sge.sge.vaddr =
+ 			(wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
+-			(u64) atomic64_add_return(sdata, maddr) - sdata :
++			(u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
+ 			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
+ 				      sdata, wqe->wr.wr.atomic.swap);
+ 		goto send_comp;
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/nes/nes.c linux-2.6.38.6/drivers/infiniband/hw/nes/nes.c
+--- linux-2.6.38.6/drivers/infiniband/hw/nes/nes.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/nes/nes.c	2011-04-28 19:57:25.000000000 -0400
 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -27860,9 +27951,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes.c linux-2.6.38.4/drivers
  
  	/* Free the control structures */
  
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.6/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-2.6.38.6/drivers/infiniband/hw/nes/nes_cm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/nes/nes_cm.c	2011-04-28 19:57:25.000000000 -0400
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -28059,9 +28150,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.38.4/driv
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/nes/nes.h linux-2.6.38.6/drivers/infiniband/hw/nes/nes.h
+--- linux-2.6.38.6/drivers/infiniband/hw/nes/nes.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/nes/nes.h	2011-04-28 19:57:25.000000000 -0400
 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -28113,9 +28204,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes.h linux-2.6.38.4/drivers
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.38.6/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-2.6.38.6/drivers/infiniband/hw/nes/nes_nic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/nes/nes_nic.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
@@ -28166,9 +28257,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.38.4/dri
  	target_stat_values[++index] = nesadapter->free_4kpbl;
  	target_stat_values[++index] = nesadapter->free_256pbl;
  	target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.6/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-2.6.38.6/drivers/infiniband/hw/nes/nes_verbs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/nes/nes_verbs.c	2011-04-28 19:57:25.000000000 -0400
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -28200,9 +28291,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.38.4/d
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff -urNp linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/infiniband/hw/qib/qib.h linux-2.6.38.6/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.38.6/drivers/infiniband/hw/qib/qib.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/infiniband/hw/qib/qib.h	2011-04-28 19:34:15.000000000 -0400
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -28211,9 +28302,9 @@ diff -urNp linux-2.6.38.4/drivers/infiniband/hw/qib/qib.h linux-2.6.38.4/drivers
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-2.6.38.4/drivers/input/gameport/gameport.c linux-2.6.38.4/drivers/input/gameport/gameport.c
---- linux-2.6.38.4/drivers/input/gameport/gameport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/gameport/gameport.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/input/gameport/gameport.c linux-2.6.38.6/drivers/input/gameport/gameport.c
+--- linux-2.6.38.6/drivers/input/gameport/gameport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/input/gameport/gameport.c	2011-04-28 19:57:25.000000000 -0400
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -28231,9 +28322,9 @@ diff -urNp linux-2.6.38.4/drivers/input/gameport/gameport.c linux-2.6.38.4/drive
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff -urNp linux-2.6.38.4/drivers/input/input.c linux-2.6.38.4/drivers/input/input.c
---- linux-2.6.38.4/drivers/input/input.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/input.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/input/input.c linux-2.6.38.6/drivers/input/input.c
+--- linux-2.6.38.6/drivers/input/input.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/input/input.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1820,7 +1820,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
@@ -28252,9 +28343,9 @@ diff -urNp linux-2.6.38.4/drivers/input/input.c linux-2.6.38.4/drivers/input/inp
  
  	error = device_add(&dev->dev);
  	if (error)
-diff -urNp linux-2.6.38.4/drivers/input/joystick/xpad.c linux-2.6.38.4/drivers/input/joystick/xpad.c
---- linux-2.6.38.4/drivers/input/joystick/xpad.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/joystick/xpad.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/input/joystick/xpad.c linux-2.6.38.6/drivers/input/joystick/xpad.c
+--- linux-2.6.38.6/drivers/input/joystick/xpad.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/input/joystick/xpad.c	2011-04-28 19:57:25.000000000 -0400
 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
@@ -28273,9 +28364,9 @@ diff -urNp linux-2.6.38.4/drivers/input/joystick/xpad.c linux-2.6.38.4/drivers/i
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff -urNp linux-2.6.38.4/drivers/input/mousedev.c linux-2.6.38.4/drivers/input/mousedev.c
---- linux-2.6.38.4/drivers/input/mousedev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/mousedev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/input/mousedev.c linux-2.6.38.6/drivers/input/mousedev.c
+--- linux-2.6.38.6/drivers/input/mousedev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/input/mousedev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file
  
  	spin_unlock_irq(&client->packet_lock);
@@ -28285,9 +28376,9 @@ diff -urNp linux-2.6.38.4/drivers/input/mousedev.c linux-2.6.38.4/drivers/input/
  		return -EFAULT;
  
  	return count;
-diff -urNp linux-2.6.38.4/drivers/input/serio/serio.c linux-2.6.38.4/drivers/input/serio/serio.c
---- linux-2.6.38.4/drivers/input/serio/serio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/input/serio/serio.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/input/serio/serio.c linux-2.6.38.6/drivers/input/serio/serio.c
+--- linux-2.6.38.6/drivers/input/serio/serio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/input/serio/serio.c	2011-04-28 19:57:25.000000000 -0400
 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -28306,9 +28397,9 @@ diff -urNp linux-2.6.38.4/drivers/input/serio/serio.c linux-2.6.38.4/drivers/inp
  	serio->dev.bus = &serio_bus;
  	serio->dev.release = serio_release_port;
  	serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-2.6.38.4/drivers/isdn/capi/capi.c linux-2.6.38.4/drivers/isdn/capi/capi.c
---- linux-2.6.38.4/drivers/isdn/capi/capi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/capi/capi.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/isdn/capi/capi.c linux-2.6.38.6/drivers/isdn/capi/capi.c
+--- linux-2.6.38.6/drivers/isdn/capi/capi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/isdn/capi/capi.c	2011-04-28 19:57:25.000000000 -0400
 @@ -89,8 +89,8 @@ struct capiminor {
  
  	struct capi20_appl	*ap;
@@ -28346,9 +28437,9 @@ diff -urNp linux-2.6.38.4/drivers/isdn/capi/capi.c linux-2.6.38.4/drivers/isdn/c
  		capimsg_setu32(skb->data, 8, mp->ncci);	/* NCCI */
  		capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
  		capimsg_setu16(skb->data, 16, len);	/* Data length */
-diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/common.c linux-2.6.38.4/drivers/isdn/gigaset/common.c
---- linux-2.6.38.4/drivers/isdn/gigaset/common.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/gigaset/common.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/isdn/gigaset/common.c linux-2.6.38.6/drivers/isdn/gigaset/common.c
+--- linux-2.6.38.6/drivers/isdn/gigaset/common.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/isdn/gigaset/common.c	2011-04-28 19:34:15.000000000 -0400
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
@@ -28358,9 +28449,9 @@ diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/common.c linux-2.6.38.4/drivers/i
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/isdn/gigaset/gigaset.h linux-2.6.38.6/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.38.6/drivers/isdn/gigaset/gigaset.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/isdn/gigaset/gigaset.h	2011-04-28 19:34:15.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -28378,9 +28469,9 @@ diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/gigaset.h linux-2.6.38.4/drivers/
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/interface.c linux-2.6.38.4/drivers/isdn/gigaset/interface.c
---- linux-2.6.38.4/drivers/isdn/gigaset/interface.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/gigaset/interface.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/isdn/gigaset/interface.c linux-2.6.38.6/drivers/isdn/gigaset/interface.c
+--- linux-2.6.38.6/drivers/isdn/gigaset/interface.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/isdn/gigaset/interface.c	2011-04-28 19:34:15.000000000 -0400
 @@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
  		return -ERESTARTSYS;
  	tty->driver_data = cs;
@@ -28468,9 +28559,9 @@ diff -urNp linux-2.6.38.4/drivers/isdn/gigaset/interface.c linux-2.6.38.4/driver
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/isdn/hardware/avm/b1.c linux-2.6.38.6/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.38.6/drivers/isdn/hardware/avm/b1.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/isdn/hardware/avm/b1.c	2011-04-28 19:34:15.000000000 -0400
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
@@ -28489,9 +28580,9 @@ diff -urNp linux-2.6.38.4/drivers/isdn/hardware/avm/b1.c linux-2.6.38.4/drivers/
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-2.6.38.4/drivers/isdn/icn/icn.c linux-2.6.38.4/drivers/isdn/icn/icn.c
---- linux-2.6.38.4/drivers/isdn/icn/icn.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/isdn/icn/icn.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/isdn/icn/icn.c linux-2.6.38.6/drivers/isdn/icn/icn.c
+--- linux-2.6.38.6/drivers/isdn/icn/icn.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/isdn/icn/icn.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
@@ -28501,9 +28592,9 @@ diff -urNp linux-2.6.38.4/drivers/isdn/icn/icn.c linux-2.6.38.4/drivers/isdn/icn
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-2.6.38.4/drivers/lguest/core.c linux-2.6.38.4/drivers/lguest/core.c
---- linux-2.6.38.4/drivers/lguest/core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/lguest/core.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/lguest/core.c linux-2.6.38.6/drivers/lguest/core.c
+--- linux-2.6.38.6/drivers/lguest/core.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/lguest/core.c	2011-04-28 19:34:15.000000000 -0400
 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
  	 * it's worked so far.  The end address needs +1 because __get_vm_area
  	 * allocates an extra guard page, so we need space for that.
@@ -28531,9 +28622,9 @@ diff -urNp linux-2.6.38.4/drivers/lguest/core.c linux-2.6.38.4/drivers/lguest/co
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.38.4/drivers/lguest/x86/core.c linux-2.6.38.4/drivers/lguest/x86/core.c
---- linux-2.6.38.4/drivers/lguest/x86/core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/lguest/x86/core.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/lguest/x86/core.c linux-2.6.38.6/drivers/lguest/x86/core.c
+--- linux-2.6.38.6/drivers/lguest/x86/core.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/lguest/x86/core.c	2011-04-28 19:34:15.000000000 -0400
 @@ -59,7 +59,7 @@ static struct {
  /* Offset from where switcher.S was compiled to where we've copied it */
  static unsigned long switcher_offset(void)
@@ -28575,9 +28666,9 @@ diff -urNp linux-2.6.38.4/drivers/lguest/x86/core.c linux-2.6.38.4/drivers/lgues
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-2.6.38.4/drivers/lguest/x86/switcher_32.S linux-2.6.38.4/drivers/lguest/x86/switcher_32.S
---- linux-2.6.38.4/drivers/lguest/x86/switcher_32.S	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/lguest/x86/switcher_32.S	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/lguest/x86/switcher_32.S linux-2.6.38.6/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.38.6/drivers/lguest/x86/switcher_32.S	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/lguest/x86/switcher_32.S	2011-04-28 19:34:15.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -28636,9 +28727,9 @@ diff -urNp linux-2.6.38.4/drivers/lguest/x86/switcher_32.S linux-2.6.38.4/driver
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-2.6.38.4/drivers/md/dm.c linux-2.6.38.4/drivers/md/dm.c
---- linux-2.6.38.4/drivers/md/dm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/dm.c linux-2.6.38.6/drivers/md/dm.c
+--- linux-2.6.38.6/drivers/md/dm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/dm.c	2011-04-28 19:57:25.000000000 -0400
 @@ -162,9 +162,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
@@ -28693,9 +28784,9 @@ diff -urNp linux-2.6.38.4/drivers/md/dm.c linux-2.6.38.4/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-2.6.38.4/drivers/md/dm-ioctl.c linux-2.6.38.4/drivers/md/dm-ioctl.c
---- linux-2.6.38.4/drivers/md/dm-ioctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/dm-ioctl.c linux-2.6.38.6/drivers/md/dm-ioctl.c
+--- linux-2.6.38.6/drivers/md/dm-ioctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/dm-ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
@@ -28705,9 +28796,9 @@ diff -urNp linux-2.6.38.4/drivers/md/dm-ioctl.c linux-2.6.38.4/drivers/md/dm-ioc
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-2.6.38.4/drivers/md/dm-raid1.c linux-2.6.38.4/drivers/md/dm-raid1.c
---- linux-2.6.38.4/drivers/md/dm-raid1.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-raid1.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/dm-raid1.c linux-2.6.38.6/drivers/md/dm-raid1.c
+--- linux-2.6.38.6/drivers/md/dm-raid1.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/dm-raid1.c	2011-04-28 19:57:25.000000000 -0400
 @@ -42,7 +42,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -28780,9 +28871,9 @@ diff -urNp linux-2.6.38.4/drivers/md/dm-raid1.c linux-2.6.38.4/drivers/md/dm-rai
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-2.6.38.4/drivers/md/dm-stripe.c linux-2.6.38.4/drivers/md/dm-stripe.c
---- linux-2.6.38.4/drivers/md/dm-stripe.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-stripe.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/dm-stripe.c linux-2.6.38.6/drivers/md/dm-stripe.c
+--- linux-2.6.38.6/drivers/md/dm-stripe.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/dm-stripe.c	2011-04-28 19:57:25.000000000 -0400
 @@ -20,7 +20,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
@@ -28821,9 +28912,9 @@ diff -urNp linux-2.6.38.4/drivers/md/dm-stripe.c linux-2.6.38.4/drivers/md/dm-st
  			    DM_IO_ERROR_THRESHOLD)
  				schedule_work(&sc->trigger_event);
  		}
-diff -urNp linux-2.6.38.4/drivers/md/dm-table.c linux-2.6.38.4/drivers/md/dm-table.c
---- linux-2.6.38.4/drivers/md/dm-table.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/dm-table.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/dm-table.c linux-2.6.38.6/drivers/md/dm-table.c
+--- linux-2.6.38.6/drivers/md/dm-table.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/dm-table.c	2011-04-28 19:34:15.000000000 -0400
 @@ -372,7 +372,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
@@ -28833,9 +28924,9 @@ diff -urNp linux-2.6.38.4/drivers/md/dm-table.c linux-2.6.38.4/drivers/md/dm-tab
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.38.4/drivers/md/md.c linux-2.6.38.4/drivers/md/md.c
---- linux-2.6.38.4/drivers/md/md.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/md.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/md.c linux-2.6.38.6/drivers/md/md.c
+--- linux-2.6.38.6/drivers/md/md.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/md.c	2011-04-28 19:57:25.000000000 -0400
 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
@@ -28950,9 +29041,9 @@ diff -urNp linux-2.6.38.4/drivers/md/md.c linux-2.6.38.4/drivers/md/md.c
  		/* sync IO will cause sync_io to increase before the disk_stats
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
-diff -urNp linux-2.6.38.4/drivers/md/md.h linux-2.6.38.4/drivers/md/md.h
---- linux-2.6.38.4/drivers/md/md.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/md.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/md.h linux-2.6.38.6/drivers/md/md.h
+--- linux-2.6.38.6/drivers/md/md.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/md.h	2011-04-28 19:57:25.000000000 -0400
 @@ -117,13 +117,13 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
@@ -28978,9 +29069,9 @@ diff -urNp linux-2.6.38.4/drivers/md/md.h linux-2.6.38.4/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.38.4/drivers/md/raid10.c linux-2.6.38.4/drivers/md/raid10.c
---- linux-2.6.38.4/drivers/md/raid10.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/raid10.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/raid10.c linux-2.6.38.6/drivers/md/raid10.c
+--- linux-2.6.38.6/drivers/md/raid10.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/raid10.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1258,7 +1258,7 @@ static void end_sync_read(struct bio *bi
  	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
  		set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -29031,9 +29122,9 @@ diff -urNp linux-2.6.38.4/drivers/md/raid10.c linux-2.6.38.4/drivers/md/raid10.c
  				if (sync_page_io(rdev,
  						 r10_bio->devs[sl].addr +
  						 sect,
-diff -urNp linux-2.6.38.4/drivers/md/raid1.c linux-2.6.38.4/drivers/md/raid1.c
---- linux-2.6.38.4/drivers/md/raid1.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/raid1.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/raid1.c linux-2.6.38.6/drivers/md/raid1.c
+--- linux-2.6.38.6/drivers/md/raid1.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/raid1.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1392,7 +1392,7 @@ static void sync_request_write(mddev_t *
  					if (r1_bio->bios[d]->bi_end_io != end_sync_read)
  						continue;
@@ -29052,9 +29143,9 @@ diff -urNp linux-2.6.38.4/drivers/md/raid1.c linux-2.6.38.4/drivers/md/raid1.c
  					printk(KERN_INFO
  					       "md/raid1:%s: read error corrected "
  					       "(%d sectors at %llu on %s)\n",
-diff -urNp linux-2.6.38.4/drivers/md/raid5.c linux-2.6.38.4/drivers/md/raid5.c
---- linux-2.6.38.4/drivers/md/raid5.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/md/raid5.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/md/raid5.c linux-2.6.38.6/drivers/md/raid5.c
+--- linux-2.6.38.6/drivers/md/raid5.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/md/raid5.c	2011-04-28 19:57:25.000000000 -0400
 @@ -555,7 +555,7 @@ static void ops_run_io(struct stripe_hea
  			bi->bi_next = NULL;
  			if (rw == WRITE &&
@@ -29092,9 +29183,9 @@ diff -urNp linux-2.6.38.4/drivers/md/raid5.c linux-2.6.38.4/drivers/md/raid5.c
  			 > conf->max_nr_stripes)
  			printk(KERN_WARNING
  			       "md/raid:%s: Too many read errors, failing device %s.\n",
-diff -urNp linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.6/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.38.6/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/dvb/dvb-core/dvbdev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
  			const struct dvb_device *template, void *priv, int type)
  {
@@ -29104,9 +29195,9 @@ diff -urNp linux-2.6.38.4/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.38.4/dri
  	struct device *clsdev;
  	int minor;
  	int id;
-diff -urNp linux-2.6.38.4/drivers/media/radio/radio-cadet.c linux-2.6.38.4/drivers/media/radio/radio-cadet.c
---- linux-2.6.38.4/drivers/media/radio/radio-cadet.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/radio/radio-cadet.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/radio/radio-cadet.c linux-2.6.38.6/drivers/media/radio/radio-cadet.c
+--- linux-2.6.38.6/drivers/media/radio/radio-cadet.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/radio/radio-cadet.c	2011-04-28 19:34:15.000000000 -0400
 @@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *f
  		readbuf[i++] = dev->rdsbuf[dev->rdsout++];
  	mutex_unlock(&dev->lock);
@@ -29116,9 +29207,9 @@ diff -urNp linux-2.6.38.4/drivers/media/radio/radio-cadet.c linux-2.6.38.4/drive
  		return -EFAULT;
  	return i;
  }
-diff -urNp linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c
---- linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.6/drivers/media/rc/ir-lirc-codec.c
+--- linux-2.6.38.6/drivers/media/rc/ir-lirc-codec.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/rc/ir-lirc-codec.c	2011-04-28 19:34:15.000000000 -0400
 @@ -277,7 +277,7 @@ static void ir_lirc_close(void *data)
  	return;
  }
@@ -29128,9 +29219,9 @@ diff -urNp linux-2.6.38.4/drivers/media/rc/ir-lirc-codec.c linux-2.6.38.4/driver
  	.owner		= THIS_MODULE,
  	.write		= ir_lirc_transmit_ir,
  	.unlocked_ioctl	= ir_lirc_ioctl,
-diff -urNp linux-2.6.38.4/drivers/media/rc/lirc_dev.c linux-2.6.38.4/drivers/media/rc/lirc_dev.c
---- linux-2.6.38.4/drivers/media/rc/lirc_dev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/rc/lirc_dev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/rc/lirc_dev.c linux-2.6.38.6/drivers/media/rc/lirc_dev.c
+--- linux-2.6.38.6/drivers/media/rc/lirc_dev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/rc/lirc_dev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
  }
  
@@ -29140,9 +29231,9 @@ diff -urNp linux-2.6.38.4/drivers/media/rc/lirc_dev.c linux-2.6.38.4/drivers/med
  	.owner		= THIS_MODULE,
  	.read		= lirc_dev_fop_read,
  	.write		= lirc_dev_fop_write,
-diff -urNp linux-2.6.38.4/drivers/media/rc/rc-main.c linux-2.6.38.4/drivers/media/rc/rc-main.c
---- linux-2.6.38.4/drivers/media/rc/rc-main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/rc/rc-main.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/rc/rc-main.c linux-2.6.38.6/drivers/media/rc/rc-main.c
+--- linux-2.6.38.6/drivers/media/rc/rc-main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/rc/rc-main.c	2011-04-28 19:57:25.000000000 -0400
 @@ -994,7 +994,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
  
  int rc_register_device(struct rc_dev *dev)
@@ -29161,9 +29252,9 @@ diff -urNp linux-2.6.38.4/drivers/media/rc/rc-main.c linux-2.6.38.4/drivers/medi
  	dev_set_name(&dev->dev, "rc%ld", dev->devno);
  	dev_set_drvdata(&dev->dev, dev);
  	rc = device_add(&dev->dev);
-diff -urNp linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c
---- linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.6/drivers/media/video/cx18/cx18-driver.c
+--- linux-2.6.38.6/drivers/media/video/cx18/cx18-driver.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/video/cx18/cx18-driver.c	2011-04-28 19:57:25.000000000 -0400
 @@ -60,7 +60,7 @@ static struct pci_device_id cx18_pci_tbl
  
  MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
@@ -29182,9 +29273,9 @@ diff -urNp linux-2.6.38.4/drivers/media/video/cx18/cx18-driver.c linux-2.6.38.4/
  	if (i >= CX18_MAX_CARDS) {
  		printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
  		       "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
-diff -urNp linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c
---- linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.38.6/drivers/media/video/ivtv/ivtv-driver.c
+--- linux-2.6.38.6/drivers/media/video/ivtv/ivtv-driver.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/video/ivtv/ivtv-driver.c	2011-04-28 19:57:25.000000000 -0400
 @@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl
  MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
  
@@ -29194,9 +29285,9 @@ diff -urNp linux-2.6.38.4/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.38.4/
  
  /* Parameter declarations */
  static int cardtype[IVTV_MAX_CARDS];
-diff -urNp linux-2.6.38.4/drivers/media/video/omap24xxcam.c linux-2.6.38.4/drivers/media/video/omap24xxcam.c
---- linux-2.6.38.4/drivers/media/video/omap24xxcam.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/omap24xxcam.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/video/omap24xxcam.c linux-2.6.38.6/drivers/media/video/omap24xxcam.c
+--- linux-2.6.38.6/drivers/media/video/omap24xxcam.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/video/omap24xxcam.c	2011-04-28 19:57:25.000000000 -0400
 @@ -402,7 +402,7 @@ static void omap24xxcam_vbq_complete(str
  	spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
  
@@ -29206,9 +29297,9 @@ diff -urNp linux-2.6.38.4/drivers/media/video/omap24xxcam.c linux-2.6.38.4/drive
  	if (csr & csr_error) {
  		vb->state = VIDEOBUF_ERROR;
  		if (!atomic_read(&fh->cam->in_reset)) {
-diff -urNp linux-2.6.38.4/drivers/media/video/omap24xxcam.h linux-2.6.38.4/drivers/media/video/omap24xxcam.h
---- linux-2.6.38.4/drivers/media/video/omap24xxcam.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/omap24xxcam.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/video/omap24xxcam.h linux-2.6.38.6/drivers/media/video/omap24xxcam.h
+--- linux-2.6.38.6/drivers/media/video/omap24xxcam.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/video/omap24xxcam.h	2011-04-28 19:57:25.000000000 -0400
 @@ -533,7 +533,7 @@ struct omap24xxcam_fh {
  	spinlock_t vbq_lock; /* spinlock for the videobuf queue */
  	struct videobuf_queue vbq;
@@ -29218,9 +29309,9 @@ diff -urNp linux-2.6.38.4/drivers/media/video/omap24xxcam.h linux-2.6.38.4/drive
  	/* accessing cam here doesn't need serialisation: it's constant */
  	struct omap24xxcam_device *cam;
  };
-diff -urNp linux-2.6.38.4/drivers/media/video/v4l2-device.c linux-2.6.38.4/drivers/media/video/v4l2-device.c
---- linux-2.6.38.4/drivers/media/video/v4l2-device.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/media/video/v4l2-device.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/media/video/v4l2-device.c linux-2.6.38.6/drivers/media/video/v4l2-device.c
+--- linux-2.6.38.6/drivers/media/video/v4l2-device.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/media/video/v4l2-device.c	2011-04-28 19:57:25.000000000 -0400
 @@ -55,9 +55,9 @@ int v4l2_device_register(struct device *
  EXPORT_SYMBOL_GPL(v4l2_device_register);
  
@@ -29233,9 +29324,9 @@ diff -urNp linux-2.6.38.4/drivers/media/video/v4l2-device.c linux-2.6.38.4/drive
  	int len = strlen(basename);
  
  	if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff -urNp linux-2.6.38.4/drivers/message/fusion/mptbase.c linux-2.6.38.4/drivers/message/fusion/mptbase.c
---- linux-2.6.38.4/drivers/message/fusion/mptbase.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/fusion/mptbase.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/message/fusion/mptbase.c linux-2.6.38.6/drivers/message/fusion/mptbase.c
+--- linux-2.6.38.6/drivers/message/fusion/mptbase.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/message/fusion/mptbase.c	2011-04-28 19:34:15.000000000 -0400
 @@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct 
  	seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
  	seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -29250,9 +29341,9 @@ diff -urNp linux-2.6.38.4/drivers/message/fusion/mptbase.c linux-2.6.38.4/driver
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-2.6.38.4/drivers/message/fusion/mptsas.c linux-2.6.38.4/drivers/message/fusion/mptsas.c
---- linux-2.6.38.4/drivers/message/fusion/mptsas.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/fusion/mptsas.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/message/fusion/mptsas.c linux-2.6.38.6/drivers/message/fusion/mptsas.c
+--- linux-2.6.38.6/drivers/message/fusion/mptsas.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/message/fusion/mptsas.c	2011-04-28 19:34:15.000000000 -0400
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
@@ -29301,9 +29392,9 @@ diff -urNp linux-2.6.38.4/drivers/message/fusion/mptsas.c linux-2.6.38.4/drivers
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-2.6.38.4/drivers/message/fusion/mptscsih.c linux-2.6.38.4/drivers/message/fusion/mptscsih.c
---- linux-2.6.38.4/drivers/message/fusion/mptscsih.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/fusion/mptscsih.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/message/fusion/mptscsih.c linux-2.6.38.6/drivers/message/fusion/mptscsih.c
+--- linux-2.6.38.6/drivers/message/fusion/mptscsih.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/message/fusion/mptscsih.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -29329,9 +29420,9 @@ diff -urNp linux-2.6.38.4/drivers/message/fusion/mptscsih.c linux-2.6.38.4/drive
  
  	return h->info_kbuf;
  }
-diff -urNp linux-2.6.38.4/drivers/message/i2o/i2o_proc.c linux-2.6.38.4/drivers/message/i2o/i2o_proc.c
---- linux-2.6.38.4/drivers/message/i2o/i2o_proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/i2o/i2o_proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/message/i2o/i2o_proc.c linux-2.6.38.6/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.38.6/drivers/message/i2o/i2o_proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/message/i2o/i2o_proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -29418,9 +29509,9 @@ diff -urNp linux-2.6.38.4/drivers/message/i2o/i2o_proc.c linux-2.6.38.4/drivers/
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/drivers/message/i2o/iop.c linux-2.6.38.4/drivers/message/i2o/iop.c
---- linux-2.6.38.4/drivers/message/i2o/iop.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/message/i2o/iop.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/message/i2o/iop.c linux-2.6.38.6/drivers/message/i2o/iop.c
+--- linux-2.6.38.6/drivers/message/i2o/iop.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/message/i2o/iop.c	2011-04-28 19:57:25.000000000 -0400
 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
  	spin_lock_irqsave(&c->context_list_lock, flags);
@@ -29444,9 +29535,9 @@ diff -urNp linux-2.6.38.4/drivers/message/i2o/iop.c linux-2.6.38.4/drivers/messa
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-2.6.38.4/drivers/mfd/janz-cmodio.c linux-2.6.38.4/drivers/mfd/janz-cmodio.c
---- linux-2.6.38.4/drivers/mfd/janz-cmodio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mfd/janz-cmodio.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/mfd/janz-cmodio.c linux-2.6.38.6/drivers/mfd/janz-cmodio.c
+--- linux-2.6.38.6/drivers/mfd/janz-cmodio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/mfd/janz-cmodio.c	2011-04-28 19:34:15.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -29455,9 +29546,9 @@ diff -urNp linux-2.6.38.4/drivers/mfd/janz-cmodio.c linux-2.6.38.4/drivers/mfd/j
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-2.6.38.4/drivers/misc/kgdbts.c linux-2.6.38.4/drivers/misc/kgdbts.c
---- linux-2.6.38.4/drivers/misc/kgdbts.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/kgdbts.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/misc/kgdbts.c linux-2.6.38.6/drivers/misc/kgdbts.c
+--- linux-2.6.38.6/drivers/misc/kgdbts.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/misc/kgdbts.c	2011-04-28 19:34:15.000000000 -0400
 @@ -118,7 +118,7 @@
  	} while (0)
  #define MAX_CONFIG_LEN		40
@@ -29476,9 +29567,9 @@ diff -urNp linux-2.6.38.4/drivers/misc/kgdbts.c linux-2.6.38.4/drivers/misc/kgdb
  	.name			= "kgdbts",
  	.read_char		= kgdbts_get_char,
  	.write_char		= kgdbts_put_char,
-diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.6/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.38.6/drivers/misc/sgi-gru/gruhandles.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/misc/sgi-gru/gruhandles.c	2011-04-28 19:34:15.000000000 -0400
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
  	unsigned long nsec;
  
@@ -29490,9 +29581,9 @@ diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruhandles.c linux-2.6.38.4/drive
  	if (mcs_op_statistics[op].max < nsec)
  		mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.6/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.38.6/drivers/misc/sgi-gru/gruprocfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/misc/sgi-gru/gruprocfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -29516,9 +29607,9 @@ diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.38.4/driver
  		max = mcs_op_statistics[op].max;
  		seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
  			   count ? total / count : 0, max);
-diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/misc/sgi-gru/grutables.h linux-2.6.38.6/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.38.6/drivers/misc/sgi-gru/grutables.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/misc/sgi-gru/grutables.h	2011-04-28 19:34:15.000000000 -0400
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -29698,9 +29789,9 @@ diff -urNp linux-2.6.38.4/drivers/misc/sgi-gru/grutables.h linux-2.6.38.4/driver
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2000.c linux-2.6.38.4/drivers/mtd/devices/doc2000.c
---- linux-2.6.38.4/drivers/mtd/devices/doc2000.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/devices/doc2000.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/mtd/devices/doc2000.c linux-2.6.38.6/drivers/mtd/devices/doc2000.c
+--- linux-2.6.38.6/drivers/mtd/devices/doc2000.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/mtd/devices/doc2000.c	2011-04-28 19:34:15.000000000 -0400
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
@@ -29710,9 +29801,9 @@ diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2000.c linux-2.6.38.4/drivers/m
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2001.c linux-2.6.38.4/drivers/mtd/devices/doc2001.c
---- linux-2.6.38.4/drivers/mtd/devices/doc2001.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/devices/doc2001.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/mtd/devices/doc2001.c linux-2.6.38.6/drivers/mtd/devices/doc2001.c
+--- linux-2.6.38.6/drivers/mtd/devices/doc2001.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/mtd/devices/doc2001.c	2011-04-28 19:34:15.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -29722,9 +29813,9 @@ diff -urNp linux-2.6.38.4/drivers/mtd/devices/doc2001.c linux-2.6.38.4/drivers/m
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.38.4/drivers/mtd/nand/denali.c linux-2.6.38.4/drivers/mtd/nand/denali.c
---- linux-2.6.38.4/drivers/mtd/nand/denali.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/nand/denali.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/mtd/nand/denali.c linux-2.6.38.6/drivers/mtd/nand/denali.c
+--- linux-2.6.38.6/drivers/mtd/nand/denali.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/mtd/nand/denali.c	2011-04-28 19:34:15.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -29733,9 +29824,9 @@ diff -urNp linux-2.6.38.4/drivers/mtd/nand/denali.c linux-2.6.38.4/drivers/mtd/n
  
  #include "denali.h"
  
-diff -urNp linux-2.6.38.4/drivers/mtd/ubi/build.c linux-2.6.38.4/drivers/mtd/ubi/build.c
---- linux-2.6.38.4/drivers/mtd/ubi/build.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/mtd/ubi/build.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/mtd/ubi/build.c linux-2.6.38.6/drivers/mtd/ubi/build.c
+--- linux-2.6.38.6/drivers/mtd/ubi/build.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/mtd/ubi/build.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
@@ -29775,9 +29866,9 @@ diff -urNp linux-2.6.38.4/drivers/mtd/ubi/build.c linux-2.6.38.4/drivers/mtd/ubi
  }
  
  /**
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/82571.c linux-2.6.38.4/drivers/net/e1000e/82571.c
---- linux-2.6.38.4/drivers/net/e1000e/82571.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/82571.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/e1000e/82571.c linux-2.6.38.6/drivers/net/e1000e/82571.c
+--- linux-2.6.38.6/drivers/net/e1000e/82571.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/e1000e/82571.c	2011-04-28 19:34:15.000000000 -0400
 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -29832,9 +29923,9 @@ diff -urNp linux-2.6.38.4/drivers/net/e1000e/82571.c linux-2.6.38.4/drivers/net/
  	.acquire		= e1000_acquire_nvm_82571,
  	.read			= e1000e_read_nvm_eerd,
  	.release		= e1000_release_nvm_82571,
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/e1000.h linux-2.6.38.4/drivers/net/e1000e/e1000.h
---- linux-2.6.38.4/drivers/net/e1000e/e1000.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/e1000.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/e1000e/e1000.h linux-2.6.38.6/drivers/net/e1000e/e1000.h
+--- linux-2.6.38.6/drivers/net/e1000e/e1000.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/e1000e/e1000.h	2011-04-28 19:34:15.000000000 -0400
 @@ -408,9 +408,9 @@ struct e1000_info {
  	u32			pba;
  	u32			max_hw_frame_size;
@@ -29848,9 +29939,9 @@ diff -urNp linux-2.6.38.4/drivers/net/e1000e/e1000.h linux-2.6.38.4/drivers/net/
  };
  
  /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/es2lan.c linux-2.6.38.4/drivers/net/e1000e/es2lan.c
---- linux-2.6.38.4/drivers/net/e1000e/es2lan.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/es2lan.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/e1000e/es2lan.c linux-2.6.38.6/drivers/net/e1000e/es2lan.c
+--- linux-2.6.38.6/drivers/net/e1000e/es2lan.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/e1000e/es2lan.c	2011-04-28 19:34:15.000000000 -0400
 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -29887,9 +29978,9 @@ diff -urNp linux-2.6.38.4/drivers/net/e1000e/es2lan.c linux-2.6.38.4/drivers/net
  	.acquire		= e1000_acquire_nvm_80003es2lan,
  	.read			= e1000e_read_nvm_eerd,
  	.release		= e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/hw.h linux-2.6.38.4/drivers/net/e1000e/hw.h
---- linux-2.6.38.4/drivers/net/e1000e/hw.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/hw.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/e1000e/hw.h linux-2.6.38.6/drivers/net/e1000e/hw.h
+--- linux-2.6.38.6/drivers/net/e1000e/hw.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/e1000e/hw.h	2011-04-28 19:34:15.000000000 -0400
 @@ -801,16 +801,17 @@ struct e1000_phy_operations {
  
  /* Function pointers for the NVM. */
@@ -29931,9 +30022,9 @@ diff -urNp linux-2.6.38.4/drivers/net/e1000e/hw.h linux-2.6.38.4/drivers/net/e10
  	struct e1000_nvm_operations ops;
  
  	enum e1000_nvm_type type;
-diff -urNp linux-2.6.38.4/drivers/net/e1000e/ich8lan.c linux-2.6.38.4/drivers/net/e1000e/ich8lan.c
---- linux-2.6.38.4/drivers/net/e1000e/ich8lan.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/e1000e/ich8lan.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/e1000e/ich8lan.c linux-2.6.38.6/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.38.6/drivers/net/e1000e/ich8lan.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/e1000e/ich8lan.c	2011-04-28 19:34:15.000000000 -0400
 @@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan
  	}
  }
@@ -29961,9 +30052,9 @@ diff -urNp linux-2.6.38.4/drivers/net/e1000e/ich8lan.c linux-2.6.38.4/drivers/ne
  	.acquire		= e1000_acquire_nvm_ich8lan,
  	.read		 	= e1000_read_nvm_ich8lan,
  	.release		= e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_82575.c linux-2.6.38.4/drivers/net/igb/e1000_82575.c
---- linux-2.6.38.4/drivers/net/igb/e1000_82575.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/igb/e1000_82575.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/igb/e1000_82575.c linux-2.6.38.6/drivers/net/igb/e1000_82575.c
+--- linux-2.6.38.6/drivers/net/igb/e1000_82575.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/igb/e1000_82575.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
  	return ret_val;
  }
@@ -29989,9 +30080,9 @@ diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_82575.c linux-2.6.38.4/drivers/n
  	.acquire              = igb_acquire_nvm_82575,
  	.read                 = igb_read_nvm_eerd,
  	.release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_hw.h linux-2.6.38.4/drivers/net/igb/e1000_hw.h
---- linux-2.6.38.4/drivers/net/igb/e1000_hw.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/igb/e1000_hw.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/igb/e1000_hw.h linux-2.6.38.6/drivers/net/igb/e1000_hw.h
+--- linux-2.6.38.6/drivers/net/igb/e1000_hw.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/igb/e1000_hw.h	2011-04-28 19:34:15.000000000 -0400
 @@ -327,22 +327,23 @@ struct e1000_phy_operations {
  };
  
@@ -30039,9 +30130,9 @@ diff -urNp linux-2.6.38.4/drivers/net/igb/e1000_hw.h linux-2.6.38.4/drivers/net/
  	struct e1000_nvm_operations ops;
  
  	enum e1000_nvm_type type;
-diff -urNp linux-2.6.38.4/drivers/net/igbvf/vf.h linux-2.6.38.4/drivers/net/igbvf/vf.h
---- linux-2.6.38.4/drivers/net/igbvf/vf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/igbvf/vf.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/igbvf/vf.h linux-2.6.38.6/drivers/net/igbvf/vf.h
+--- linux-2.6.38.6/drivers/net/igbvf/vf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/igbvf/vf.h	2011-04-28 19:34:15.000000000 -0400
 @@ -191,6 +191,7 @@ struct e1000_mac_operations {
  };
  
@@ -30050,9 +30141,9 @@ diff -urNp linux-2.6.38.4/drivers/net/igbvf/vf.h linux-2.6.38.4/drivers/net/igbv
  	struct e1000_mac_operations ops;
  	u8 addr[6];
  	u8 perm_addr[6];
-diff -urNp linux-2.6.38.4/drivers/net/pcnet32.c linux-2.6.38.4/drivers/net/pcnet32.c
---- linux-2.6.38.4/drivers/net/pcnet32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/pcnet32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/pcnet32.c linux-2.6.38.6/drivers/net/pcnet32.c
+--- linux-2.6.38.6/drivers/net/pcnet32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/pcnet32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -30062,9 +30153,9 @@ diff -urNp linux-2.6.38.4/drivers/net/pcnet32.c linux-2.6.38.4/drivers/net/pcnet
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
  static int pcnet32_debug;
-diff -urNp linux-2.6.38.4/drivers/net/ppp_generic.c linux-2.6.38.4/drivers/net/ppp_generic.c
---- linux-2.6.38.4/drivers/net/ppp_generic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/ppp_generic.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/ppp_generic.c linux-2.6.38.6/drivers/net/ppp_generic.c
+--- linux-2.6.38.6/drivers/net/ppp_generic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/ppp_generic.c	2011-04-28 19:34:15.000000000 -0400
 @@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, st
  	void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
  	struct ppp_stats stats;
@@ -30083,9 +30174,21 @@ diff -urNp linux-2.6.38.4/drivers/net/ppp_generic.c linux-2.6.38.4/drivers/net/p
  			break;
  		err = 0;
  		break;
-diff -urNp linux-2.6.38.4/drivers/net/tg3.h linux-2.6.38.4/drivers/net/tg3.h
---- linux-2.6.38.4/drivers/net/tg3.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/tg3.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/tg3.c linux-2.6.38.6/drivers/net/tg3.c
+--- linux-2.6.38.6/drivers/net/tg3.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/tg3.c	2011-05-11 18:35:16.000000000 -0400
+@@ -13003,7 +13003,7 @@ done:
+ 
+ static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
+ 
+-static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
++static inline void vlan_features_add(struct net_device *dev, unsigned long flags)
+ {
+ 	dev->vlan_features |= flags;
+ }
+diff -urNp linux-2.6.38.6/drivers/net/tg3.h linux-2.6.38.6/drivers/net/tg3.h
+--- linux-2.6.38.6/drivers/net/tg3.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/tg3.h	2011-04-28 19:34:15.000000000 -0400
 @@ -131,6 +131,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
@@ -30094,9 +30197,9 @@ diff -urNp linux-2.6.38.4/drivers/net/tg3.h linux-2.6.38.4/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff -urNp linux-2.6.38.4/drivers/net/tulip/de4x5.c linux-2.6.38.4/drivers/net/tulip/de4x5.c
---- linux-2.6.38.4/drivers/net/tulip/de4x5.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/tulip/de4x5.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/tulip/de4x5.c linux-2.6.38.6/drivers/net/tulip/de4x5.c
+--- linux-2.6.38.6/drivers/net/tulip/de4x5.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/tulip/de4x5.c	2011-04-28 19:34:15.000000000 -0400
 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
@@ -30115,9 +30218,9 @@ diff -urNp linux-2.6.38.4/drivers/net/tulip/de4x5.c linux-2.6.38.4/drivers/net/t
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-2.6.38.4/drivers/net/usb/hso.c linux-2.6.38.4/drivers/net/usb/hso.c
---- linux-2.6.38.4/drivers/net/usb/hso.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/usb/hso.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/usb/hso.c linux-2.6.38.6/drivers/net/usb/hso.c
+--- linux-2.6.38.6/drivers/net/usb/hso.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/usb/hso.c	2011-04-28 19:34:15.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -30214,9 +30317,9 @@ diff -urNp linux-2.6.38.4/drivers/net/usb/hso.c linux-2.6.38.4/drivers/net/usb/h
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.6/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-2.6.38.6/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-04-28 19:34:15.000000000 -0400
 @@ -628,8 +628,7 @@ vmxnet3_set_rss_indir(struct net_device 
  		 * Return with error code if any of the queue indices
  		 * is out of range
@@ -30227,9 +30330,9 @@ diff -urNp linux-2.6.38.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-2.6.38.4/d
  			return -EINVAL;
  	}
  
-diff -urNp linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/wireless/b43/debugfs.c linux-2.6.38.6/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.38.6/drivers/net/wireless/b43/debugfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/wireless/b43/debugfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
  struct b43_debugfs_fops {
  	ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -30239,9 +30342,9 @@ diff -urNp linux-2.6.38.4/drivers/net/wireless/b43/debugfs.c linux-2.6.38.4/driv
  	/* Offset of struct b43_dfs_file in struct b43_dfsentry */
  	size_t file_struct_offset;
  };
-diff -urNp linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.6/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.38.6/drivers/net/wireless/b43legacy/debugfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/wireless/b43legacy/debugfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
  struct b43legacy_debugfs_fops {
  	ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -30251,9 +30354,9 @@ diff -urNp linux-2.6.38.4/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.38.
  	/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
  	size_t file_struct_offset;
  	/* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.6/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.38.6/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-28 19:34:15.000000000 -0400
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -30265,9 +30368,9 @@ diff -urNp linux-2.6.38.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.38.
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      const void *p, u32 len)
  {}
-diff -urNp linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.6/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.38.6/drivers/net/wireless/libertas/debugfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/wireless/libertas/debugfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -702,7 +702,7 @@ out_unlock:
  struct lbs_debugfs_files {
  	const char *name;
@@ -30277,9 +30380,9 @@ diff -urNp linux-2.6.38.4/drivers/net/wireless/libertas/debugfs.c linux-2.6.38.4
  };
  
  static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/net/wireless/rndis_wlan.c linux-2.6.38.6/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.38.6/drivers/net/wireless/rndis_wlan.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/net/wireless/rndis_wlan.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
  	netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -30289,9 +30392,9 @@ diff -urNp linux-2.6.38.4/drivers/net/wireless/rndis_wlan.c linux-2.6.38.4/drive
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.38.4/drivers/oprofile/buffer_sync.c linux-2.6.38.4/drivers/oprofile/buffer_sync.c
---- linux-2.6.38.4/drivers/oprofile/buffer_sync.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/buffer_sync.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/oprofile/buffer_sync.c linux-2.6.38.6/drivers/oprofile/buffer_sync.c
+--- linux-2.6.38.6/drivers/oprofile/buffer_sync.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/oprofile/buffer_sync.c	2011-04-28 19:34:15.000000000 -0400
 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
@@ -30327,9 +30430,9 @@ diff -urNp linux-2.6.38.4/drivers/oprofile/buffer_sync.c linux-2.6.38.4/drivers/
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-2.6.38.4/drivers/oprofile/event_buffer.c linux-2.6.38.4/drivers/oprofile/event_buffer.c
---- linux-2.6.38.4/drivers/oprofile/event_buffer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/event_buffer.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/oprofile/event_buffer.c linux-2.6.38.6/drivers/oprofile/event_buffer.c
+--- linux-2.6.38.6/drivers/oprofile/event_buffer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/oprofile/event_buffer.c	2011-04-28 19:34:15.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -30339,9 +30442,9 @@ diff -urNp linux-2.6.38.4/drivers/oprofile/event_buffer.c linux-2.6.38.4/drivers
  		return;
  	}
  
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprof.c linux-2.6.38.4/drivers/oprofile/oprof.c
---- linux-2.6.38.4/drivers/oprofile/oprof.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprof.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/oprofile/oprof.c linux-2.6.38.6/drivers/oprofile/oprof.c
+--- linux-2.6.38.6/drivers/oprofile/oprof.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/oprofile/oprof.c	2011-04-28 19:34:15.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
@@ -30351,9 +30454,9 @@ diff -urNp linux-2.6.38.4/drivers/oprofile/oprof.c linux-2.6.38.4/drivers/oprofi
  	start_switch_worker();
  }
  
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprofilefs.c linux-2.6.38.4/drivers/oprofile/oprofilefs.c
---- linux-2.6.38.4/drivers/oprofile/oprofilefs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprofilefs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/oprofile/oprofilefs.c linux-2.6.38.6/drivers/oprofile/oprofilefs.c
+--- linux-2.6.38.6/drivers/oprofile/oprofilefs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/oprofile/oprofilefs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
@@ -30363,9 +30466,9 @@ diff -urNp linux-2.6.38.4/drivers/oprofile/oprofilefs.c linux-2.6.38.4/drivers/o
  {
  	return __oprofilefs_create_file(sb, root, name,
  					&atomic_ro_fops, 0444, val);
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.c linux-2.6.38.4/drivers/oprofile/oprofile_stats.c
---- linux-2.6.38.4/drivers/oprofile/oprofile_stats.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/oprofile/oprofile_stats.c linux-2.6.38.6/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.38.6/drivers/oprofile/oprofile_stats.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/oprofile/oprofile_stats.c	2011-04-28 19:34:15.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -30383,9 +30486,9 @@ diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.c linux-2.6.38.4/drive
  }
  
  
-diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.h linux-2.6.38.4/drivers/oprofile/oprofile_stats.h
---- linux-2.6.38.4/drivers/oprofile/oprofile_stats.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/oprofile/oprofile_stats.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/oprofile/oprofile_stats.h linux-2.6.38.6/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.38.6/drivers/oprofile/oprofile_stats.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/oprofile/oprofile_stats.h	2011-04-28 19:34:15.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -30403,9 +30506,9 @@ diff -urNp linux-2.6.38.4/drivers/oprofile/oprofile_stats.h linux-2.6.38.4/drive
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.38.4/drivers/parport/procfs.c linux-2.6.38.4/drivers/parport/procfs.c
---- linux-2.6.38.4/drivers/parport/procfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/parport/procfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/parport/procfs.c linux-2.6.38.6/drivers/parport/procfs.c
+--- linux-2.6.38.6/drivers/parport/procfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/parport/procfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
@@ -30424,9 +30527,9 @@ diff -urNp linux-2.6.38.4/drivers/parport/procfs.c linux-2.6.38.4/drivers/parpor
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.6/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.38.6/drivers/pci/hotplug/acpiphp_glue.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/drivers/pci/hotplug/acpiphp_glue.c	2011-04-28 19:34:15.000000000 -0400
 @@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
  }
  
@@ -30436,9 +30539,9 @@ diff -urNp linux-2.6.38.4/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.38.4/driv
  	.handler = handle_hotplug_event_func,
  };
  
-diff -urNp linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.6/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.38.6/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-28 19:34:15.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -30453,9 +30556,9 @@ diff -urNp linux-2.6.38.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.38.4/driv
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-2.6.38.4/drivers/pci/intel-iommu.c linux-2.6.38.4/drivers/pci/intel-iommu.c
---- linux-2.6.38.4/drivers/pci/intel-iommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/intel-iommu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pci/intel-iommu.c linux-2.6.38.6/drivers/pci/intel-iommu.c
+--- linux-2.6.38.6/drivers/pci/intel-iommu.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/pci/intel-iommu.c	2011-05-10 22:06:56.000000000 -0400
 @@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
  	return !dma_addr;
  }
@@ -30465,9 +30568,9 @@ diff -urNp linux-2.6.38.4/drivers/pci/intel-iommu.c linux-2.6.38.4/drivers/pci/i
  	.alloc_coherent = intel_alloc_coherent,
  	.free_coherent = intel_free_coherent,
  	.map_sg = intel_map_sg,
-diff -urNp linux-2.6.38.4/drivers/pci/pcie/aspm.c linux-2.6.38.4/drivers/pci/pcie/aspm.c
---- linux-2.6.38.4/drivers/pci/pcie/aspm.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/pcie/aspm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pci/pcie/aspm.c linux-2.6.38.6/drivers/pci/pcie/aspm.c
+--- linux-2.6.38.6/drivers/pci/pcie/aspm.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/pci/pcie/aspm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -30481,9 +30584,9 @@ diff -urNp linux-2.6.38.4/drivers/pci/pcie/aspm.c linux-2.6.38.4/drivers/pci/pci
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-2.6.38.4/drivers/pci/probe.c linux-2.6.38.4/drivers/pci/probe.c
---- linux-2.6.38.4/drivers/pci/probe.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/probe.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pci/probe.c linux-2.6.38.6/drivers/pci/probe.c
+--- linux-2.6.38.6/drivers/pci/probe.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/pci/probe.c	2011-04-28 19:34:15.000000000 -0400
 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
  	return ret;
  }
@@ -30510,9 +30613,9 @@ diff -urNp linux-2.6.38.4/drivers/pci/probe.c linux-2.6.38.4/drivers/pci/probe.c
  
  	if (!dev->mmio_always_on) {
  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-2.6.38.4/drivers/pci/proc.c linux-2.6.38.4/drivers/pci/proc.c
---- linux-2.6.38.4/drivers/pci/proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pci/proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pci/proc.c linux-2.6.38.6/drivers/pci/proc.c
+--- linux-2.6.38.6/drivers/pci/proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/pci/proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -30530,9 +30633,9 @@ diff -urNp linux-2.6.38.4/drivers/pci/proc.c linux-2.6.38.4/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-2.6.38.4/drivers/platform/x86/asus-laptop.c linux-2.6.38.4/drivers/platform/x86/asus-laptop.c
---- linux-2.6.38.4/drivers/platform/x86/asus-laptop.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/platform/x86/asus-laptop.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/platform/x86/asus-laptop.c linux-2.6.38.6/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.38.6/drivers/platform/x86/asus-laptop.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/platform/x86/asus-laptop.c	2011-04-28 19:34:15.000000000 -0400
 @@ -243,7 +243,6 @@ struct asus_laptop {
  	struct asus_led gled;
  	struct asus_led kled;
@@ -30541,9 +30644,9 @@ diff -urNp linux-2.6.38.4/drivers/platform/x86/asus-laptop.c linux-2.6.38.4/driv
  	int wireless_status;
  	bool have_rsts;
  	int lcd_state;
-diff -urNp linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.6/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.38.6/drivers/pnp/pnpbios/bioscalls.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/pnp/pnpbios/bioscalls.c	2011-04-28 19:34:15.000000000 -0400
 @@ -59,7 +59,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -30600,9 +30703,9 @@ diff -urNp linux-2.6.38.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.38.4/drivers
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-2.6.38.4/drivers/pnp/resource.c linux-2.6.38.4/drivers/pnp/resource.c
---- linux-2.6.38.4/drivers/pnp/resource.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/pnp/resource.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/pnp/resource.c linux-2.6.38.6/drivers/pnp/resource.c
+--- linux-2.6.38.6/drivers/pnp/resource.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/pnp/resource.c	2011-04-28 19:34:15.000000000 -0400
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
@@ -30621,9 +30724,9 @@ diff -urNp linux-2.6.38.4/drivers/pnp/resource.c linux-2.6.38.4/drivers/pnp/reso
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-2.6.38.4/drivers/rtc/rtc-dev.c linux-2.6.38.4/drivers/rtc/rtc-dev.c
---- linux-2.6.38.4/drivers/rtc/rtc-dev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/rtc/rtc-dev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/rtc/rtc-dev.c linux-2.6.38.6/drivers/rtc/rtc-dev.c
+--- linux-2.6.38.6/drivers/rtc/rtc-dev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/rtc/rtc-dev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -30641,9 +30744,9 @@ diff -urNp linux-2.6.38.4/drivers/rtc/rtc-dev.c linux-2.6.38.4/drivers/rtc/rtc-d
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-2.6.38.4/drivers/s390/cio/qdio_debug.c linux-2.6.38.4/drivers/s390/cio/qdio_debug.c
---- linux-2.6.38.4/drivers/s390/cio/qdio_debug.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/s390/cio/qdio_debug.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/s390/cio/qdio_debug.c linux-2.6.38.6/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.38.6/drivers/s390/cio/qdio_debug.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/s390/cio/qdio_debug.c	2011-04-28 19:34:15.000000000 -0400
 @@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode *
  			   filp->f_path.dentry->d_inode->i_private);
  }
@@ -30653,9 +30756,9 @@ diff -urNp linux-2.6.38.4/drivers/s390/cio/qdio_debug.c linux-2.6.38.4/drivers/s
  	.owner	 = THIS_MODULE,
  	.open	 = qperf_seq_open,
  	.read	 = seq_read,
-diff -urNp linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.6/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.38.6/drivers/scsi/aic94xx/aic94xx_init.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/aic94xx/aic94xx_init.c	2011-04-28 19:34:15.000000000 -0400
 @@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(stru
  			flash_error_table[i].reason);
  }
@@ -30665,9 +30768,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.38.4/dri
  	asd_show_update_bios, asd_store_update_bios);
  
  static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.38.4/drivers/scsi/hosts.c linux-2.6.38.4/drivers/scsi/hosts.c
---- linux-2.6.38.4/drivers/scsi/hosts.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/hosts.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/hosts.c linux-2.6.38.6/drivers/scsi/hosts.c
+--- linux-2.6.38.6/drivers/scsi/hosts.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/hosts.c	2011-04-28 19:57:25.000000000 -0400
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -30686,9 +30789,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/hosts.c linux-2.6.38.4/drivers/scsi/hosts
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff -urNp linux-2.6.38.4/drivers/scsi/hpsa.c linux-2.6.38.4/drivers/scsi/hpsa.c
---- linux-2.6.38.4/drivers/scsi/hpsa.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/hpsa.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/hpsa.c linux-2.6.38.6/drivers/scsi/hpsa.c
+--- linux-2.6.38.6/drivers/scsi/hpsa.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/hpsa.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct 
  	int err;
  	u32 cp;
@@ -30698,9 +30801,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/hpsa.c linux-2.6.38.4/drivers/scsi/hpsa.c
  	err = 0;
  	err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
  			   sizeof(arg64.LUN_info));
-diff -urNp linux-2.6.38.4/drivers/scsi/ipr.c linux-2.6.38.4/drivers/scsi/ipr.c
---- linux-2.6.38.4/drivers/scsi/ipr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/ipr.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/ipr.c linux-2.6.38.6/drivers/scsi/ipr.c
+--- linux-2.6.38.6/drivers/scsi/ipr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/ipr.c	2011-04-28 19:34:15.000000000 -0400
 @@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
  	return true;
  }
@@ -30710,9 +30813,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/ipr.c linux-2.6.38.4/drivers/scsi/ipr.c
  	.phy_reset = ipr_ata_phy_reset,
  	.hardreset = ipr_sata_reset,
  	.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/libfc/fc_exch.c linux-2.6.38.6/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.38.6/drivers/scsi/libfc/fc_exch.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/libfc/fc_exch.c	2011-04-28 19:34:15.000000000 -0400
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -30834,9 +30937,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/libfc/fc_exch.c linux-2.6.38.4/drivers/sc
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/libsas/sas_ata.c linux-2.6.38.6/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.38.6/drivers/scsi/libsas/sas_ata.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/libsas/sas_ata.c	2011-04-28 19:34:15.000000000 -0400
 @@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_l
  	}
  }
@@ -30846,9 +30949,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/libsas/sas_ata.c linux-2.6.38.4/drivers/s
  	.phy_reset		= sas_ata_phy_reset,
  	.post_internal_cmd	= sas_ata_post_internal,
  	.qc_defer               = ata_std_qc_defer,
-diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.6/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-2.6.38.6/drivers/scsi/lpfc/lpfc_debugfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/lpfc/lpfc_debugfs.c	2011-04-28 19:57:25.000000000 -0400
 @@ -125,7 +125,7 @@ struct lpfc_debug {
  	int  len;
  };
@@ -30928,9 +31031,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.38.4/driver
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h
---- linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/lpfc/lpfc.h linux-2.6.38.6/drivers/scsi/lpfc/lpfc.h
+--- linux-2.6.38.6/drivers/scsi/lpfc/lpfc.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/lpfc/lpfc.h	2011-04-28 19:57:25.000000000 -0400
 @@ -414,7 +414,7 @@ struct lpfc_vport {
  	struct dentry *debug_nodelist;
  	struct dentry *vport_debugfs_root;
@@ -30960,9 +31063,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc.h linux-2.6.38.4/drivers/scsi/l
  #endif
  
  	/* Used for deferred freeing of ELS data buffers */
-diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.6/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-2.6.38.6/drivers/scsi/lpfc/lpfc_scsi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/lpfc/lpfc_scsi.c	2011-04-28 19:57:25.000000000 -0400
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
@@ -31014,9 +31117,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.38.4/drivers/s
  }
  
  /**
-diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmcraid.c
---- linux-2.6.38.4/drivers/scsi/pmcraid.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/pmcraid.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/pmcraid.c linux-2.6.38.6/drivers/scsi/pmcraid.c
+--- linux-2.6.38.6/drivers/scsi/pmcraid.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/pmcraid.c	2011-05-10 22:08:57.000000000 -0400
 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
  		res->scsi_dev = scsi_dev;
  		scsi_dev->hostdata = res;
@@ -31049,7 +31152,7 @@ diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmc
  			  pinstance->num_hrrq;
  	cmd->cmd_done = pmcraid_io_done;
  
-@@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
+@@ -3860,7 +3860,7 @@ static long pmcraid_ioctl_passthrough(
  	 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
  	 * hrrq_id assigned here in queuecommand
  	 */
@@ -31058,7 +31161,7 @@ diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmc
  			  pinstance->num_hrrq;
  
  	if (request_size) {
-@@ -4492,7 +4492,7 @@ static void pmcraid_worker_function(stru
+@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(stru
  
  	pinstance = container_of(workp, struct pmcraid_instance, worker_q);
  	/* add resources only after host is added into system */
@@ -31067,7 +31170,7 @@ diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmc
  		return;
  
  	fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5326,8 +5326,8 @@ static int __devinit pmcraid_init_instan
+@@ -5329,8 +5329,8 @@ static int __devinit pmcraid_init_instan
  	init_waitqueue_head(&pinstance->reset_wait_q);
  
  	atomic_set(&pinstance->outstanding_cmds, 0);
@@ -31078,7 +31181,7 @@ diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmc
  
  	INIT_LIST_HEAD(&pinstance->free_res_q);
  	INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -6042,7 +6042,7 @@ static int __devinit pmcraid_probe(
+@@ -6045,7 +6045,7 @@ static int __devinit pmcraid_probe(
  	/* Schedule worker thread to handle CCN and take care of adding and
  	 * removing devices to OS
  	 */
@@ -31087,9 +31190,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.c linux-2.6.38.4/drivers/scsi/pmc
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.h linux-2.6.38.4/drivers/scsi/pmcraid.h
---- linux-2.6.38.4/drivers/scsi/pmcraid.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/pmcraid.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/pmcraid.h linux-2.6.38.6/drivers/scsi/pmcraid.h
+--- linux-2.6.38.6/drivers/scsi/pmcraid.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/pmcraid.h	2011-04-28 19:57:25.000000000 -0400
 @@ -750,7 +750,7 @@ struct pmcraid_instance {
  	struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
@@ -31119,9 +31222,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/pmcraid.h linux-2.6.38.4/drivers/scsi/pmc
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff -urNp linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.6/drivers/scsi/qla2xxx/qla_os.c
+--- linux-2.6.38.6/drivers/scsi/qla2xxx/qla_os.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/qla2xxx/qla_os.c	2011-04-28 19:34:15.000000000 -0400
 @@ -4096,7 +4096,7 @@ static struct pci_driver qla2xxx_pci_dri
  	.err_handler	= &qla2xxx_err_handler,
  };
@@ -31131,9 +31234,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/qla2xxx/qla_os.c linux-2.6.38.4/drivers/s
  	.owner = THIS_MODULE,
  	.llseek = noop_llseek,
  };
-diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h
---- linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_def.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_def.h	2011-04-28 19:57:25.000000000 -0400
 @@ -256,7 +256,7 @@ struct ddb_entry {
  	atomic_t retry_relogin_timer; /* Min Time between relogins
  				       * (4000 only) */
@@ -31143,9 +31246,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.38.4/drivers/
  				       * retried */
  
  	uint16_t port;
-diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c
---- linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_init.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_init.c	2011-04-28 19:57:25.000000000 -0400
 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
  	ddb_entry->fw_ddb_index = fw_ddb_index;
  	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -31164,9 +31267,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.38.4/drivers
  		atomic_set(&ddb_entry->relogin_timer, 0);
  		clear_bit(DF_RELOGIN, &ddb_entry->flags);
  		clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
-diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c
---- linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_os.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/qla4xxx/ql4_os.c	2011-04-28 19:57:25.000000000 -0400
 @@ -801,13 +801,13 @@ static void qla4xxx_timer(struct scsi_ql
  			    ddb_entry->fw_ddb_device_state ==
  			    DDB_DS_SESSION_FAILED) {
@@ -31183,9 +31286,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.38.4/drivers/s
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi.c linux-2.6.38.4/drivers/scsi/scsi.c
---- linux-2.6.38.4/drivers/scsi/scsi.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/scsi.c linux-2.6.38.6/drivers/scsi/scsi.c
+--- linux-2.6.38.6/drivers/scsi/scsi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/scsi.c	2011-04-28 19:57:25.000000000 -0400
 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
  	unsigned long timeout;
  	int rtn = 0;
@@ -31195,10 +31298,10 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi.c linux-2.6.38.4/drivers/scsi/scsi.c
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_lib.c linux-2.6.38.4/drivers/scsi/scsi_lib.c
---- linux-2.6.38.4/drivers/scsi/scsi_lib.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_lib.c	2011-04-28 19:57:25.000000000 -0400
-@@ -1376,7 +1376,7 @@ static void scsi_kill_request(struct req
+diff -urNp linux-2.6.38.6/drivers/scsi/scsi_lib.c linux-2.6.38.6/drivers/scsi/scsi_lib.c
+--- linux-2.6.38.6/drivers/scsi/scsi_lib.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/scsi_lib.c	2011-05-10 22:08:57.000000000 -0400
+@@ -1381,7 +1381,7 @@ static void scsi_kill_request(struct req
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
  	cmd->result = DID_NO_CONNECT << 16;
@@ -31207,7 +31310,7 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi_lib.c linux-2.6.38.4/drivers/scsi/sc
  
  	/*
  	 * SCSI request completion path will do scsi_device_unbusy(),
-@@ -1402,9 +1402,9 @@ static void scsi_softirq_done(struct req
+@@ -1407,9 +1407,9 @@ static void scsi_softirq_done(struct req
  
  	INIT_LIST_HEAD(&cmd->eh_entry);
  
@@ -31219,10 +31322,10 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi_lib.c linux-2.6.38.4/drivers/scsi/sc
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_sysfs.c linux-2.6.38.4/drivers/scsi/scsi_sysfs.c
---- linux-2.6.38.4/drivers/scsi/scsi_sysfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_sysfs.c	2011-04-28 19:57:25.000000000 -0400
-@@ -627,7 +627,7 @@ show_iostat_##field(struct device *dev, 
+diff -urNp linux-2.6.38.6/drivers/scsi/scsi_sysfs.c linux-2.6.38.6/drivers/scsi/scsi_sysfs.c
+--- linux-2.6.38.6/drivers/scsi/scsi_sysfs.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/scsi_sysfs.c	2011-05-10 22:08:57.000000000 -0400
+@@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev, 
  		    char *buf)						\
  {									\
  	struct scsi_device *sdev = to_scsi_device(dev);			\
@@ -31231,9 +31334,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi_sysfs.c linux-2.6.38.4/drivers/scsi/
  	return snprintf(buf, 20, "0x%llx\n", count);			\
  }									\
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c
---- linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/scsi_transport_fc.c linux-2.6.38.6/drivers/scsi/scsi_transport_fc.c
+--- linux-2.6.38.6/drivers/scsi/scsi_transport_fc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/scsi_transport_fc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
@@ -31270,9 +31373,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_fc.c linux-2.6.38.4/driver
  		return -EINVAL;
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.6/drivers/scsi/scsi_transport_iscsi.c
+--- linux-2.6.38.6/drivers/scsi/scsi_transport_iscsi.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/scsi_transport_iscsi.c	2011-04-28 19:57:25.000000000 -0400
 @@ -83,7 +83,7 @@ struct iscsi_internal {
  	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -31300,9 +31403,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_iscsi.c linux-2.6.38.4/dri
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c
---- linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/scsi_transport_srp.c linux-2.6.38.6/drivers/scsi/scsi_transport_srp.c
+--- linux-2.6.38.6/drivers/scsi/scsi_transport_srp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/scsi_transport_srp.c	2011-04-28 19:57:25.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -31330,9 +31433,9 @@ diff -urNp linux-2.6.38.4/drivers/scsi/scsi_transport_srp.c linux-2.6.38.4/drive
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff -urNp linux-2.6.38.4/drivers/scsi/sg.c linux-2.6.38.4/drivers/scsi/sg.c
---- linux-2.6.38.4/drivers/scsi/sg.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/scsi/sg.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/scsi/sg.c linux-2.6.38.6/drivers/scsi/sg.c
+--- linux-2.6.38.6/drivers/scsi/sg.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/scsi/sg.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
@@ -31351,9 +31454,21 @@ diff -urNp linux-2.6.38.4/drivers/scsi/sg.c linux-2.6.38.4/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-2.6.38.4/drivers/staging/autofs/root.c linux-2.6.38.4/drivers/staging/autofs/root.c
---- linux-2.6.38.4/drivers/staging/autofs/root.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/autofs/root.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/spi/spi.c linux-2.6.38.6/drivers/spi/spi.c
+--- linux-2.6.38.6/drivers/spi/spi.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/spi/spi.c	2011-05-11 18:34:57.000000000 -0400
+@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
+ EXPORT_SYMBOL_GPL(spi_bus_unlock);
+ 
+ /* portable code must never pass more than 32 bytes */
+-#define	SPI_BUFSIZ	max(32,SMP_CACHE_BYTES)
++#define	SPI_BUFSIZ	max(32U,SMP_CACHE_BYTES)
+ 
+ static u8	*buf;
+ 
+diff -urNp linux-2.6.38.6/drivers/staging/autofs/root.c linux-2.6.38.6/drivers/staging/autofs/root.c
+--- linux-2.6.38.6/drivers/staging/autofs/root.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/autofs/root.c	2011-04-28 19:34:15.000000000 -0400
 @@ -311,7 +311,8 @@ static int autofs_root_symlink(struct in
  	set_bit(n,sbi->symlink_bitmap);
  	sl = &sbi->symlink[n];
@@ -31364,9 +31479,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/autofs/root.c linux-2.6.38.4/drivers/s
  	if (!sl->data) {
  		clear_bit(n,sbi->symlink_bitmap);
  		unlock_kernel();
-diff -urNp linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c
---- linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/bcm/Bcmchar.c linux-2.6.38.6/drivers/staging/bcm/Bcmchar.c
+--- linux-2.6.38.6/drivers/staging/bcm/Bcmchar.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/bcm/Bcmchar.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file *
  }
  
@@ -31376,9 +31491,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/bcm/Bcmchar.c linux-2.6.38.4/drivers/s
  	.owner    = THIS_MODULE,
  	.open     = bcm_char_open,
  	.release  = bcm_char_release,
-diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-04-28 19:34:15.000000000 -0400
 @@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp)
  			free_netdev(ifp->net);
  		}
@@ -31434,9 +31549,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-2
  
  #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
  	g_bus = bus;
-diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c
---- linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+--- linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/brcm80211/brcmfmac/wl_iw.c	2011-04-28 19:34:15.000000000 -0400
 @@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev,
  	list = (wl_u32_list_t *) channels;
  
@@ -31446,9 +31561,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/brcm80211/brcmfmac/wl_iw.c linux-2.6.3
  
  	range->min_nwid = range->max_nwid = 0;
  
-diff -urNp linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/comedi/comedi_fops.c linux-2.6.38.6/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.38.6/drivers/staging/comedi/comedi_fops.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/comedi/comedi_fops.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_
  	mutex_unlock(&dev->mutex);
  }
@@ -31458,9 +31573,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/comedi/comedi_fops.c linux-2.6.38.4/dr
  	.close = comedi_unmap,
  };
  
-diff -urNp linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c
---- linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/et131x/et1310_tx.c linux-2.6.38.6/drivers/staging/et131x/et1310_tx.c
+--- linux-2.6.38.6/drivers/staging/et131x/et1310_tx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/et131x/et1310_tx.c	2011-04-28 19:57:25.000000000 -0400
 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
  	struct net_device_stats *stats = &etdev->net_stats;
  
@@ -31476,9 +31591,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/et131x/et1310_tx.c linux-2.6.38.4/driv
  
  	if (tcb->skb) {
  		stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h
---- linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/et131x/et131x_adapter.h linux-2.6.38.6/drivers/staging/et131x/et131x_adapter.h
+--- linux-2.6.38.6/drivers/staging/et131x/et131x_adapter.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/et131x/et131x_adapter.h	2011-04-28 19:57:25.000000000 -0400
 @@ -112,11 +112,11 @@ typedef struct _ce_stats_t {
  	 * operations
  	 */
@@ -31494,9 +31609,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/et131x/et131x_adapter.h linux-2.6.38.4
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff -urNp linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
---- linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux-2.6.38.6/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+--- linux-2.6.38.6/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c	2011-04-28 19:34:15.000000000 -0400
 @@ -55,7 +55,7 @@ int numofmsgbuf = 0;
  //
  // Table of entry-point routines for char device
@@ -31506,9 +31621,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c linux
  {
  	.unlocked_ioctl	= ft1000_ioctl,
  	.poll		= ft1000_poll_dev,
-diff -urNp linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.6/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.38.6/drivers/staging/go7007/go7007-v4l2.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/go7007/go7007-v4l2.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_are
  	return 0;
  }
@@ -31518,9 +31633,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.38.4/dr
  	.open	= go7007_vm_open,
  	.close	= go7007_vm_close,
  	.fault	= go7007_vm_fault,
-diff -urNp linux-2.6.38.4/drivers/staging/hv/channel.c linux-2.6.38.4/drivers/staging/hv/channel.c
---- linux-2.6.38.4/drivers/staging/hv/channel.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/channel.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/hv/channel.c linux-2.6.38.6/drivers/staging/hv/channel.c
+--- linux-2.6.38.6/drivers/staging/hv/channel.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/hv/channel.c	2011-04-28 19:57:25.000000000 -0400
 @@ -501,8 +501,8 @@ int vmbus_establish_gpadl(struct vmbus_c
  	unsigned long flags;
  	int ret = 0;
@@ -31532,9 +31647,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/hv/channel.c linux-2.6.38.4/drivers/st
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
-diff -urNp linux-2.6.38.4/drivers/staging/hv/hv.c linux-2.6.38.4/drivers/staging/hv/hv.c
---- linux-2.6.38.4/drivers/staging/hv/hv.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/hv.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/hv/hv.c linux-2.6.38.6/drivers/staging/hv/hv.c
+--- linux-2.6.38.6/drivers/staging/hv/hv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/hv/hv.c	2011-04-28 19:34:15.000000000 -0400
 @@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, voi
  	u64 output_address = (output) ? virt_to_phys(output) : 0;
  	u32 output_address_hi = output_address >> 32;
@@ -31544,9 +31659,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/hv/hv.c linux-2.6.38.4/drivers/staging
  
  	DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
  		   control, input, output);
-diff -urNp linux-2.6.38.4/drivers/staging/hv/rndis_filter.c linux-2.6.38.4/drivers/staging/hv/rndis_filter.c
---- linux-2.6.38.4/drivers/staging/hv/rndis_filter.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/rndis_filter.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/hv/rndis_filter.c linux-2.6.38.6/drivers/staging/hv/rndis_filter.c
+--- linux-2.6.38.6/drivers/staging/hv/rndis_filter.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/hv/rndis_filter.c	2011-04-28 19:57:25.000000000 -0400
 @@ -47,7 +47,7 @@ struct rndis_device {
  
  	enum rndis_device_state state;
@@ -31574,9 +31689,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/hv/rndis_filter.c linux-2.6.38.4/drive
  
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
-diff -urNp linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c
---- linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/hv/vmbus_drv.c linux-2.6.38.6/drivers/staging/hv/vmbus_drv.c
+--- linux-2.6.38.6/drivers/staging/hv/vmbus_drv.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/hv/vmbus_drv.c	2011-04-28 19:57:25.000000000 -0400
 @@ -727,14 +727,14 @@ int vmbus_child_device_register(struct h
  				to_vm_device(root_device_obj);
  	struct vm_device *child_device_ctx =
@@ -31594,9 +31709,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/hv/vmbus_drv.c linux-2.6.38.4/drivers/
  
  	/* The new device belongs to this bus */
  	child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
-diff -urNp linux-2.6.38.4/drivers/staging/hv/vmbus_private.h linux-2.6.38.4/drivers/staging/hv/vmbus_private.h
---- linux-2.6.38.4/drivers/staging/hv/vmbus_private.h	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/hv/vmbus_private.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/hv/vmbus_private.h linux-2.6.38.6/drivers/staging/hv/vmbus_private.h
+--- linux-2.6.38.6/drivers/staging/hv/vmbus_private.h	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/hv/vmbus_private.h	2011-04-28 19:57:25.000000000 -0400
 @@ -58,7 +58,7 @@ enum VMBUS_CONNECT_STATE {
  struct VMBUS_CONNECTION {
  	enum VMBUS_CONNECT_STATE ConnectState;
@@ -31606,9 +31721,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/hv/vmbus_private.h linux-2.6.38.4/driv
  
  	/*
  	 * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-2.6.38.4/drivers/staging/octeon/ethernet.c linux-2.6.38.4/drivers/staging/octeon/ethernet.c
---- linux-2.6.38.4/drivers/staging/octeon/ethernet.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/octeon/ethernet.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/octeon/ethernet.c linux-2.6.38.6/drivers/staging/octeon/ethernet.c
+--- linux-2.6.38.6/drivers/staging/octeon/ethernet.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/octeon/ethernet.c	2011-04-28 19:57:25.000000000 -0400
 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
  		 * since the RX tasklet also increments it.
  		 */
@@ -31625,9 +31740,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/octeon/ethernet.c linux-2.6.38.4/drive
  #endif
  	}
  
-diff -urNp linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c
---- linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.6/drivers/staging/octeon/ethernet-rx.c
+--- linux-2.6.38.6/drivers/staging/octeon/ethernet-rx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/octeon/ethernet-rx.c	2011-04-28 19:57:25.000000000 -0400
 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -31656,9 +31771,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/octeon/ethernet-rx.c linux-2.6.38.4/dr
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff -urNp linux-2.6.38.4/drivers/staging/phison/phison.c linux-2.6.38.4/drivers/staging/phison/phison.c
---- linux-2.6.38.4/drivers/staging/phison/phison.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/phison/phison.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/phison/phison.c linux-2.6.38.6/drivers/staging/phison/phison.c
+--- linux-2.6.38.6/drivers/staging/phison/phison.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/phison/phison.c	2011-04-28 19:34:15.000000000 -0400
 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -31668,9 +31783,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/phison/phison.c linux-2.6.38.4/drivers
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= phison_pre_reset,
  };
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/inode.c linux-2.6.38.4/drivers/staging/pohmelfs/inode.c
---- linux-2.6.38.4/drivers/staging/pohmelfs/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/inode.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/pohmelfs/inode.c linux-2.6.38.6/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.38.6/drivers/staging/pohmelfs/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/pohmelfs/inode.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
@@ -31689,9 +31804,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/inode.c linux-2.6.38.4/driver
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/pohmelfs/mcache.c linux-2.6.38.6/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.38.6/drivers/staging/pohmelfs/mcache.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/pohmelfs/mcache.c	2011-04-28 19:34:15.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
@@ -31701,9 +31816,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/mcache.c linux-2.6.38.4/drive
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/pohmelfs/netfs.h linux-2.6.38.6/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.38.6/drivers/staging/pohmelfs/netfs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/pohmelfs/netfs.h	2011-04-28 19:57:25.000000000 -0400
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
@@ -31721,9 +31836,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/netfs.h linux-2.6.38.4/driver
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/trans.c linux-2.6.38.4/drivers/staging/pohmelfs/trans.c
---- linux-2.6.38.4/drivers/staging/pohmelfs/trans.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/pohmelfs/trans.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/pohmelfs/trans.c linux-2.6.38.6/drivers/staging/pohmelfs/trans.c
+--- linux-2.6.38.6/drivers/staging/pohmelfs/trans.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/pohmelfs/trans.c	2011-04-28 19:57:25.000000000 -0400
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
  	int err;
  	struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -31733,9 +31848,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/pohmelfs/trans.c linux-2.6.38.4/driver
  
  	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
  		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38.6/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.38.6/drivers/staging/rtl8192u/ieee80211/proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/rtl8192u/ieee80211/proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
  	return seq_open(file, &crypto_seq_ops);
  }
@@ -31745,9 +31860,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.38
  	.open		= crypto_info_open,
  	.read		= seq_read,
  	.llseek		= seq_lseek,
-diff -urNp linux-2.6.38.4/drivers/staging/spectra/ffsport.c linux-2.6.38.4/drivers/staging/spectra/ffsport.c
---- linux-2.6.38.4/drivers/staging/spectra/ffsport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/spectra/ffsport.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/spectra/ffsport.c linux-2.6.38.6/drivers/staging/spectra/ffsport.c
+--- linux-2.6.38.6/drivers/staging/spectra/ffsport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/spectra/ffsport.c	2011-04-28 19:34:15.000000000 -0400
 @@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block
  	return ret;
  }
@@ -31757,9 +31872,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/spectra/ffsport.c linux-2.6.38.4/drive
  	.owner = THIS_MODULE,
  	.open = GLOB_SBD_open,
  	.release = GLOB_SBD_release,
-diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci.h linux-2.6.38.4/drivers/staging/usbip/vhci.h
---- linux-2.6.38.4/drivers/staging/usbip/vhci.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/usbip/vhci.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/usbip/vhci.h linux-2.6.38.6/drivers/staging/usbip/vhci.h
+--- linux-2.6.38.6/drivers/staging/usbip/vhci.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/usbip/vhci.h	2011-04-28 19:57:25.000000000 -0400
 @@ -92,7 +92,7 @@ struct vhci_hcd {
  	unsigned	resuming:1;
  	unsigned long	re_timeout;
@@ -31769,9 +31884,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci.h linux-2.6.38.4/drivers/st
  
  	/*
  	 * NOTE:
-diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c
---- linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.6/drivers/staging/usbip/vhci_hcd.c
+--- linux-2.6.38.6/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:08:57.000000000 -0400
 @@ -535,7 +535,7 @@ static void vhci_tx_urb(struct urb *urb)
  		return;
  	}
@@ -31799,9 +31914,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci_hcd.c linux-2.6.38.4/driver
  	spin_lock_init(&vhci->lock);
  
  
-diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c
---- linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/usbip/vhci_rx.c linux-2.6.38.6/drivers/staging/usbip/vhci_rx.c
+--- linux-2.6.38.6/drivers/staging/usbip/vhci_rx.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/usbip/vhci_rx.c	2011-04-28 19:57:25.000000000 -0400
 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct 
  		usbip_uerr("cannot find a urb of seqnum %u\n",
  							pdu->base.seqnum);
@@ -31811,9 +31926,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/usbip/vhci_rx.c linux-2.6.38.4/drivers
  		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
  		return;
  	}
-diff -urNp linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/vme/devices/vme_user.c linux-2.6.38.6/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.38.6/drivers/staging/vme/devices/vme_user.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/vme/devices/vme_user.c	2011-04-28 19:34:15.000000000 -0400
 @@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(stru
  static int __devinit vme_user_probe(struct device *, int, int);
  static int __devexit vme_user_remove(struct device *, int, int);
@@ -31823,9 +31938,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/vme/devices/vme_user.c linux-2.6.38.4/
  	.open = vme_user_open,
  	.release = vme_user_release,
  	.read = vme_user_read,
-diff -urNp linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
---- linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c linux-2.6.38.6/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
+--- linux-2.6.38.6/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c	2011-04-28 19:34:15.000000000 -0400
 @@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct ge
  
  
@@ -31835,9 +31950,9 @@ diff -urNp linux-2.6.38.4/drivers/staging/westbridge/astoria/block/cyasblkdev_bl
  	.open			= cyasblkdev_blk_open,
  	.release		= cyasblkdev_blk_release,
  	.ioctl			= cyasblkdev_blk_ioctl,
-diff -urNp linux-2.6.38.4/drivers/target/target_core_tmr.c linux-2.6.38.4/drivers/target/target_core_tmr.c
---- linux-2.6.38.4/drivers/target/target_core_tmr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/target/target_core_tmr.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/target/target_core_tmr.c linux-2.6.38.6/drivers/target/target_core_tmr.c
+--- linux-2.6.38.6/drivers/target/target_core_tmr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/target/target_core_tmr.c	2011-04-28 19:57:25.000000000 -0400
 @@ -262,7 +262,7 @@ int core_tmr_lun_reset(
  			CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
  			T_TASK(cmd)->t_task_cdbs,
@@ -31865,9 +31980,9 @@ diff -urNp linux-2.6.38.4/drivers/target/target_core_tmr.c linux-2.6.38.4/driver
  		spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
  		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
-diff -urNp linux-2.6.38.4/drivers/target/target_core_transport.c linux-2.6.38.4/drivers/target/target_core_transport.c
---- linux-2.6.38.4/drivers/target/target_core_transport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/target/target_core_transport.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/target/target_core_transport.c linux-2.6.38.6/drivers/target/target_core_transport.c
+--- linux-2.6.38.6/drivers/target/target_core_transport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/target/target_core_transport.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1678,7 +1678,7 @@ struct se_device *transport_add_device_t
  
  	dev->queue_depth	= dev_limits->queue_depth;
@@ -31943,9 +32058,9 @@ diff -urNp linux-2.6.38.4/drivers/target/target_core_transport.c linux-2.6.38.4/
  			atomic_read(&T_TASK(cmd)->t_transport_active),
  			atomic_read(&T_TASK(cmd)->t_transport_stop),
  			atomic_read(&T_TASK(cmd)->t_transport_sent));
-diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_console.h linux-2.6.38.4/drivers/tty/hvc/hvc_console.h
---- linux-2.6.38.4/drivers/tty/hvc/hvc_console.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/hvc/hvc_console.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/hvc/hvc_console.h linux-2.6.38.6/drivers/tty/hvc/hvc_console.h
+--- linux-2.6.38.6/drivers/tty/hvc/hvc_console.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/hvc/hvc_console.h	2011-04-28 19:34:15.000000000 -0400
 @@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
  /* register a vterm for hvc tty operation (module_init or hotplug add) */
  extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
@@ -31954,9 +32069,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_console.h linux-2.6.38.4/drivers/t
  /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
  extern int hvc_remove(struct hvc_struct *hp);
  
-diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvcs.c linux-2.6.38.4/drivers/tty/hvc/hvcs.c
---- linux-2.6.38.4/drivers/tty/hvc/hvcs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/hvc/hvcs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/hvc/hvcs.c linux-2.6.38.6/drivers/tty/hvc/hvcs.c
+--- linux-2.6.38.6/drivers/tty/hvc/hvcs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/hvc/hvcs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -32059,9 +32174,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvcs.c linux-2.6.38.4/drivers/tty/hvc/
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c
---- linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/hvc/hvc_xen.c linux-2.6.38.6/drivers/tty/hvc/hvc_xen.c
+--- linux-2.6.38.6/drivers/tty/hvc/hvc_xen.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/hvc/hvc_xen.c	2011-04-28 19:34:15.000000000 -0400
 @@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vt
  	return recv;
  }
@@ -32098,9 +32213,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/hvc/hvc_xen.c linux-2.6.38.4/drivers/tty/h
  
  	if (!xen_pv_domain())
  		return 0;
-diff -urNp linux-2.6.38.4/drivers/tty/n_gsm.c linux-2.6.38.4/drivers/tty/n_gsm.c
---- linux-2.6.38.4/drivers/tty/n_gsm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/n_gsm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/n_gsm.c linux-2.6.38.6/drivers/tty/n_gsm.c
+--- linux-2.6.38.6/drivers/tty/n_gsm.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/n_gsm.c	2011-05-10 22:06:56.000000000 -0400
 @@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
  		return NULL;
  	spin_lock_init(&dlci->lock);
@@ -32110,9 +32225,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/n_gsm.c linux-2.6.38.4/drivers/tty/n_gsm.c
  		kfree(dlci);
  		return NULL;
  	}
-diff -urNp linux-2.6.38.4/drivers/tty/n_tty.c linux-2.6.38.4/drivers/tty/n_tty.c
---- linux-2.6.38.4/drivers/tty/n_tty.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/n_tty.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/n_tty.c linux-2.6.38.6/drivers/tty/n_tty.c
+--- linux-2.6.38.6/drivers/tty/n_tty.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/n_tty.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
  	*ops = tty_ldisc_N_TTY;
@@ -32122,9 +32237,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/n_tty.c linux-2.6.38.4/drivers/tty/n_tty.c
 +	ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.38.4/drivers/tty/pty.c linux-2.6.38.4/drivers/tty/pty.c
---- linux-2.6.38.4/drivers/tty/pty.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/pty.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/pty.c linux-2.6.38.6/drivers/tty/pty.c
+--- linux-2.6.38.6/drivers/tty/pty.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/pty.c	2011-04-28 19:34:15.000000000 -0400
 @@ -700,7 +700,18 @@ out:
  	return retval;
  }
@@ -32156,9 +32271,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/pty.c linux-2.6.38.4/drivers/tty/pty.c
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
  	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff -urNp linux-2.6.38.4/drivers/tty/serial/kgdboc.c linux-2.6.38.4/drivers/tty/serial/kgdboc.c
---- linux-2.6.38.4/drivers/tty/serial/kgdboc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/serial/kgdboc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/serial/kgdboc.c linux-2.6.38.6/drivers/tty/serial/kgdboc.c
+--- linux-2.6.38.6/drivers/tty/serial/kgdboc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/serial/kgdboc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -22,7 +22,7 @@
  
  #define MAX_CONFIG_LEN		40
@@ -32177,9 +32292,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/serial/kgdboc.c linux-2.6.38.4/drivers/tty
  	.name			= "kgdboc",
  	.read_char		= kgdboc_get_char,
  	.write_char		= kgdboc_put_char,
-diff -urNp linux-2.6.38.4/drivers/tty/tty_io.c linux-2.6.38.4/drivers/tty/tty_io.c
---- linux-2.6.38.4/drivers/tty/tty_io.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/tty_io.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/tty_io.c linux-2.6.38.6/drivers/tty/tty_io.c
+--- linux-2.6.38.6/drivers/tty/tty_io.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/tty_io.c	2011-04-28 19:34:15.000000000 -0400
 @@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
  /* Spinlock to protect the tty->tty_files list */
  DEFINE_SPINLOCK(tty_files_lock);
@@ -32317,9 +32432,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/tty_io.c linux-2.6.38.4/drivers/tty/tty_io
  /*
   * Initialize the console device. This is called *early*, so
   * we can't necessarily depend on lots of kernel help here.
-diff -urNp linux-2.6.38.4/drivers/tty/tty_ldisc.c linux-2.6.38.4/drivers/tty/tty_ldisc.c
---- linux-2.6.38.4/drivers/tty/tty_ldisc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/tty_ldisc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/tty_ldisc.c linux-2.6.38.6/drivers/tty/tty_ldisc.c
+--- linux-2.6.38.6/drivers/tty/tty_ldisc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/tty_ldisc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
@@ -32365,9 +32480,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/tty_ldisc.c linux-2.6.38.4/drivers/tty/tty
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-2.6.38.4/drivers/tty/vt/keyboard.c linux-2.6.38.4/drivers/tty/vt/keyboard.c
---- linux-2.6.38.4/drivers/tty/vt/keyboard.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/vt/keyboard.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/vt/keyboard.c linux-2.6.38.6/drivers/tty/vt/keyboard.c
+--- linux-2.6.38.6/drivers/tty/vt/keyboard.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/vt/keyboard.c	2011-04-28 19:34:15.000000000 -0400
 @@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, u
  	     kbd->kbdmode == VC_MEDIUMRAW) &&
  	     value != KVAL(K_SAK))
@@ -32385,9 +32500,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/vt/keyboard.c linux-2.6.38.4/drivers/tty/v
  	fn_handler[value](vc);
  }
  
-diff -urNp linux-2.6.38.4/drivers/tty/vt/vt.c linux-2.6.38.4/drivers/tty/vt/vt.c
---- linux-2.6.38.4/drivers/tty/vt/vt.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/vt/vt.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/vt/vt.c linux-2.6.38.6/drivers/tty/vt/vt.c
+--- linux-2.6.38.6/drivers/tty/vt/vt.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/vt/vt.c	2011-04-28 19:34:15.000000000 -0400
 @@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -32397,9 +32512,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/vt/vt.c linux-2.6.38.4/drivers/tty/vt/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c
---- linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/tty/vt/vt_ioctl.c linux-2.6.38.6/drivers/tty/vt/vt_ioctl.c
+--- linux-2.6.38.6/drivers/tty/vt/vt_ioctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/tty/vt/vt_ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
@@ -32440,9 +32555,9 @@ diff -urNp linux-2.6.38.4/drivers/tty/vt/vt_ioctl.c linux-2.6.38.4/drivers/tty/v
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-2.6.38.4/drivers/uio/uio.c linux-2.6.38.4/drivers/uio/uio.c
---- linux-2.6.38.4/drivers/uio/uio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/uio/uio.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/uio/uio.c linux-2.6.38.6/drivers/uio/uio.c
+--- linux-2.6.38.6/drivers/uio/uio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/uio/uio.c	2011-04-28 19:57:25.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -32534,9 +32649,9 @@ diff -urNp linux-2.6.38.4/drivers/uio/uio.c linux-2.6.38.4/drivers/uio/uio.c
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff -urNp linux-2.6.38.4/drivers/usb/atm/cxacru.c linux-2.6.38.4/drivers/usb/atm/cxacru.c
---- linux-2.6.38.4/drivers/usb/atm/cxacru.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/atm/cxacru.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/atm/cxacru.c linux-2.6.38.6/drivers/usb/atm/cxacru.c
+--- linux-2.6.38.6/drivers/usb/atm/cxacru.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/atm/cxacru.c	2011-04-28 19:34:15.000000000 -0400
 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
  		ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
  		if (ret < 2)
@@ -32546,9 +32661,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/atm/cxacru.c linux-2.6.38.4/drivers/usb/at
  			return -EINVAL;
  		pos += tmp;
  
-diff -urNp linux-2.6.38.4/drivers/usb/atm/usbatm.c linux-2.6.38.4/drivers/usb/atm/usbatm.c
---- linux-2.6.38.4/drivers/usb/atm/usbatm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/atm/usbatm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/atm/usbatm.c linux-2.6.38.6/drivers/usb/atm/usbatm.c
+--- linux-2.6.38.6/drivers/usb/atm/usbatm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/atm/usbatm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
  		if (printk_ratelimit())
  			atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -32628,9 +32743,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/atm/usbatm.c linux-2.6.38.4/drivers/usb/at
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-2.6.38.4/drivers/usb/core/devices.c linux-2.6.38.4/drivers/usb/core/devices.c
---- linux-2.6.38.4/drivers/usb/core/devices.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/core/devices.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/core/devices.c linux-2.6.38.6/drivers/usb/core/devices.c
+--- linux-2.6.38.6/drivers/usb/core/devices.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/core/devices.c	2011-04-28 19:57:25.000000000 -0400
 @@ -126,7 +126,7 @@ static const char *format_endpt =
   * time it gets called.
   */
@@ -32658,9 +32773,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/core/devices.c linux-2.6.38.4/drivers/usb/
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
-diff -urNp linux-2.6.38.4/drivers/usb/core/hcd.c linux-2.6.38.4/drivers/usb/core/hcd.c
---- linux-2.6.38.4/drivers/usb/core/hcd.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/core/hcd.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/core/hcd.c linux-2.6.38.6/drivers/usb/core/hcd.c
+--- linux-2.6.38.6/drivers/usb/core/hcd.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/core/hcd.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2457,7 +2457,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
  
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -32679,9 +32794,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/core/hcd.c linux-2.6.38.4/drivers/usb/core
  {
  
  	if (mon_ops)
-diff -urNp linux-2.6.38.4/drivers/usb/core/message.c linux-2.6.38.4/drivers/usb/core/message.c
---- linux-2.6.38.4/drivers/usb/core/message.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/core/message.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/core/message.c linux-2.6.38.6/drivers/usb/core/message.c
+--- linux-2.6.38.6/drivers/usb/core/message.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/core/message.c	2011-04-28 19:34:15.000000000 -0400
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
@@ -32693,9 +32808,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/core/message.c linux-2.6.38.4/drivers/usb/
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/early/ehci-dbgp.c linux-2.6.38.6/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.38.6/drivers/usb/early/ehci-dbgp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/early/ehci-dbgp.c	2011-04-28 19:34:15.000000000 -0400
 @@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x,
  }
  
@@ -32714,9 +32829,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/early/ehci-dbgp.c linux-2.6.38.4/drivers/u
  	.name = "kgdbdbgp",
  	.read_char = kgdbdbgp_read_char,
  	.write_char = kgdbdbgp_write_char,
-diff -urNp linux-2.6.38.4/drivers/usb/mon/mon_main.c linux-2.6.38.4/drivers/usb/mon/mon_main.c
---- linux-2.6.38.4/drivers/usb/mon/mon_main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/mon/mon_main.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/mon/mon_main.c linux-2.6.38.6/drivers/usb/mon/mon_main.c
+--- linux-2.6.38.6/drivers/usb/mon/mon_main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/mon/mon_main.c	2011-04-28 19:34:15.000000000 -0400
 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
  /*
   * Ops
@@ -32726,9 +32841,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/mon/mon_main.c linux-2.6.38.4/drivers/usb/
  	.urb_submit =	mon_submit,
  	.urb_submit_error = mon_submit_error,
  	.urb_complete =	mon_complete,
-diff -urNp linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h
---- linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.6/drivers/usb/wusbcore/wa-hc.h
+--- linux-2.6.38.6/drivers/usb/wusbcore/wa-hc.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/wusbcore/wa-hc.h	2011-04-28 19:57:25.000000000 -0400
 @@ -192,7 +192,7 @@ struct wahc {
  	struct list_head xfer_delayed_list;
  	spinlock_t xfer_list_lock;
@@ -32747,9 +32862,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/wusbcore/wa-hc.h linux-2.6.38.4/drivers/us
  }
  
  /**
-diff -urNp linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c
---- linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/usb/wusbcore/wa-xfer.c linux-2.6.38.6/drivers/usb/wusbcore/wa-xfer.c
+--- linux-2.6.38.6/drivers/usb/wusbcore/wa-xfer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/usb/wusbcore/wa-xfer.c	2011-04-28 19:57:25.000000000 -0400
 @@ -294,7 +294,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -32759,9 +32874,9 @@ diff -urNp linux-2.6.38.4/drivers/usb/wusbcore/wa-xfer.c linux-2.6.38.4/drivers/
  }
  
  /*
-diff -urNp linux-2.6.38.4/drivers/vhost/vhost.c linux-2.6.38.4/drivers/vhost/vhost.c
---- linux-2.6.38.4/drivers/vhost/vhost.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/vhost/vhost.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/vhost/vhost.c linux-2.6.38.6/drivers/vhost/vhost.c
+--- linux-2.6.38.6/drivers/vhost/vhost.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/vhost/vhost.c	2011-04-28 19:34:15.000000000 -0400
 @@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqu
  	return get_user(vq->last_used_idx, &used->idx);
  }
@@ -32771,9 +32886,9 @@ diff -urNp linux-2.6.38.4/drivers/vhost/vhost.c linux-2.6.38.4/drivers/vhost/vho
  {
  	struct file *eventfp, *filep = NULL,
  		    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-2.6.38.4/drivers/video/fbcmap.c linux-2.6.38.4/drivers/video/fbcmap.c
---- linux-2.6.38.4/drivers/video/fbcmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/fbcmap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/fbcmap.c linux-2.6.38.6/drivers/video/fbcmap.c
+--- linux-2.6.38.6/drivers/video/fbcmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/fbcmap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
@@ -32784,9 +32899,9 @@ diff -urNp linux-2.6.38.4/drivers/video/fbcmap.c linux-2.6.38.4/drivers/video/fb
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-2.6.38.4/drivers/video/fbmem.c linux-2.6.38.4/drivers/video/fbmem.c
---- linux-2.6.38.4/drivers/video/fbmem.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/fbmem.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/fbmem.c linux-2.6.38.6/drivers/video/fbmem.c
+--- linux-2.6.38.6/drivers/video/fbmem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/fbmem.c	2011-04-28 19:34:15.000000000 -0400
 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
@@ -32814,9 +32929,9 @@ diff -urNp linux-2.6.38.4/drivers/video/fbmem.c linux-2.6.38.4/drivers/video/fbm
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.38.4/drivers/video/i810/i810_accel.c linux-2.6.38.4/drivers/video/i810/i810_accel.c
---- linux-2.6.38.4/drivers/video/i810/i810_accel.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/i810/i810_accel.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/i810/i810_accel.c linux-2.6.38.6/drivers/video/i810/i810_accel.c
+--- linux-2.6.38.6/drivers/video/i810/i810_accel.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/i810/i810_accel.c	2011-04-28 19:34:15.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
@@ -32825,9 +32940,9 @@ diff -urNp linux-2.6.38.4/drivers/video/i810/i810_accel.c linux-2.6.38.4/drivers
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.38.4/drivers/video/pxa3xx-gcu.c linux-2.6.38.4/drivers/video/pxa3xx-gcu.c
---- linux-2.6.38.4/drivers/video/pxa3xx-gcu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/pxa3xx-gcu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/pxa3xx-gcu.c linux-2.6.38.6/drivers/video/pxa3xx-gcu.c
+--- linux-2.6.38.6/drivers/video/pxa3xx-gcu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/pxa3xx-gcu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv {
  	dma_addr_t		  shared_phys;
  	struct resource		 *resource_mem;
@@ -32837,9 +32952,9 @@ diff -urNp linux-2.6.38.4/drivers/video/pxa3xx-gcu.c linux-2.6.38.4/drivers/vide
  	wait_queue_head_t	  wait_idle;
  	wait_queue_head_t	  wait_free;
  	spinlock_t		  spinlock;
-diff -urNp linux-2.6.38.4/drivers/video/udlfb.c linux-2.6.38.4/drivers/video/udlfb.c
---- linux-2.6.38.4/drivers/video/udlfb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/udlfb.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/udlfb.c linux-2.6.38.6/drivers/video/udlfb.c
+--- linux-2.6.38.6/drivers/video/udlfb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/udlfb.c	2011-04-28 19:57:25.000000000 -0400
 @@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data 
  		dlfb_urb_completion(urb);
  
@@ -32923,9 +33038,9 @@ diff -urNp linux-2.6.38.4/drivers/video/udlfb.c linux-2.6.38.4/drivers/video/udl
  
  	return count;
  }
-diff -urNp linux-2.6.38.4/drivers/video/uvesafb.c linux-2.6.38.4/drivers/video/uvesafb.c
---- linux-2.6.38.4/drivers/video/uvesafb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/uvesafb.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/uvesafb.c linux-2.6.38.6/drivers/video/uvesafb.c
+--- linux-2.6.38.6/drivers/video/uvesafb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/uvesafb.c	2011-04-28 19:34:15.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -33001,9 +33116,9 @@ diff -urNp linux-2.6.38.4/drivers/video/uvesafb.c linux-2.6.38.4/drivers/video/u
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-2.6.38.4/drivers/video/vesafb.c linux-2.6.38.4/drivers/video/vesafb.c
---- linux-2.6.38.4/drivers/video/vesafb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/drivers/video/vesafb.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/drivers/video/vesafb.c linux-2.6.38.6/drivers/video/vesafb.c
+--- linux-2.6.38.6/drivers/video/vesafb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/drivers/video/vesafb.c	2011-04-28 19:34:15.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -33107,9 +33222,9 @@ diff -urNp linux-2.6.38.4/drivers/video/vesafb.c linux-2.6.38.4/drivers/video/ve
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-2.6.38.4/fs/9p/vfs_inode.c linux-2.6.38.4/fs/9p/vfs_inode.c
---- linux-2.6.38.4/fs/9p/vfs_inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/9p/vfs_inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/9p/vfs_inode.c linux-2.6.38.6/fs/9p/vfs_inode.c
+--- linux-2.6.38.6/fs/9p/vfs_inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/9p/vfs_inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -33119,9 +33234,9 @@ diff -urNp linux-2.6.38.4/fs/9p/vfs_inode.c linux-2.6.38.4/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.38.4/fs/aio.c linux-2.6.38.4/fs/aio.c
---- linux-2.6.38.4/fs/aio.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/aio.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/aio.c linux-2.6.38.6/fs/aio.c
+--- linux-2.6.38.6/fs/aio.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/fs/aio.c	2011-04-28 19:34:15.000000000 -0400
 @@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx 
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -33131,9 +33246,9 @@ diff -urNp linux-2.6.38.4/fs/aio.c linux-2.6.38.4/fs/aio.c
  		return -EINVAL;
  
  	nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.38.4/fs/attr.c linux-2.6.38.4/fs/attr.c
---- linux-2.6.38.4/fs/attr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/attr.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/attr.c linux-2.6.38.6/fs/attr.c
+--- linux-2.6.38.6/fs/attr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/attr.c	2011-04-28 19:34:15.000000000 -0400
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
@@ -33142,9 +33257,9 @@ diff -urNp linux-2.6.38.4/fs/attr.c linux-2.6.38.4/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.38.4/fs/befs/linuxvfs.c linux-2.6.38.4/fs/befs/linuxvfs.c
---- linux-2.6.38.4/fs/befs/linuxvfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/befs/linuxvfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/befs/linuxvfs.c linux-2.6.38.6/fs/befs/linuxvfs.c
+--- linux-2.6.38.6/fs/befs/linuxvfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/befs/linuxvfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -499,7 +499,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -33154,9 +33269,9 @@ diff -urNp linux-2.6.38.4/fs/befs/linuxvfs.c linux-2.6.38.4/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-2.6.38.4/fs/binfmt_aout.c linux-2.6.38.4/fs/binfmt_aout.c
---- linux-2.6.38.4/fs/binfmt_aout.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/binfmt_aout.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/binfmt_aout.c linux-2.6.38.6/fs/binfmt_aout.c
+--- linux-2.6.38.6/fs/binfmt_aout.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/binfmt_aout.c	2011-04-28 19:34:15.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -33233,9 +33348,9 @@ diff -urNp linux-2.6.38.4/fs/binfmt_aout.c linux-2.6.38.4/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.38.4/fs/binfmt_elf.c linux-2.6.38.4/fs/binfmt_elf.c
---- linux-2.6.38.4/fs/binfmt_elf.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/fs/binfmt_elf.c	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/binfmt_elf.c linux-2.6.38.6/fs/binfmt_elf.c
+--- linux-2.6.38.6/fs/binfmt_elf.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/fs/binfmt_elf.c	2011-05-02 19:07:09.000000000 -0400
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump	NULL
  #endif
@@ -33937,9 +34052,9 @@ diff -urNp linux-2.6.38.4/fs/binfmt_elf.c linux-2.6.38.4/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-2.6.38.4/fs/binfmt_flat.c linux-2.6.38.4/fs/binfmt_flat.c
---- linux-2.6.38.4/fs/binfmt_flat.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/binfmt_flat.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/binfmt_flat.c linux-2.6.38.6/fs/binfmt_flat.c
+--- linux-2.6.38.6/fs/binfmt_flat.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/binfmt_flat.c	2011-04-28 19:34:15.000000000 -0400
 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
@@ -33972,9 +34087,9 @@ diff -urNp linux-2.6.38.4/fs/binfmt_flat.c linux-2.6.38.4/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-2.6.38.4/fs/bio.c linux-2.6.38.4/fs/bio.c
---- linux-2.6.38.4/fs/bio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/bio.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/bio.c linux-2.6.38.6/fs/bio.c
+--- linux-2.6.38.6/fs/bio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/bio.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
  	const int read = bio_data_dir(bio) == READ;
  	struct bio_map_data *bmd = bio->bi_private;
@@ -33984,9 +34099,9 @@ diff -urNp linux-2.6.38.4/fs/bio.c linux-2.6.38.4/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.38.4/fs/block_dev.c linux-2.6.38.4/fs/block_dev.c
---- linux-2.6.38.4/fs/block_dev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/block_dev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/block_dev.c linux-2.6.38.6/fs/block_dev.c
+--- linux-2.6.38.6/fs/block_dev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/block_dev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_de
  	else if (bdev->bd_contains == bdev)
  		return true;  	 /* is a whole device which isn't held */
@@ -33996,9 +34111,9 @@ diff -urNp linux-2.6.38.4/fs/block_dev.c linux-2.6.38.4/fs/block_dev.c
  		return true; 	 /* is a partition of a device that is being partitioned */
  	else if (whole->bd_holder != NULL)
  		return false;	 /* is a partition of a held device */
-diff -urNp linux-2.6.38.4/fs/btrfs/ctree.c linux-2.6.38.4/fs/btrfs/ctree.c
---- linux-2.6.38.4/fs/btrfs/ctree.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/ctree.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/ctree.c linux-2.6.38.6/fs/btrfs/ctree.c
+--- linux-2.6.38.6/fs/btrfs/ctree.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/ctree.c	2011-04-28 19:34:15.000000000 -0400
 @@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
@@ -34023,9 +34138,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/ctree.c linux-2.6.38.4/fs/btrfs/ctree.c
  		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
  		ret = fixup_low_keys(trans, root, path, &disk_key, 1);
  	}
-diff -urNp linux-2.6.38.4/fs/btrfs/disk-io.c linux-2.6.38.4/fs/btrfs/disk-io.c
---- linux-2.6.38.4/fs/btrfs/disk-io.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/disk-io.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/disk-io.c linux-2.6.38.6/fs/btrfs/disk-io.c
+--- linux-2.6.38.6/fs/btrfs/disk-io.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/disk-io.c	2011-04-28 19:34:15.000000000 -0400
 @@ -41,7 +41,7 @@
  #include "tree-log.h"
  #include "free-space-cache.h"
@@ -34044,9 +34159,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/disk-io.c linux-2.6.38.4/fs/btrfs/disk-io.c
  	.write_cache_pages_lock_hook = btree_lock_page_hook,
  	.readpage_end_io_hook = btree_readpage_end_io_hook,
  	.submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.38.4/fs/btrfs/extent_io.h linux-2.6.38.4/fs/btrfs/extent_io.h
---- linux-2.6.38.4/fs/btrfs/extent_io.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/extent_io.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/extent_io.h linux-2.6.38.6/fs/btrfs/extent_io.h
+--- linux-2.6.38.6/fs/btrfs/extent_io.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/extent_io.h	2011-04-28 19:34:15.000000000 -0400
 @@ -55,36 +55,36 @@ typedef	int (extent_submit_bio_hook_t)(s
  				       struct bio *bio, int mirror_num,
  				       unsigned long bio_flags, u64 bio_offset);
@@ -34107,9 +34222,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/extent_io.h linux-2.6.38.4/fs/btrfs/extent_io
  };
  
  struct extent_state {
-diff -urNp linux-2.6.38.4/fs/btrfs/free-space-cache.c linux-2.6.38.4/fs/btrfs/free-space-cache.c
---- linux-2.6.38.4/fs/btrfs/free-space-cache.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/free-space-cache.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/free-space-cache.c linux-2.6.38.6/fs/btrfs/free-space-cache.c
+--- linux-2.6.38.6/fs/btrfs/free-space-cache.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/free-space-cache.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
  
  	while(1) {
@@ -34128,9 +34243,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/free-space-cache.c linux-2.6.38.4/fs/btrfs/fr
  
  		if (entry->bitmap && entry->bytes > bytes + empty_size) {
  			ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.38.4/fs/btrfs/inode.c linux-2.6.38.4/fs/btrfs/inode.c
---- linux-2.6.38.4/fs/btrfs/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/inode.c linux-2.6.38.6/fs/btrfs/inode.c
+--- linux-2.6.38.6/fs/btrfs/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -64,7 +64,7 @@ static const struct inode_operations btr
  static const struct address_space_operations btrfs_aops;
  static const struct address_space_operations btrfs_symlink_aops;
@@ -34173,9 +34288,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/inode.c linux-2.6.38.4/fs/btrfs/inode.c
  	.fill_delalloc = run_delalloc_range,
  	.submit_bio_hook = btrfs_submit_bio_hook,
  	.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.38.4/fs/btrfs/ioctl.c linux-2.6.38.4/fs/btrfs/ioctl.c
---- linux-2.6.38.4/fs/btrfs/ioctl.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/ioctl.c linux-2.6.38.6/fs/btrfs/ioctl.c
+--- linux-2.6.38.6/fs/btrfs/ioctl.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
@@ -34200,9 +34315,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/ioctl.c linux-2.6.38.4/fs/btrfs/ioctl.c
  		}
  		up_read(&info->groups_sem);
  	}
-diff -urNp linux-2.6.38.4/fs/btrfs/relocation.c linux-2.6.38.4/fs/btrfs/relocation.c
---- linux-2.6.38.4/fs/btrfs/relocation.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/btrfs/relocation.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/btrfs/relocation.c linux-2.6.38.6/fs/btrfs/relocation.c
+--- linux-2.6.38.6/fs/btrfs/relocation.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/btrfs/relocation.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
@@ -34212,9 +34327,9 @@ diff -urNp linux-2.6.38.4/fs/btrfs/relocation.c linux-2.6.38.4/fs/btrfs/relocati
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.38.4/fs/cachefiles/bind.c linux-2.6.38.4/fs/cachefiles/bind.c
---- linux-2.6.38.4/fs/cachefiles/bind.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/bind.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cachefiles/bind.c linux-2.6.38.6/fs/cachefiles/bind.c
+--- linux-2.6.38.6/fs/cachefiles/bind.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cachefiles/bind.c	2011-04-28 19:34:15.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -34231,9 +34346,9 @@ diff -urNp linux-2.6.38.4/fs/cachefiles/bind.c linux-2.6.38.4/fs/cachefiles/bind
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-2.6.38.4/fs/cachefiles/daemon.c linux-2.6.38.4/fs/cachefiles/daemon.c
---- linux-2.6.38.4/fs/cachefiles/daemon.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/daemon.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cachefiles/daemon.c linux-2.6.38.6/fs/cachefiles/daemon.c
+--- linux-2.6.38.6/fs/cachefiles/daemon.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cachefiles/daemon.c	2011-04-28 19:34:15.000000000 -0400
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
  	if (n > buflen)
  		return -EMSGSIZE;
@@ -34270,9 +34385,9 @@ diff -urNp linux-2.6.38.4/fs/cachefiles/daemon.c linux-2.6.38.4/fs/cachefiles/da
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-2.6.38.4/fs/cachefiles/internal.h linux-2.6.38.4/fs/cachefiles/internal.h
---- linux-2.6.38.4/fs/cachefiles/internal.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/internal.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cachefiles/internal.h linux-2.6.38.6/fs/cachefiles/internal.h
+--- linux-2.6.38.6/fs/cachefiles/internal.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cachefiles/internal.h	2011-04-28 19:57:25.000000000 -0400
 @@ -57,7 +57,7 @@ struct cachefiles_cache {
  	wait_queue_head_t		daemon_pollwq;	/* poll waitqueue for daemon */
  	struct rb_root			active_nodes;	/* active nodes (can't be culled) */
@@ -34307,9 +34422,9 @@ diff -urNp linux-2.6.38.4/fs/cachefiles/internal.h linux-2.6.38.4/fs/cachefiles/
  }
  
  #else
-diff -urNp linux-2.6.38.4/fs/cachefiles/namei.c linux-2.6.38.4/fs/cachefiles/namei.c
---- linux-2.6.38.4/fs/cachefiles/namei.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/namei.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cachefiles/namei.c linux-2.6.38.6/fs/cachefiles/namei.c
+--- linux-2.6.38.6/fs/cachefiles/namei.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cachefiles/namei.c	2011-04-28 19:57:25.000000000 -0400
 @@ -309,7 +309,7 @@ try_again:
  	/* first step is to make up a grave dentry in the graveyard */
  	sprintf(nbuffer, "%08x%08x",
@@ -34319,9 +34434,9 @@ diff -urNp linux-2.6.38.4/fs/cachefiles/namei.c linux-2.6.38.4/fs/cachefiles/nam
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-2.6.38.4/fs/cachefiles/proc.c linux-2.6.38.4/fs/cachefiles/proc.c
---- linux-2.6.38.4/fs/cachefiles/proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/proc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cachefiles/proc.c linux-2.6.38.6/fs/cachefiles/proc.c
+--- linux-2.6.38.6/fs/cachefiles/proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cachefiles/proc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -34348,9 +34463,9 @@ diff -urNp linux-2.6.38.4/fs/cachefiles/proc.c linux-2.6.38.4/fs/cachefiles/proc
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff -urNp linux-2.6.38.4/fs/cachefiles/rdwr.c linux-2.6.38.4/fs/cachefiles/rdwr.c
---- linux-2.6.38.4/fs/cachefiles/rdwr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cachefiles/rdwr.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cachefiles/rdwr.c linux-2.6.38.6/fs/cachefiles/rdwr.c
+--- linux-2.6.38.6/fs/cachefiles/rdwr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cachefiles/rdwr.c	2011-04-28 19:34:15.000000000 -0400
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -34360,9 +34475,9 @@ diff -urNp linux-2.6.38.4/fs/cachefiles/rdwr.c linux-2.6.38.4/fs/cachefiles/rdwr
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-2.6.38.4/fs/ceph/dir.c linux-2.6.38.4/fs/ceph/dir.c
---- linux-2.6.38.4/fs/ceph/dir.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ceph/dir.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ceph/dir.c linux-2.6.38.6/fs/ceph/dir.c
+--- linux-2.6.38.6/fs/ceph/dir.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ceph/dir.c	2011-04-28 19:34:15.000000000 -0400
 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
  	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -34381,9 +34496,9 @@ diff -urNp linux-2.6.38.4/fs/ceph/dir.c linux-2.6.38.4/fs/ceph/dir.c
  		u64 pos = ceph_make_fpos(frag, off);
  		struct ceph_mds_reply_inode *in =
  			rinfo->dir_in[off - fi->offset].in;
-diff -urNp linux-2.6.38.4/fs/cifs/cifs_debug.c linux-2.6.38.4/fs/cifs/cifs_debug.c
---- linux-2.6.38.4/fs/cifs/cifs_debug.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cifs/cifs_debug.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cifs/cifs_debug.c linux-2.6.38.6/fs/cifs/cifs_debug.c
+--- linux-2.6.38.6/fs/cifs/cifs_debug.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cifs/cifs_debug.c	2011-04-28 19:57:25.000000000 -0400
 @@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str
  					tcon = list_entry(tmp3,
  							  struct cifsTconInfo,
@@ -34491,9 +34606,9 @@ diff -urNp linux-2.6.38.4/fs/cifs/cifs_debug.c linux-2.6.38.4/fs/cifs/cifs_debug
  			}
  		}
  	}
-diff -urNp linux-2.6.38.4/fs/cifs/cifsglob.h linux-2.6.38.4/fs/cifs/cifsglob.h
---- linux-2.6.38.4/fs/cifs/cifsglob.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cifs/cifsglob.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cifs/cifsglob.h linux-2.6.38.6/fs/cifs/cifsglob.h
+--- linux-2.6.38.6/fs/cifs/cifsglob.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cifs/cifsglob.h	2011-04-28 19:57:25.000000000 -0400
 @@ -305,28 +305,28 @@ struct cifsTconInfo {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
@@ -34554,9 +34669,9 @@ diff -urNp linux-2.6.38.4/fs/cifs/cifsglob.h linux-2.6.38.4/fs/cifs/cifsglob.h
  
  static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
  					    unsigned int bytes)
-diff -urNp linux-2.6.38.4/fs/cifs/link.c linux-2.6.38.4/fs/cifs/link.c
---- linux-2.6.38.4/fs/cifs/link.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/cifs/link.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/cifs/link.c linux-2.6.38.6/fs/cifs/link.c
+--- linux-2.6.38.6/fs/cifs/link.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/cifs/link.c	2011-04-28 19:34:15.000000000 -0400
 @@ -577,7 +577,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -34566,9 +34681,9 @@ diff -urNp linux-2.6.38.4/fs/cifs/link.c linux-2.6.38.4/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-2.6.38.4/fs/coda/cache.c linux-2.6.38.4/fs/coda/cache.c
---- linux-2.6.38.4/fs/coda/cache.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/coda/cache.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/coda/cache.c linux-2.6.38.6/fs/coda/cache.c
+--- linux-2.6.38.6/fs/coda/cache.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/coda/cache.c	2011-04-28 19:57:25.000000000 -0400
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -34613,9 +34728,9 @@ diff -urNp linux-2.6.38.4/fs/coda/cache.c linux-2.6.38.4/fs/coda/cache.c
  	spin_unlock(&cii->c_lock);
  
  	return hit;
-diff -urNp linux-2.6.38.4/fs/compat_binfmt_elf.c linux-2.6.38.4/fs/compat_binfmt_elf.c
---- linux-2.6.38.4/fs/compat_binfmt_elf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/compat_binfmt_elf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/compat_binfmt_elf.c linux-2.6.38.6/fs/compat_binfmt_elf.c
+--- linux-2.6.38.6/fs/compat_binfmt_elf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/compat_binfmt_elf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -30,11 +30,13 @@
  #undef	elf_phdr
  #undef	elf_shdr
@@ -34630,9 +34745,9 @@ diff -urNp linux-2.6.38.4/fs/compat_binfmt_elf.c linux-2.6.38.4/fs/compat_binfmt
  #define elf_addr_t	Elf32_Addr
  
  /*
-diff -urNp linux-2.6.38.4/fs/compat.c linux-2.6.38.4/fs/compat.c
---- linux-2.6.38.4/fs/compat.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/compat.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/compat.c linux-2.6.38.6/fs/compat.c
+--- linux-2.6.38.6/fs/compat.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/compat.c	2011-04-28 19:34:15.000000000 -0400
 @@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int
  		goto out;
  
@@ -34812,9 +34927,9 @@ diff -urNp linux-2.6.38.4/fs/compat.c linux-2.6.38.4/fs/compat.c
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-diff -urNp linux-2.6.38.4/fs/compat_ioctl.c linux-2.6.38.4/fs/compat_ioctl.c
---- linux-2.6.38.4/fs/compat_ioctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/compat_ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/compat_ioctl.c linux-2.6.38.6/fs/compat_ioctl.c
+--- linux-2.6.38.6/fs/compat_ioctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/compat_ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
  	err  = get_user(palp, &up->palette);
@@ -34835,9 +34950,36 @@ diff -urNp linux-2.6.38.4/fs/compat_ioctl.c linux-2.6.38.4/fs/compat_ioctl.c
  	if (a > b)
  		return 1;
  	if (a < b)
-diff -urNp linux-2.6.38.4/fs/dcache.c linux-2.6.38.4/fs/dcache.c
---- linux-2.6.38.4/fs/dcache.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/dcache.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/configfs/dir.c linux-2.6.38.6/fs/configfs/dir.c
+--- linux-2.6.38.6/fs/configfs/dir.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/configfs/dir.c	2011-05-11 18:34:57.000000000 -0400
+@@ -1571,7 +1571,8 @@ static int configfs_readdir(struct file 
+ 			}
+ 			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
+ 				struct configfs_dirent *next;
+-				const char * name;
++				const unsigned char * name;
++				char d_name[sizeof(next->s_dentry->d_iname)];
+ 				int len;
+ 
+ 				next = list_entry(p, struct configfs_dirent,
+@@ -1580,7 +1581,12 @@ static int configfs_readdir(struct file 
+ 					continue;
+ 
+ 				name = configfs_get_name(next);
+-				len = strlen(name);
++				if (next->s_dentry && name == next->s_dentry->d_iname) {
++					len =  next->s_dentry->d_name.len;
++					memcpy(d_name, name, len);
++					name = d_name;
++				} else
++					len = strlen(name);
+ 				if (next->s_dentry)
+ 					ino = next->s_dentry->d_inode->i_ino;
+ 				else
+diff -urNp linux-2.6.38.6/fs/dcache.c linux-2.6.38.6/fs/dcache.c
+--- linux-2.6.38.6/fs/dcache.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/fs/dcache.c	2011-04-28 19:34:15.000000000 -0400
 @@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned lon
  	mempages -= reserve;
  
@@ -34847,9 +34989,9 @@ diff -urNp linux-2.6.38.4/fs/dcache.c linux-2.6.38.4/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-2.6.38.4/fs/dlm/lockspace.c linux-2.6.38.4/fs/dlm/lockspace.c
---- linux-2.6.38.4/fs/dlm/lockspace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/dlm/lockspace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/dlm/lockspace.c linux-2.6.38.6/fs/dlm/lockspace.c
+--- linux-2.6.38.6/fs/dlm/lockspace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/dlm/lockspace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
  	return 0;
  }
@@ -34859,9 +35001,9 @@ diff -urNp linux-2.6.38.4/fs/dlm/lockspace.c linux-2.6.38.4/fs/dlm/lockspace.c
  	.uevent = dlm_uevent,
  };
  
-diff -urNp linux-2.6.38.4/fs/ecryptfs/inode.c linux-2.6.38.4/fs/ecryptfs/inode.c
---- linux-2.6.38.4/fs/ecryptfs/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ecryptfs/inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ecryptfs/inode.c linux-2.6.38.6/fs/ecryptfs/inode.c
+--- linux-2.6.38.6/fs/ecryptfs/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ecryptfs/inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -34889,9 +35031,9 @@ diff -urNp linux-2.6.38.4/fs/ecryptfs/inode.c linux-2.6.38.4/fs/ecryptfs/inode.c
  	if (!IS_ERR(buf)) {
  		/* Free the char* */
  		kfree(buf);
-diff -urNp linux-2.6.38.4/fs/ecryptfs/miscdev.c linux-2.6.38.4/fs/ecryptfs/miscdev.c
---- linux-2.6.38.4/fs/ecryptfs/miscdev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ecryptfs/miscdev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ecryptfs/miscdev.c linux-2.6.38.6/fs/ecryptfs/miscdev.c
+--- linux-2.6.38.6/fs/ecryptfs/miscdev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ecryptfs/miscdev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -328,7 +328,7 @@ check_list:
  		goto out_unlock_msg_ctx;
  	i = 5;
@@ -34901,9 +35043,9 @@ diff -urNp linux-2.6.38.4/fs/ecryptfs/miscdev.c linux-2.6.38.4/fs/ecryptfs/miscd
  			goto out_unlock_msg_ctx;
  		i += packet_length_size;
  		if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-2.6.38.4/fs/exec.c linux-2.6.38.4/fs/exec.c
---- linux-2.6.38.4/fs/exec.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/exec.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/exec.c linux-2.6.38.6/fs/exec.c
+--- linux-2.6.38.6/fs/exec.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/exec.c	2011-04-28 19:57:25.000000000 -0400
 @@ -55,12 +55,24 @@
  #include <linux/fs_struct.h>
  #include <linux/pipe_fs_i.h>
@@ -35494,9 +35636,9 @@ diff -urNp linux-2.6.38.4/fs/exec.c linux-2.6.38.4/fs/exec.c
  fail_unlock:
  	kfree(cn.corename);
  fail_corename:
-diff -urNp linux-2.6.38.4/fs/ext2/balloc.c linux-2.6.38.4/fs/ext2/balloc.c
---- linux-2.6.38.4/fs/ext2/balloc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext2/balloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ext2/balloc.c linux-2.6.38.6/fs/ext2/balloc.c
+--- linux-2.6.38.6/fs/ext2/balloc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ext2/balloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -35506,9 +35648,9 @@ diff -urNp linux-2.6.38.4/fs/ext2/balloc.c linux-2.6.38.4/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.38.4/fs/ext3/balloc.c linux-2.6.38.4/fs/ext3/balloc.c
---- linux-2.6.38.4/fs/ext3/balloc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext3/balloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ext3/balloc.c linux-2.6.38.6/fs/ext3/balloc.c
+--- linux-2.6.38.6/fs/ext3/balloc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ext3/balloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -35518,9 +35660,9 @@ diff -urNp linux-2.6.38.4/fs/ext3/balloc.c linux-2.6.38.4/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.38.4/fs/ext4/balloc.c linux-2.6.38.4/fs/ext4/balloc.c
---- linux-2.6.38.4/fs/ext4/balloc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext4/balloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ext4/balloc.c linux-2.6.38.6/fs/ext4/balloc.c
+--- linux-2.6.38.6/fs/ext4/balloc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ext4/balloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct e
  	/* Hm, nope.  Are (enough) root reserved blocks available? */
  	if (sbi->s_resuid == current_fsuid() ||
@@ -35530,9 +35672,9 @@ diff -urNp linux-2.6.38.4/fs/ext4/balloc.c linux-2.6.38.4/fs/ext4/balloc.c
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
  	}
-diff -urNp linux-2.6.38.4/fs/ext4/ext4.h linux-2.6.38.4/fs/ext4/ext4.h
---- linux-2.6.38.4/fs/ext4/ext4.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext4/ext4.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ext4/ext4.h linux-2.6.38.6/fs/ext4/ext4.h
+--- linux-2.6.38.6/fs/ext4/ext4.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ext4/ext4.h	2011-04-28 19:34:15.000000000 -0400
 @@ -1166,19 +1166,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
@@ -35563,9 +35705,9 @@ diff -urNp linux-2.6.38.4/fs/ext4/ext4.h linux-2.6.38.4/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-2.6.38.4/fs/ext4/mballoc.c linux-2.6.38.4/fs/ext4/mballoc.c
---- linux-2.6.38.4/fs/ext4/mballoc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ext4/mballoc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ext4/mballoc.c linux-2.6.38.6/fs/ext4/mballoc.c
+--- linux-2.6.38.6/fs/ext4/mballoc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ext4/mballoc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1846,7 +1846,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
@@ -35679,9 +35821,9 @@ diff -urNp linux-2.6.38.4/fs/ext4/mballoc.c linux-2.6.38.4/fs/ext4/mballoc.c
  	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
  	return 0;
-diff -urNp linux-2.6.38.4/fs/fcntl.c linux-2.6.38.4/fs/fcntl.c
---- linux-2.6.38.4/fs/fcntl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fcntl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fcntl.c linux-2.6.38.6/fs/fcntl.c
+--- linux-2.6.38.6/fs/fcntl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fcntl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -35719,9 +35861,9 @@ diff -urNp linux-2.6.38.4/fs/fcntl.c linux-2.6.38.4/fs/fcntl.c
  		));
  
  	fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-2.6.38.4/fs/fifo.c linux-2.6.38.4/fs/fifo.c
---- linux-2.6.38.4/fs/fifo.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fifo.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fifo.c linux-2.6.38.6/fs/fifo.c
+--- linux-2.6.38.6/fs/fifo.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fifo.c	2011-04-28 19:34:15.000000000 -0400
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
@@ -35792,10 +35934,10 @@ diff -urNp linux-2.6.38.4/fs/fifo.c linux-2.6.38.4/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.38.4/fs/file.c linux-2.6.38.4/fs/file.c
---- linux-2.6.38.4/fs/file.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/file.c	2011-04-28 19:34:15.000000000 -0400
-@@ -14,6 +14,7 @@
+diff -urNp linux-2.6.38.6/fs/file.c linux-2.6.38.6/fs/file.c
+--- linux-2.6.38.6/fs/file.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/fs/file.c	2011-05-10 22:06:56.000000000 -0400
+@@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
  #include <linux/file.h>
@@ -35803,7 +35945,7 @@ diff -urNp linux-2.6.38.4/fs/file.c linux-2.6.38.4/fs/file.c
  #include <linux/fdtable.h>
  #include <linux/bitops.h>
  #include <linux/interrupt.h>
-@@ -250,6 +251,7 @@ int expand_files(struct files_struct *fi
+@@ -254,6 +255,7 @@ int expand_files(struct files_struct *fi
  	 * N.B. For clone tasks sharing a files structure, this test
  	 * will limit the total number of files that can be opened.
  	 */
@@ -35811,9 +35953,9 @@ diff -urNp linux-2.6.38.4/fs/file.c linux-2.6.38.4/fs/file.c
  	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff -urNp linux-2.6.38.4/fs/filesystems.c linux-2.6.38.4/fs/filesystems.c
---- linux-2.6.38.4/fs/filesystems.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/filesystems.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/filesystems.c linux-2.6.38.6/fs/filesystems.c
+--- linux-2.6.38.6/fs/filesystems.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/filesystems.c	2011-04-28 19:34:15.000000000 -0400
 @@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
@@ -35827,9 +35969,9 @@ diff -urNp linux-2.6.38.4/fs/filesystems.c linux-2.6.38.4/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-2.6.38.4/fs/fscache/cookie.c linux-2.6.38.4/fs/fscache/cookie.c
---- linux-2.6.38.4/fs/fscache/cookie.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/cookie.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fscache/cookie.c linux-2.6.38.6/fs/fscache/cookie.c
+--- linux-2.6.38.6/fs/fscache/cookie.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fscache/cookie.c	2011-04-28 19:57:25.000000000 -0400
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
  	       parent ? (char *) parent->def->name : "<no-parent>",
  	       def->name, netfs_data);
@@ -35948,9 +36090,9 @@ diff -urNp linux-2.6.38.4/fs/fscache/cookie.c linux-2.6.38.4/fs/fscache/cookie.c
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff -urNp linux-2.6.38.4/fs/fscache/internal.h linux-2.6.38.4/fs/fscache/internal.h
---- linux-2.6.38.4/fs/fscache/internal.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/internal.h	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fscache/internal.h linux-2.6.38.6/fs/fscache/internal.h
+--- linux-2.6.38.6/fs/fscache/internal.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fscache/internal.h	2011-05-02 19:07:09.000000000 -0400
 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
  extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
  extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -36154,9 +36296,9 @@ diff -urNp linux-2.6.38.4/fs/fscache/internal.h linux-2.6.38.4/fs/fscache/intern
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-2.6.38.4/fs/fscache/object.c linux-2.6.38.4/fs/fscache/object.c
---- linux-2.6.38.4/fs/fscache/object.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/object.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fscache/object.c linux-2.6.38.6/fs/fscache/object.c
+--- linux-2.6.38.6/fs/fscache/object.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fscache/object.c	2011-04-28 19:57:25.000000000 -0400
 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
  		/* update the object metadata on disk */
  	case FSCACHE_OBJECT_UPDATING:
@@ -36268,9 +36410,9 @@ diff -urNp linux-2.6.38.4/fs/fscache/object.c linux-2.6.38.4/fs/fscache/object.c
  		break;
  
  	default:
-diff -urNp linux-2.6.38.4/fs/fscache/operation.c linux-2.6.38.4/fs/fscache/operation.c
---- linux-2.6.38.4/fs/fscache/operation.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/operation.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fscache/operation.c linux-2.6.38.6/fs/fscache/operation.c
+--- linux-2.6.38.6/fs/fscache/operation.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fscache/operation.c	2011-04-28 19:57:25.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -36386,9 +36528,9 @@ diff -urNp linux-2.6.38.4/fs/fscache/operation.c linux-2.6.38.4/fs/fscache/opera
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-2.6.38.4/fs/fscache/page.c linux-2.6.38.4/fs/fscache/page.c
---- linux-2.6.38.4/fs/fscache/page.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/page.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fscache/page.c linux-2.6.38.6/fs/fscache/page.c
+--- linux-2.6.38.6/fs/fscache/page.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fscache/page.c	2011-04-28 19:57:25.000000000 -0400
 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
  	val = radix_tree_lookup(&cookie->stores, page->index);
  	if (!val) {
@@ -36772,9 +36914,9 @@ diff -urNp linux-2.6.38.4/fs/fscache/page.c linux-2.6.38.4/fs/fscache/page.c
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-2.6.38.4/fs/fscache/stats.c linux-2.6.38.4/fs/fscache/stats.c
---- linux-2.6.38.4/fs/fscache/stats.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fscache/stats.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fscache/stats.c linux-2.6.38.6/fs/fscache/stats.c
+--- linux-2.6.38.6/fs/fscache/stats.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fscache/stats.c	2011-04-28 19:57:25.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -37150,9 +37292,9 @@ diff -urNp linux-2.6.38.4/fs/fscache/stats.c linux-2.6.38.4/fs/fscache/stats.c
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-2.6.38.4/fs/fs_struct.c linux-2.6.38.4/fs/fs_struct.c
---- linux-2.6.38.4/fs/fs_struct.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fs_struct.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fs_struct.c linux-2.6.38.6/fs/fs_struct.c
+--- linux-2.6.38.6/fs/fs_struct.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fs_struct.c	2011-04-28 19:34:15.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -37242,9 +37384,9 @@ diff -urNp linux-2.6.38.4/fs/fs_struct.c linux-2.6.38.4/fs/fs_struct.c
  		spin_unlock(&fs->lock);
  
  		task_unlock(current);
-diff -urNp linux-2.6.38.4/fs/fuse/cuse.c linux-2.6.38.4/fs/fuse/cuse.c
---- linux-2.6.38.4/fs/fuse/cuse.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/cuse.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fuse/cuse.c linux-2.6.38.6/fs/fuse/cuse.c
+--- linux-2.6.38.6/fs/fuse/cuse.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fuse/cuse.c	2011-04-28 19:34:15.000000000 -0400
 @@ -530,8 +530,18 @@ static int cuse_channel_release(struct i
  	return rc;
  }
@@ -37279,9 +37421,9 @@ diff -urNp linux-2.6.38.4/fs/fuse/cuse.c linux-2.6.38.4/fs/fuse/cuse.c
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
  		return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.38.4/fs/fuse/dev.c linux-2.6.38.4/fs/fuse/dev.c
---- linux-2.6.38.4/fs/fuse/dev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/dev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fuse/dev.c linux-2.6.38.6/fs/fuse/dev.c
+--- linux-2.6.38.6/fs/fuse/dev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fuse/dev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct f
  	return err;
  }
@@ -37363,9 +37505,9 @@ diff -urNp linux-2.6.38.4/fs/fuse/dev.c linux-2.6.38.4/fs/fuse/dev.c
  const struct file_operations fuse_dev_operations = {
  	.owner		= THIS_MODULE,
  	.llseek		= no_llseek,
-diff -urNp linux-2.6.38.4/fs/fuse/dir.c linux-2.6.38.4/fs/fuse/dir.c
---- linux-2.6.38.4/fs/fuse/dir.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/dir.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fuse/dir.c linux-2.6.38.6/fs/fuse/dir.c
+--- linux-2.6.38.6/fs/fuse/dir.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fuse/dir.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
@@ -37375,9 +37517,9 @@ diff -urNp linux-2.6.38.4/fs/fuse/dir.c linux-2.6.38.4/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-2.6.38.4/fs/fuse/fuse_i.h linux-2.6.38.4/fs/fuse/fuse_i.h
---- linux-2.6.38.4/fs/fuse/fuse_i.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/fuse/fuse_i.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/fuse/fuse_i.h linux-2.6.38.6/fs/fuse/fuse_i.h
+--- linux-2.6.38.6/fs/fuse/fuse_i.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/fuse/fuse_i.h	2011-04-28 19:34:15.000000000 -0400
 @@ -541,6 +541,16 @@ extern const struct file_operations fuse
  
  extern const struct dentry_operations fuse_dentry_operations;
@@ -37395,9 +37537,21 @@ diff -urNp linux-2.6.38.4/fs/fuse/fuse_i.h linux-2.6.38.4/fs/fuse/fuse_i.h
  /**
   * Inode to nodeid comparison.
   */
-diff -urNp linux-2.6.38.4/fs/hugetlbfs/inode.c linux-2.6.38.4/fs/hugetlbfs/inode.c
---- linux-2.6.38.4/fs/hugetlbfs/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/hugetlbfs/inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/gfs2/ops_inode.c linux-2.6.38.6/fs/gfs2/ops_inode.c
+--- linux-2.6.38.6/fs/gfs2/ops_inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/gfs2/ops_inode.c	2011-05-11 18:34:57.000000000 -0400
+@@ -1019,7 +1019,7 @@ out:
+ 
+ static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
+ {
+-	char *s = nd_get_link(nd);
++	const char *s = nd_get_link(nd);
+ 	if (!IS_ERR(s))
+ 		kfree(s);
+ }
+diff -urNp linux-2.6.38.6/fs/hugetlbfs/inode.c linux-2.6.38.6/fs/hugetlbfs/inode.c
+--- linux-2.6.38.6/fs/hugetlbfs/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/hugetlbfs/inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
@@ -37407,9 +37561,9 @@ diff -urNp linux-2.6.38.4/fs/hugetlbfs/inode.c linux-2.6.38.4/fs/hugetlbfs/inode
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-2.6.38.4/fs/inode.c linux-2.6.38.4/fs/inode.c
---- linux-2.6.38.4/fs/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/inode.c linux-2.6.38.6/fs/inode.c
+--- linux-2.6.38.6/fs/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -801,8 +801,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
@@ -37421,9 +37575,9 @@ diff -urNp linux-2.6.38.4/fs/inode.c linux-2.6.38.4/fs/inode.c
  
  		res = next - LAST_INO_BATCH;
  	}
-diff -urNp linux-2.6.38.4/fs/jffs2/erase.c linux-2.6.38.4/fs/jffs2/erase.c
---- linux-2.6.38.4/fs/jffs2/erase.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/jffs2/erase.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/jffs2/erase.c linux-2.6.38.6/fs/jffs2/erase.c
+--- linux-2.6.38.6/fs/jffs2/erase.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/jffs2/erase.c	2011-04-28 19:34:15.000000000 -0400
 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -37434,9 +37588,9 @@ diff -urNp linux-2.6.38.4/fs/jffs2/erase.c linux-2.6.38.4/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.38.4/fs/jffs2/wbuf.c linux-2.6.38.4/fs/jffs2/wbuf.c
---- linux-2.6.38.4/fs/jffs2/wbuf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/jffs2/wbuf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/jffs2/wbuf.c linux-2.6.38.6/fs/jffs2/wbuf.c
+--- linux-2.6.38.6/fs/jffs2/wbuf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/jffs2/wbuf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -37447,9 +37601,9 @@ diff -urNp linux-2.6.38.4/fs/jffs2/wbuf.c linux-2.6.38.4/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.38.4/fs/Kconfig.binfmt linux-2.6.38.4/fs/Kconfig.binfmt
---- linux-2.6.38.4/fs/Kconfig.binfmt	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/Kconfig.binfmt	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/Kconfig.binfmt linux-2.6.38.6/fs/Kconfig.binfmt
+--- linux-2.6.38.6/fs/Kconfig.binfmt	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/Kconfig.binfmt	2011-04-28 19:34:15.000000000 -0400
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -37459,35 +37613,36 @@ diff -urNp linux-2.6.38.4/fs/Kconfig.binfmt linux-2.6.38.4/fs/Kconfig.binfmt
  	---help---
  	  A.out (Assembler.OUTput) is a set of formats for libraries and
  	  executables used in the earliest versions of UNIX.  Linux used
-diff -urNp linux-2.6.38.4/fs/libfs.c linux-2.6.38.4/fs/libfs.c
---- linux-2.6.38.4/fs/libfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/libfs.c	2011-04-28 19:34:15.000000000 -0400
-@@ -138,6 +138,8 @@ int dcache_readdir(struct file * filp, v
- 	struct dentry *dentry = filp->f_path.dentry;
- 	struct dentry *cursor = filp->private_data;
- 	struct list_head *p, *q = &cursor->d_u.d_child;
-+	char d_name[DNAME_INLINE_LEN];
-+	const char *name;
- 	ino_t ino;
- 	int i = filp->f_pos;
- 
-@@ -172,7 +174,12 @@ int dcache_readdir(struct file * filp, v
+diff -urNp linux-2.6.38.6/fs/libfs.c linux-2.6.38.6/fs/libfs.c
+--- linux-2.6.38.6/fs/libfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/libfs.c	2011-05-11 18:34:57.000000000 -0400
+@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
+ 
+ 			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ 				struct dentry *next;
++				char d_name[sizeof(next->d_iname)];
++				const unsigned char *name;
++
+ 				next = list_entry(p, struct dentry, d_u.d_child);
+ 				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ 				if (!simple_positive(next)) {
+@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, v
  
  				spin_unlock(&next->d_lock);
  				spin_unlock(&dentry->d_lock);
 -				if (filldir(dirent, next->d_name.name, 
-+				if (next->d_name.len < DNAME_INLINE_LEN) {
-+					memcpy(d_name, next->d_name.name, next->d_name.len);
++				name = next->d_name.name;
++				if (name == next->d_iname) {
++					memcpy(d_name, name, next->d_name.len);
 +					name = d_name;
-+				} else
-+					name = next->d_name.name;
++				}
 +				if (filldir(dirent, name, 
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff -urNp linux-2.6.38.4/fs/lockd/clntproc.c linux-2.6.38.4/fs/lockd/clntproc.c
---- linux-2.6.38.4/fs/lockd/clntproc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/lockd/clntproc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/lockd/clntproc.c linux-2.6.38.6/fs/lockd/clntproc.c
+--- linux-2.6.38.6/fs/lockd/clntproc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/lockd/clntproc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -37502,9 +37657,9 @@ diff -urNp linux-2.6.38.4/fs/lockd/clntproc.c linux-2.6.38.4/fs/lockd/clntproc.c
  
  	memcpy(c->data, &cookie, 4);
  	c->len=4;
-diff -urNp linux-2.6.38.4/fs/lockd/svc.c linux-2.6.38.4/fs/lockd/svc.c
---- linux-2.6.38.4/fs/lockd/svc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/lockd/svc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/lockd/svc.c linux-2.6.38.6/fs/lockd/svc.c
+--- linux-2.6.38.6/fs/lockd/svc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/lockd/svc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -41,7 +41,7 @@
  
  static struct svc_program	nlmsvc_program;
@@ -37514,9 +37669,9 @@ diff -urNp linux-2.6.38.4/fs/lockd/svc.c linux-2.6.38.4/fs/lockd/svc.c
  EXPORT_SYMBOL_GPL(nlmsvc_ops);
  
  static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.38.4/fs/locks.c linux-2.6.38.4/fs/locks.c
---- linux-2.6.38.4/fs/locks.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/locks.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/locks.c linux-2.6.38.6/fs/locks.c
+--- linux-2.6.38.6/fs/locks.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/locks.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
@@ -37538,9 +37693,9 @@ diff -urNp linux-2.6.38.4/fs/locks.c linux-2.6.38.4/fs/locks.c
  	}
  
  	lock_flocks();
-diff -urNp linux-2.6.38.4/fs/namei.c linux-2.6.38.4/fs/namei.c
---- linux-2.6.38.4/fs/namei.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/fs/namei.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/namei.c linux-2.6.38.6/fs/namei.c
+--- linux-2.6.38.6/fs/namei.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/fs/namei.c	2011-04-28 19:34:15.000000000 -0400
 @@ -226,14 +226,6 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -38024,9 +38179,9 @@ diff -urNp linux-2.6.38.4/fs/namei.c linux-2.6.38.4/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-2.6.38.4/fs/namespace.c linux-2.6.38.4/fs/namespace.c
---- linux-2.6.38.4/fs/namespace.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/namespace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/namespace.c linux-2.6.38.6/fs/namespace.c
+--- linux-2.6.38.6/fs/namespace.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/fs/namespace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -38087,9 +38242,9 @@ diff -urNp linux-2.6.38.4/fs/namespace.c linux-2.6.38.4/fs/namespace.c
  	get_fs_root(current->fs, &root);
  	down_write(&namespace_sem);
  	mutex_lock(&old.dentry->d_inode->i_mutex);
-diff -urNp linux-2.6.38.4/fs/nfs/inode.c linux-2.6.38.4/fs/nfs/inode.c
---- linux-2.6.38.4/fs/nfs/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/nfs/inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/nfs/inode.c linux-2.6.38.6/fs/nfs/inode.c
+--- linux-2.6.38.6/fs/nfs/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/nfs/inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -998,16 +998,16 @@ static int nfs_size_need_update(const st
  	return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
@@ -38110,9 +38265,9 @@ diff -urNp linux-2.6.38.4/fs/nfs/inode.c linux-2.6.38.4/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.38.4/fs/nfsd/lockd.c linux-2.6.38.4/fs/nfsd/lockd.c
---- linux-2.6.38.4/fs/nfsd/lockd.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/fs/nfsd/lockd.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/nfsd/lockd.c linux-2.6.38.6/fs/nfsd/lockd.c
+--- linux-2.6.38.6/fs/nfsd/lockd.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/fs/nfsd/lockd.c	2011-04-28 19:34:15.000000000 -0400
 @@ -60,7 +60,7 @@ nlm_fclose(struct file *filp)
  	fput(filp);
  }
@@ -38122,9 +38277,9 @@ diff -urNp linux-2.6.38.4/fs/nfsd/lockd.c linux-2.6.38.4/fs/nfsd/lockd.c
  	.fopen		= nlm_fopen,		/* open file for locking */
  	.fclose		= nlm_fclose,		/* close file */
  };
-diff -urNp linux-2.6.38.4/fs/nfsd/nfsctl.c linux-2.6.38.4/fs/nfsd/nfsctl.c
---- linux-2.6.38.4/fs/nfsd/nfsctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/nfsd/nfsctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/nfsd/nfsctl.c linux-2.6.38.6/fs/nfsd/nfsctl.c
+--- linux-2.6.38.6/fs/nfsd/nfsctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/nfsd/nfsctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -180,7 +180,7 @@ static int export_features_open(struct i
  	return single_open(file, export_features_show, NULL);
  }
@@ -38134,9 +38289,9 @@ diff -urNp linux-2.6.38.4/fs/nfsd/nfsctl.c linux-2.6.38.4/fs/nfsd/nfsctl.c
  	.open		= export_features_open,
  	.read		= seq_read,
  	.llseek		= seq_lseek,
-diff -urNp linux-2.6.38.4/fs/nfsd/vfs.c linux-2.6.38.4/fs/nfsd/vfs.c
---- linux-2.6.38.4/fs/nfsd/vfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/nfsd/vfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/nfsd/vfs.c linux-2.6.38.6/fs/nfsd/vfs.c
+--- linux-2.6.38.6/fs/nfsd/vfs.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/fs/nfsd/vfs.c	2011-05-10 22:08:57.000000000 -0400
 @@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -38155,7 +38310,7 @@ diff -urNp linux-2.6.38.4/fs/nfsd/vfs.c linux-2.6.38.4/fs/nfsd/vfs.c
  	set_fs(oldfs);
  	if (host_err < 0)
  		goto out_nfserr;
-@@ -1518,7 +1518,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
  	 */
  
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -38164,9 +38319,9 @@ diff -urNp linux-2.6.38.4/fs/nfsd/vfs.c linux-2.6.38.4/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-2.6.38.4/fs/notify/dnotify/dnotify.c linux-2.6.38.4/fs/notify/dnotify/dnotify.c
---- linux-2.6.38.4/fs/notify/dnotify/dnotify.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/notify/dnotify/dnotify.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/notify/dnotify/dnotify.c linux-2.6.38.6/fs/notify/dnotify/dnotify.c
+--- linux-2.6.38.6/fs/notify/dnotify/dnotify.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/notify/dnotify/dnotify.c	2011-04-28 19:34:15.000000000 -0400
 @@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsn
  	kmem_cache_free(dnotify_mark_cache, dn_mark);
  }
@@ -38176,9 +38331,9 @@ diff -urNp linux-2.6.38.4/fs/notify/dnotify/dnotify.c linux-2.6.38.4/fs/notify/d
  	.handle_event = dnotify_handle_event,
  	.should_send_event = dnotify_should_send_event,
  	.free_group_priv = NULL,
-diff -urNp linux-2.6.38.4/fs/notify/notification.c linux-2.6.38.4/fs/notify/notification.c
---- linux-2.6.38.4/fs/notify/notification.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/notify/notification.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/notify/notification.c linux-2.6.38.6/fs/notify/notification.c
+--- linux-2.6.38.6/fs/notify/notification.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/notify/notification.c	2011-04-28 19:57:25.000000000 -0400
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -38197,9 +38352,9 @@ diff -urNp linux-2.6.38.4/fs/notify/notification.c linux-2.6.38.4/fs/notify/noti
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-2.6.38.4/fs/ntfs/dir.c linux-2.6.38.4/fs/ntfs/dir.c
---- linux-2.6.38.4/fs/ntfs/dir.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ntfs/dir.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ntfs/dir.c linux-2.6.38.6/fs/ntfs/dir.c
+--- linux-2.6.38.6/fs/ntfs/dir.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ntfs/dir.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -38209,9 +38364,9 @@ diff -urNp linux-2.6.38.4/fs/ntfs/dir.c linux-2.6.38.4/fs/ntfs/dir.c
  		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
  				"inode 0x%lx or driver bug.", vdir->i_ino);
  		goto err_out;
-diff -urNp linux-2.6.38.4/fs/ntfs/file.c linux-2.6.38.4/fs/ntfs/file.c
---- linux-2.6.38.4/fs/ntfs/file.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ntfs/file.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ntfs/file.c linux-2.6.38.6/fs/ntfs/file.c
+--- linux-2.6.38.6/fs/ntfs/file.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ntfs/file.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -38221,9 +38376,9 @@ diff -urNp linux-2.6.38.4/fs/ntfs/file.c linux-2.6.38.4/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.38.4/fs/ocfs2/localalloc.c linux-2.6.38.4/fs/ocfs2/localalloc.c
---- linux-2.6.38.4/fs/ocfs2/localalloc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/localalloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ocfs2/localalloc.c linux-2.6.38.6/fs/ocfs2/localalloc.c
+--- linux-2.6.38.6/fs/ocfs2/localalloc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ocfs2/localalloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
@@ -38233,9 +38388,9 @@ diff -urNp linux-2.6.38.4/fs/ocfs2/localalloc.c linux-2.6.38.4/fs/ocfs2/localall
  
  bail:
  	if (handle)
-diff -urNp linux-2.6.38.4/fs/ocfs2/ocfs2.h linux-2.6.38.4/fs/ocfs2/ocfs2.h
---- linux-2.6.38.4/fs/ocfs2/ocfs2.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/ocfs2.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ocfs2/ocfs2.h linux-2.6.38.6/fs/ocfs2/ocfs2.h
+--- linux-2.6.38.6/fs/ocfs2/ocfs2.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ocfs2/ocfs2.h	2011-04-28 19:34:15.000000000 -0400
 @@ -230,11 +230,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -38253,9 +38408,9 @@ diff -urNp linux-2.6.38.4/fs/ocfs2/ocfs2.h linux-2.6.38.4/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.38.4/fs/ocfs2/suballoc.c linux-2.6.38.4/fs/ocfs2/suballoc.c
---- linux-2.6.38.4/fs/ocfs2/suballoc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/suballoc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ocfs2/suballoc.c linux-2.6.38.6/fs/ocfs2/suballoc.c
+--- linux-2.6.38.6/fs/ocfs2/suballoc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ocfs2/suballoc.c	2011-05-11 18:34:57.000000000 -0400
 @@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
@@ -38274,6 +38429,15 @@ diff -urNp linux-2.6.38.4/fs/ocfs2/suballoc.c linux-2.6.38.4/fs/ocfs2/suballoc.c
  
  	*suballoc_loc = res.sr_bg_blkno;
  	*suballoc_bit_start = res.sr_bit_offset;
+@@ -2175,7 +2175,7 @@ int ocfs2_claim_new_inode_at_loc(handle_
+ 	mlog(0, "Allocated %u bits from suballocator %llu\n", res->sr_bits,
+ 	     (unsigned long long)di_blkno);
+ 
+-	atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
++	atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
+ 
+ 	BUG_ON(res->sr_bits != 1);
+ 
 @@ -2219,7 +2219,7 @@ int ocfs2_claim_new_inode(handle_t *hand
  		mlog_errno(status);
  		goto bail;
@@ -38301,9 +38465,9 @@ diff -urNp linux-2.6.38.4/fs/ocfs2/suballoc.c linux-2.6.38.4/fs/ocfs2/suballoc.c
  			*num_clusters = res.sr_bits;
  		}
  	}
-diff -urNp linux-2.6.38.4/fs/ocfs2/super.c linux-2.6.38.4/fs/ocfs2/super.c
---- linux-2.6.38.4/fs/ocfs2/super.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/super.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ocfs2/super.c linux-2.6.38.6/fs/ocfs2/super.c
+--- linux-2.6.38.6/fs/ocfs2/super.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ocfs2/super.c	2011-04-28 19:34:15.000000000 -0400
 @@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -38338,9 +38502,9 @@ diff -urNp linux-2.6.38.4/fs/ocfs2/super.c linux-2.6.38.4/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.38.4/fs/ocfs2/symlink.c linux-2.6.38.4/fs/ocfs2/symlink.c
---- linux-2.6.38.4/fs/ocfs2/symlink.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/ocfs2/symlink.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/ocfs2/symlink.c linux-2.6.38.6/fs/ocfs2/symlink.c
+--- linux-2.6.38.6/fs/ocfs2/symlink.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/ocfs2/symlink.c	2011-04-28 19:34:15.000000000 -0400
 @@ -148,7 +148,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -38350,9 +38514,9 @@ diff -urNp linux-2.6.38.4/fs/ocfs2/symlink.c linux-2.6.38.4/fs/ocfs2/symlink.c
  	if (!IS_ERR(link))
  		kfree(link);
  }
-diff -urNp linux-2.6.38.4/fs/open.c linux-2.6.38.4/fs/open.c
---- linux-2.6.38.4/fs/open.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/open.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/open.c linux-2.6.38.6/fs/open.c
+--- linux-2.6.38.6/fs/open.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/open.c	2011-04-28 19:34:15.000000000 -0400
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -38490,33 +38654,18 @@ diff -urNp linux-2.6.38.4/fs/open.c linux-2.6.38.4/fs/open.c
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-2.6.38.4/fs/partitions/ldm.c linux-2.6.38.4/fs/partitions/ldm.c
---- linux-2.6.38.4/fs/partitions/ldm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/partitions/ldm.c	2011-04-28 19:34:15.000000000 -0400
-@@ -1299,6 +1299,11 @@ static bool ldm_frag_add (const u8 *data
- 
- 	BUG_ON (!data || !frags);
- 
-+	if (size < 2 * VBLK_SIZE_HEAD) {
-+		ldm_error("Value of size is to small.");
-+		return false;
-+	}
-+
- 	group = get_unaligned_be32(data + 0x08);
- 	rec   = get_unaligned_be16(data + 0x0C);
- 	num   = get_unaligned_be16(data + 0x0E);
-@@ -1307,13 +1312,18 @@ static bool ldm_frag_add (const u8 *data
+diff -urNp linux-2.6.38.6/fs/partitions/ldm.c linux-2.6.38.6/fs/partitions/ldm.c
+--- linux-2.6.38.6/fs/partitions/ldm.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/fs/partitions/ldm.c	2011-04-28 19:34:15.000000000 -0400
+@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
+ 		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
  	}
- 
-+	if (rec >= num) {
-+		ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
-+		return false;
-+	}
 +
- 	list_for_each (item, frags) {
- 		f = list_entry (item, struct frag, list);
- 		if (f->group == group)
+ 	if (rec >= num) {
+ 		ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
+ 		return false;
+@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data
  			goto found;
  	}
  
@@ -38525,23 +38674,9 @@ diff -urNp linux-2.6.38.4/fs/partitions/ldm.c linux-2.6.38.4/fs/partitions/ldm.c
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-@@ -1334,10 +1344,9 @@ found:
- 
- 	f->map |= (1 << rec);
- 
--	if (num > 0) {
--		data += VBLK_SIZE_HEAD;
--		size -= VBLK_SIZE_HEAD;
--	}
-+	data += VBLK_SIZE_HEAD;
-+	size -= VBLK_SIZE_HEAD;
-+
- 	memcpy (f->data+rec*(size-VBLK_SIZE_HEAD)+VBLK_SIZE_HEAD, data, size);
- 
- 	return true;
-diff -urNp linux-2.6.38.4/fs/pipe.c linux-2.6.38.4/fs/pipe.c
---- linux-2.6.38.4/fs/pipe.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/pipe.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/pipe.c linux-2.6.38.6/fs/pipe.c
+--- linux-2.6.38.6/fs/pipe.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/pipe.c	2011-04-28 19:34:15.000000000 -0400
 @@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -38665,9 +38800,9 @@ diff -urNp linux-2.6.38.4/fs/pipe.c linux-2.6.38.4/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-2.6.38.4/fs/proc/array.c linux-2.6.38.4/fs/proc/array.c
---- linux-2.6.38.4/fs/proc/array.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/array.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/array.c linux-2.6.38.6/fs/proc/array.c
+--- linux-2.6.38.6/fs/proc/array.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/fs/proc/array.c	2011-05-10 21:34:42.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -38723,6 +38858,15 @@ diff -urNp linux-2.6.38.4/fs/proc/array.c linux-2.6.38.4/fs/proc/array.c
  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task, int whole)
  {
+@@ -375,7 +406,7 @@ static int do_task_stat(struct seq_file 
+ 	cputime_t cutime, cstime, utime, stime;
+ 	cputime_t cgtime, gtime;
+ 	unsigned long rsslim = 0;
+-	char tcomm[sizeof(task->comm)];
++	char tcomm[sizeof(task->comm)] = { 0 };
+ 	unsigned long flags;
+ 
+ 	state = *get_task_state(task);
 @@ -449,6 +480,19 @@ static int do_task_stat(struct seq_file 
  		gtime = task->gtime;
  	}
@@ -38778,9 +38922,9 @@ diff -urNp linux-2.6.38.4/fs/proc/array.c linux-2.6.38.4/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.38.4/fs/proc/base.c linux-2.6.38.4/fs/proc/base.c
---- linux-2.6.38.4/fs/proc/base.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/base.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/base.c linux-2.6.38.6/fs/proc/base.c
+--- linux-2.6.38.6/fs/proc/base.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/fs/proc/base.c	2011-04-28 19:34:15.000000000 -0400
 @@ -104,6 +104,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -39209,9 +39353,9 @@ diff -urNp linux-2.6.38.4/fs/proc/base.c linux-2.6.38.4/fs/proc/base.c
  	ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.38.4/fs/proc/cmdline.c linux-2.6.38.4/fs/proc/cmdline.c
---- linux-2.6.38.4/fs/proc/cmdline.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/cmdline.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/cmdline.c linux-2.6.38.6/fs/proc/cmdline.c
+--- linux-2.6.38.6/fs/proc/cmdline.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/cmdline.c	2011-04-28 19:34:15.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -39224,9 +39368,9 @@ diff -urNp linux-2.6.38.4/fs/proc/cmdline.c linux-2.6.38.4/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.38.4/fs/proc/devices.c linux-2.6.38.4/fs/proc/devices.c
---- linux-2.6.38.4/fs/proc/devices.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/devices.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/devices.c linux-2.6.38.6/fs/proc/devices.c
+--- linux-2.6.38.6/fs/proc/devices.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/devices.c	2011-04-28 19:34:15.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -39239,9 +39383,9 @@ diff -urNp linux-2.6.38.4/fs/proc/devices.c linux-2.6.38.4/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.38.4/fs/proc/inode.c linux-2.6.38.4/fs/proc/inode.c
---- linux-2.6.38.4/fs/proc/inode.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/inode.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/inode.c linux-2.6.38.6/fs/proc/inode.c
+--- linux-2.6.38.6/fs/proc/inode.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/inode.c	2011-04-28 19:34:15.000000000 -0400
 @@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
@@ -39254,9 +39398,9 @@ diff -urNp linux-2.6.38.4/fs/proc/inode.c linux-2.6.38.4/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-2.6.38.4/fs/proc/internal.h linux-2.6.38.4/fs/proc/internal.h
---- linux-2.6.38.4/fs/proc/internal.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/internal.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/internal.h linux-2.6.38.6/fs/proc/internal.h
+--- linux-2.6.38.6/fs/proc/internal.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/internal.h	2011-04-28 19:34:15.000000000 -0400
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -39267,9 +39411,9 @@ diff -urNp linux-2.6.38.4/fs/proc/internal.h linux-2.6.38.4/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.38.4/fs/proc/Kconfig linux-2.6.38.4/fs/proc/Kconfig
---- linux-2.6.38.4/fs/proc/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/Kconfig linux-2.6.38.6/fs/proc/Kconfig
+--- linux-2.6.38.6/fs/proc/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/Kconfig	2011-04-28 19:34:15.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -39297,9 +39441,9 @@ diff -urNp linux-2.6.38.4/fs/proc/Kconfig linux-2.6.38.4/fs/proc/Kconfig
  	bool "Enable /proc page monitoring" if EXPERT
   	help
  	  Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.38.4/fs/proc/kcore.c linux-2.6.38.4/fs/proc/kcore.c
---- linux-2.6.38.4/fs/proc/kcore.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/kcore.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/kcore.c linux-2.6.38.6/fs/proc/kcore.c
+--- linux-2.6.38.6/fs/proc/kcore.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/kcore.c	2011-04-28 19:34:15.000000000 -0400
 @@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
  	 * the addresses in the elf_phdr on our list.
  	 */
@@ -39358,9 +39502,9 @@ diff -urNp linux-2.6.38.4/fs/proc/kcore.c linux-2.6.38.4/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-2.6.38.4/fs/proc/meminfo.c linux-2.6.38.4/fs/proc/meminfo.c
---- linux-2.6.38.4/fs/proc/meminfo.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/meminfo.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/meminfo.c linux-2.6.38.6/fs/proc/meminfo.c
+--- linux-2.6.38.6/fs/proc/meminfo.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/meminfo.c	2011-05-11 18:34:07.000000000 -0400
 @@ -157,7 +157,7 @@ static int meminfo_proc_show(struct seq_
  		vmi.used >> 10,
  		vmi.largest_chunk >> 10
@@ -39370,9 +39514,9 @@ diff -urNp linux-2.6.38.4/fs/proc/meminfo.c linux-2.6.38.4/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  		,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-2.6.38.4/fs/proc/nommu.c linux-2.6.38.4/fs/proc/nommu.c
---- linux-2.6.38.4/fs/proc/nommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/nommu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/nommu.c linux-2.6.38.6/fs/proc/nommu.c
+--- linux-2.6.38.6/fs/proc/nommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/nommu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
@@ -39382,9 +39526,9 @@ diff -urNp linux-2.6.38.4/fs/proc/nommu.c linux-2.6.38.4/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.38.4/fs/proc/proc_net.c linux-2.6.38.4/fs/proc/proc_net.c
---- linux-2.6.38.4/fs/proc/proc_net.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/proc_net.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/proc_net.c linux-2.6.38.6/fs/proc/proc_net.c
+--- linux-2.6.38.6/fs/proc/proc_net.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/proc_net.c	2011-04-28 19:34:15.000000000 -0400
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
@@ -39403,9 +39547,9 @@ diff -urNp linux-2.6.38.4/fs/proc/proc_net.c linux-2.6.38.4/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.38.4/fs/proc/proc_sysctl.c linux-2.6.38.4/fs/proc/proc_sysctl.c
---- linux-2.6.38.4/fs/proc/proc_sysctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/proc_sysctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/proc_sysctl.c linux-2.6.38.6/fs/proc/proc_sysctl.c
+--- linux-2.6.38.6/fs/proc/proc_sysctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/proc_sysctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -8,6 +8,8 @@
  #include <linux/namei.h>
  #include "internal.h"
@@ -39445,9 +39589,9 @@ diff -urNp linux-2.6.38.4/fs/proc/proc_sysctl.c linux-2.6.38.4/fs/proc/proc_sysc
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.38.4/fs/proc/root.c linux-2.6.38.4/fs/proc/root.c
---- linux-2.6.38.4/fs/proc/root.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/root.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/root.c linux-2.6.38.6/fs/proc/root.c
+--- linux-2.6.38.6/fs/proc/root.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/root.c	2011-04-28 19:34:15.000000000 -0400
 @@ -132,7 +132,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
@@ -39464,9 +39608,9 @@ diff -urNp linux-2.6.38.4/fs/proc/root.c linux-2.6.38.4/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-2.6.38.4/fs/proc/task_mmu.c linux-2.6.38.4/fs/proc/task_mmu.c
---- linux-2.6.38.4/fs/proc/task_mmu.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/task_mmu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/task_mmu.c linux-2.6.38.6/fs/proc/task_mmu.c
+--- linux-2.6.38.6/fs/proc/task_mmu.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/fs/proc/task_mmu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
@@ -39616,9 +39760,9 @@ diff -urNp linux-2.6.38.4/fs/proc/task_mmu.c linux-2.6.38.4/fs/proc/task_mmu.c
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-diff -urNp linux-2.6.38.4/fs/proc/task_nommu.c linux-2.6.38.4/fs/proc/task_nommu.c
---- linux-2.6.38.4/fs/proc/task_nommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/proc/task_nommu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/proc/task_nommu.c linux-2.6.38.6/fs/proc/task_nommu.c
+--- linux-2.6.38.6/fs/proc/task_nommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/proc/task_nommu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
@@ -39637,9 +39781,9 @@ diff -urNp linux-2.6.38.4/fs/proc/task_nommu.c linux-2.6.38.4/fs/proc/task_nommu
  	} else if (mm) {
  		if (vma->vm_start <= mm->start_stack &&
  			vma->vm_end >= mm->start_stack) {
-diff -urNp linux-2.6.38.4/fs/quota/netlink.c linux-2.6.38.4/fs/quota/netlink.c
---- linux-2.6.38.4/fs/quota/netlink.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/quota/netlink.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/quota/netlink.c linux-2.6.38.6/fs/quota/netlink.c
+--- linux-2.6.38.6/fs/quota/netlink.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/quota/netlink.c	2011-04-28 19:57:25.000000000 -0400
 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
  void quota_send_warning(short type, unsigned int id, dev_t dev,
  			const char warntype)
@@ -39658,9 +39802,9 @@ diff -urNp linux-2.6.38.4/fs/quota/netlink.c linux-2.6.38.4/fs/quota/netlink.c
  			&quota_genl_family, 0, QUOTA_NL_C_WARNING);
  	if (!msg_head) {
  		printk(KERN_ERR
-diff -urNp linux-2.6.38.4/fs/readdir.c linux-2.6.38.4/fs/readdir.c
---- linux-2.6.38.4/fs/readdir.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/readdir.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/readdir.c linux-2.6.38.6/fs/readdir.c
+--- linux-2.6.38.6/fs/readdir.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/readdir.c	2011-04-28 19:34:15.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -39750,9 +39894,9 @@ diff -urNp linux-2.6.38.4/fs/readdir.c linux-2.6.38.4/fs/readdir.c
  	buf.count = count;
  	buf.error = 0;
  
-diff -urNp linux-2.6.38.4/fs/reiserfs/do_balan.c linux-2.6.38.4/fs/reiserfs/do_balan.c
---- linux-2.6.38.4/fs/reiserfs/do_balan.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/reiserfs/do_balan.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/reiserfs/do_balan.c linux-2.6.38.6/fs/reiserfs/do_balan.c
+--- linux-2.6.38.6/fs/reiserfs/do_balan.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/reiserfs/do_balan.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
@@ -39762,9 +39906,9 @@ diff -urNp linux-2.6.38.4/fs/reiserfs/do_balan.c linux-2.6.38.4/fs/reiserfs/do_b
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.38.4/fs/reiserfs/item_ops.c linux-2.6.38.4/fs/reiserfs/item_ops.c
---- linux-2.6.38.4/fs/reiserfs/item_ops.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/reiserfs/item_ops.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/reiserfs/item_ops.c linux-2.6.38.6/fs/reiserfs/item_ops.c
+--- linux-2.6.38.6/fs/reiserfs/item_ops.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/reiserfs/item_ops.c	2011-04-28 19:34:15.000000000 -0400
 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
  			 vi->vi_index, vi->vi_type, vi->vi_ih);
  }
@@ -39819,9 +39963,9 @@ diff -urNp linux-2.6.38.4/fs/reiserfs/item_ops.c linux-2.6.38.4/fs/reiserfs/item
  	&stat_data_ops,
  	&indirect_ops,
  	&direct_ops,
-diff -urNp linux-2.6.38.4/fs/reiserfs/procfs.c linux-2.6.38.4/fs/reiserfs/procfs.c
---- linux-2.6.38.4/fs/reiserfs/procfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/reiserfs/procfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/reiserfs/procfs.c linux-2.6.38.6/fs/reiserfs/procfs.c
+--- linux-2.6.38.6/fs/reiserfs/procfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/reiserfs/procfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -39831,9 +39975,9 @@ diff -urNp linux-2.6.38.4/fs/reiserfs/procfs.c linux-2.6.38.4/fs/reiserfs/procfs
  		   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
  		   SF(s_do_balance), SF(s_unneeded_left_neighbor),
  		   SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.38.4/fs/select.c linux-2.6.38.4/fs/select.c
---- linux-2.6.38.4/fs/select.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/select.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/select.c linux-2.6.38.6/fs/select.c
+--- linux-2.6.38.6/fs/select.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/select.c	2011-05-11 18:35:37.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -39842,17 +39986,29 @@ diff -urNp linux-2.6.38.4/fs/select.c linux-2.6.38.4/fs/select.c
  #include <linux/personality.h> /* for STICKY_TIMEOUTS */
  #include <linux/file.h>
  #include <linux/fdtable.h>
-@@ -840,6 +841,7 @@ int do_sys_poll(struct pollfd __user *uf
+@@ -403,6 +404,8 @@ int do_select(int n, fd_set_bits *fds, s
+ 	int retval, i, timed_out = 0;
+ 	unsigned long slack = 0;
+ 
++	stackleak_probe(table);
++
+ 	rcu_read_lock();
+ 	retval = max_select_fd(n, fds);
+ 	rcu_read_unlock();
+@@ -840,6 +843,10 @@ int do_sys_poll(struct pollfd __user *uf
   	struct poll_list *walk = head;
   	unsigned long todo = nfds;
  
++	stackleak_probe(table);
++	stackleak_probe(stack_pps);
++
 +	gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
  	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff -urNp linux-2.6.38.4/fs/seq_file.c linux-2.6.38.4/fs/seq_file.c
---- linux-2.6.38.4/fs/seq_file.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/seq_file.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/seq_file.c linux-2.6.38.6/fs/seq_file.c
+--- linux-2.6.38.6/fs/seq_file.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/seq_file.c	2011-04-28 19:34:15.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -39893,9 +40049,9 @@ diff -urNp linux-2.6.38.4/fs/seq_file.c linux-2.6.38.4/fs/seq_file.c
  		if (!m->buf)
  			goto Enomem;
  		m->count = 0;
-diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
---- linux-2.6.38.4/fs/splice.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/splice.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/splice.c linux-2.6.38.6/fs/splice.c
+--- linux-2.6.38.6/fs/splice.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/splice.c	2011-05-11 18:34:57.000000000 -0400
 @@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -39917,7 +40073,16 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  	}
  
  	pipe_unlock(pipe);
-@@ -556,7 +556,7 @@ static ssize_t kernel_readv(struct file 
+@@ -316,6 +316,8 @@ __generic_file_splice_read(struct file *
+ 		.spd_release = spd_release_page,
+ 	};
+ 
++	stackleak_probe(partial);
++
+ 	if (splice_grow_spd(pipe, &spd))
+ 		return -ENOMEM;
+ 
+@@ -556,7 +558,7 @@ static ssize_t kernel_readv(struct file 
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -39926,7 +40091,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  	set_fs(old_fs);
  
  	return res;
-@@ -571,7 +571,7 @@ static ssize_t kernel_write(struct file 
+@@ -571,7 +573,7 @@ static ssize_t kernel_write(struct file 
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -39935,7 +40100,16 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  	set_fs(old_fs);
  
  	return res;
-@@ -622,7 +622,7 @@ ssize_t default_file_splice_read(struct 
+@@ -599,6 +601,8 @@ ssize_t default_file_splice_read(struct 
+ 		.spd_release = spd_release_page,
+ 	};
+ 
++	stackleak_probe(partial);
++
+ 	if (splice_grow_spd(pipe, &spd))
+ 		return -ENOMEM;
+ 
+@@ -622,7 +626,7 @@ ssize_t default_file_splice_read(struct 
  			goto err;
  
  		this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
@@ -39944,7 +40118,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  		vec[i].iov_len = this_len;
  		spd.pages[i] = page;
  		spd.nr_pages++;
-@@ -842,10 +842,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -842,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
  int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
  {
  	while (!pipe->nrbufs) {
@@ -39957,7 +40131,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  			return 0;
  
  		if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1178,7 +1178,7 @@ ssize_t splice_direct_to_actor(struct fi
+@@ -1178,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct fi
  		 * out of the pipe right after the splice_to_pipe(). So set
  		 * PIPE_READERS appropriately.
  		 */
@@ -39966,7 +40140,16 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  
  		current->splice_pipe = pipe;
  	}
-@@ -1730,9 +1730,9 @@ static int ipipe_prep(struct pipe_inode_
+@@ -1615,6 +1619,8 @@ static long vmsplice_to_pipe(struct file
+ 	};
+ 	long ret;
+ 
++	stackleak_probe(partial);
++
+ 	pipe = get_pipe_info(file);
+ 	if (!pipe)
+ 		return -EBADF;
+@@ -1730,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -39978,7 +40161,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  			if (flags & SPLICE_F_NONBLOCK) {
  				ret = -EAGAIN;
  				break;
-@@ -1764,7 +1764,7 @@ static int opipe_prep(struct pipe_inode_
+@@ -1764,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_
  	pipe_lock(pipe);
  
  	while (pipe->nrbufs >= pipe->buffers) {
@@ -39987,7 +40170,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  			send_sig(SIGPIPE, current, 0);
  			ret = -EPIPE;
  			break;
-@@ -1777,9 +1777,9 @@ static int opipe_prep(struct pipe_inode_
+@@ -1777,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -39999,7 +40182,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  	}
  
  	pipe_unlock(pipe);
-@@ -1815,14 +1815,14 @@ retry:
+@@ -1815,14 +1821,14 @@ retry:
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -40016,7 +40199,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  			break;
  
  		/*
-@@ -1922,7 +1922,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1922,7 +1928,7 @@ static int link_pipe(struct pipe_inode_i
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -40025,7 +40208,7 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -1967,7 +1967,7 @@ static int link_pipe(struct pipe_inode_i
+@@ -1967,7 +1973,7 @@ static int link_pipe(struct pipe_inode_i
  	 * return EAGAIN if we have the potential of some data in the
  	 * future, otherwise just return 0
  	 */
@@ -40034,9 +40217,9 @@ diff -urNp linux-2.6.38.4/fs/splice.c linux-2.6.38.4/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-2.6.38.4/fs/sysfs/file.c linux-2.6.38.4/fs/sysfs/file.c
---- linux-2.6.38.4/fs/sysfs/file.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/sysfs/file.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/sysfs/file.c linux-2.6.38.6/fs/sysfs/file.c
+--- linux-2.6.38.6/fs/sysfs/file.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/sysfs/file.c	2011-04-28 19:57:25.000000000 -0400
 @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -40082,9 +40265,9 @@ diff -urNp linux-2.6.38.4/fs/sysfs/file.c linux-2.6.38.4/fs/sysfs/file.c
  		wake_up_interruptible(&od->poll);
  	}
  
-diff -urNp linux-2.6.38.4/fs/sysfs/mount.c linux-2.6.38.4/fs/sysfs/mount.c
---- linux-2.6.38.4/fs/sysfs/mount.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/sysfs/mount.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/sysfs/mount.c linux-2.6.38.6/fs/sysfs/mount.c
+--- linux-2.6.38.6/fs/sysfs/mount.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/sysfs/mount.c	2011-04-28 19:34:15.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -40097,9 +40280,9 @@ diff -urNp linux-2.6.38.4/fs/sysfs/mount.c linux-2.6.38.4/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-2.6.38.4/fs/sysfs/symlink.c linux-2.6.38.4/fs/sysfs/symlink.c
---- linux-2.6.38.4/fs/sysfs/symlink.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/sysfs/symlink.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/sysfs/symlink.c linux-2.6.38.6/fs/sysfs/symlink.c
+--- linux-2.6.38.6/fs/sysfs/symlink.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/sysfs/symlink.c	2011-04-28 19:34:15.000000000 -0400
 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -40109,9 +40292,9 @@ diff -urNp linux-2.6.38.4/fs/sysfs/symlink.c linux-2.6.38.4/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.38.4/fs/udf/misc.c linux-2.6.38.4/fs/udf/misc.c
---- linux-2.6.38.4/fs/udf/misc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/udf/misc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/udf/misc.c linux-2.6.38.6/fs/udf/misc.c
+--- linux-2.6.38.6/fs/udf/misc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/udf/misc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -40121,9 +40304,9 @@ diff -urNp linux-2.6.38.4/fs/udf/misc.c linux-2.6.38.4/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.38.4/fs/utimes.c linux-2.6.38.4/fs/utimes.c
---- linux-2.6.38.4/fs/utimes.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/utimes.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/utimes.c linux-2.6.38.6/fs/utimes.c
+--- linux-2.6.38.6/fs/utimes.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/utimes.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -40145,9 +40328,9 @@ diff -urNp linux-2.6.38.4/fs/utimes.c linux-2.6.38.4/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.38.4/fs/xattr_acl.c linux-2.6.38.4/fs/xattr_acl.c
---- linux-2.6.38.4/fs/xattr_acl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xattr_acl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xattr_acl.c linux-2.6.38.6/fs/xattr_acl.c
+--- linux-2.6.38.6/fs/xattr_acl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xattr_acl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -40159,9 +40342,9 @@ diff -urNp linux-2.6.38.4/fs/xattr_acl.c linux-2.6.38.4/fs/xattr_acl.c
  	int count;
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.38.4/fs/xattr.c linux-2.6.38.4/fs/xattr.c
---- linux-2.6.38.4/fs/xattr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xattr.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xattr.c linux-2.6.38.6/fs/xattr.c
+--- linux-2.6.38.6/fs/xattr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xattr.c	2011-04-28 19:34:15.000000000 -0400
 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -40224,9 +40407,9 @@ diff -urNp linux-2.6.38.4/fs/xattr.c linux-2.6.38.4/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-28 19:34:15.000000000 -0400
 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
  	xfs_fsop_geom_t		  fsgeo;
  	int			  error;
@@ -40235,9 +40418,9 @@ diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.38.4/fs/xfs/l
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
  	if (error)
  		return -error;
-diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -128,7 +128,7 @@ xfs_find_handle(
  	}
  
@@ -40247,9 +40430,9 @@ diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.38.4/fs/xfs/lin
  	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
  		goto out_put;
  
-diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.6/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.38.6/fs/xfs/linux-2.6/xfs_iops.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xfs/linux-2.6/xfs_iops.c	2011-04-28 19:34:15.000000000 -0400
 @@ -436,7 +436,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
@@ -40259,9 +40442,9 @@ diff -urNp linux-2.6.38.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.38.4/fs/xfs/linu
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-2.6.38.4/fs/xfs/xfs_bmap.c linux-2.6.38.4/fs/xfs/xfs_bmap.c
---- linux-2.6.38.4/fs/xfs/xfs_bmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/xfs_bmap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xfs/xfs_bmap.c linux-2.6.38.6/fs/xfs/xfs_bmap.c
+--- linux-2.6.38.6/fs/xfs/xfs_bmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xfs/xfs_bmap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
@@ -40271,9 +40454,9 @@ diff -urNp linux-2.6.38.4/fs/xfs/xfs_bmap.c linux-2.6.38.4/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c
---- linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/fs/xfs/xfs_dir2_sf.c linux-2.6.38.6/fs/xfs/xfs_dir2_sf.c
+--- linux-2.6.38.6/fs/xfs/xfs_dir2_sf.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/fs/xfs/xfs_dir2_sf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -40291,9 +40474,9 @@ diff -urNp linux-2.6.38.4/fs/xfs/xfs_dir2_sf.c linux-2.6.38.4/fs/xfs/xfs_dir2_sf
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-2.6.38.4/grsecurity/gracl_alloc.c linux-2.6.38.4/grsecurity/gracl_alloc.c
---- linux-2.6.38.4/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_alloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_alloc.c linux-2.6.38.6/grsecurity/gracl_alloc.c
+--- linux-2.6.38.6/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_alloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -40400,9 +40583,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_alloc.c linux-2.6.38.4/grsecurity/gra
 +	else
 +		return 1;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/gracl.c linux-2.6.38.4/grsecurity/gracl.c
---- linux-2.6.38.4/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl.c linux-2.6.38.6/grsecurity/gracl.c
+--- linux-2.6.38.6/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,4074 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -44478,9 +44661,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl.c linux-2.6.38.4/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.38.4/grsecurity/gracl_cap.c linux-2.6.38.4/grsecurity/gracl_cap.c
---- linux-2.6.38.4/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_cap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_cap.c linux-2.6.38.6/grsecurity/gracl_cap.c
+--- linux-2.6.38.6/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_cap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,139 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -44621,9 +44804,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_cap.c linux-2.6.38.4/grsecurity/gracl
 +	return 0;
 +}
 +
-diff -urNp linux-2.6.38.4/grsecurity/gracl_fs.c linux-2.6.38.4/grsecurity/gracl_fs.c
---- linux-2.6.38.4/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_fs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_fs.c linux-2.6.38.6/grsecurity/gracl_fs.c
+--- linux-2.6.38.6/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_fs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -45056,9 +45239,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_fs.c linux-2.6.38.4/grsecurity/gracl_
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_ip.c linux-2.6.38.4/grsecurity/gracl_ip.c
---- linux-2.6.38.4/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_ip.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_ip.c linux-2.6.38.6/grsecurity/gracl_ip.c
+--- linux-2.6.38.6/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_ip.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,382 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -45442,9 +45625,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_ip.c linux-2.6.38.4/grsecurity/gracl_
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_learn.c linux-2.6.38.4/grsecurity/gracl_learn.c
---- linux-2.6.38.4/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_learn.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_learn.c linux-2.6.38.6/grsecurity/gracl_learn.c
+--- linux-2.6.38.6/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_learn.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,211 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -45657,9 +45840,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_learn.c linux-2.6.38.4/grsecurity/gra
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-2.6.38.4/grsecurity/gracl_res.c linux-2.6.38.4/grsecurity/gracl_res.c
---- linux-2.6.38.4/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_res.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_res.c linux-2.6.38.6/grsecurity/gracl_res.c
+--- linux-2.6.38.6/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_res.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -45729,9 +45912,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_res.c linux-2.6.38.4/grsecurity/gracl
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_segv.c linux-2.6.38.4/grsecurity/gracl_segv.c
---- linux-2.6.38.4/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_segv.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_segv.c linux-2.6.38.6/grsecurity/gracl_segv.c
+--- linux-2.6.38.6/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_segv.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,300 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46033,9 +46216,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_segv.c linux-2.6.38.4/grsecurity/grac
 +
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/gracl_shm.c linux-2.6.38.4/grsecurity/gracl_shm.c
---- linux-2.6.38.4/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/gracl_shm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/gracl_shm.c linux-2.6.38.6/grsecurity/gracl_shm.c
+--- linux-2.6.38.6/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/gracl_shm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46077,9 +46260,9 @@ diff -urNp linux-2.6.38.4/grsecurity/gracl_shm.c linux-2.6.38.4/grsecurity/gracl
 +
 +	return 1;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_chdir.c linux-2.6.38.4/grsecurity/grsec_chdir.c
---- linux-2.6.38.4/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_chdir.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_chdir.c linux-2.6.38.6/grsecurity/grsec_chdir.c
+--- linux-2.6.38.6/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_chdir.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -46100,9 +46283,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_chdir.c linux-2.6.38.4/grsecurity/grs
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_chroot.c linux-2.6.38.4/grsecurity/grsec_chroot.c
---- linux-2.6.38.4/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_chroot.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_chroot.c linux-2.6.38.6/grsecurity/grsec_chroot.c
+--- linux-2.6.38.6/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_chroot.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,355 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -46459,9 +46642,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_chroot.c linux-2.6.38.4/grsecurity/gr
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_disabled.c linux-2.6.38.4/grsecurity/grsec_disabled.c
---- linux-2.6.38.4/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_disabled.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_disabled.c linux-2.6.38.6/grsecurity/grsec_disabled.c
+--- linux-2.6.38.6/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_disabled.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -46910,9 +47093,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_disabled.c linux-2.6.38.4/grsecurity/
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_exec.c linux-2.6.38.4/grsecurity/grsec_exec.c
---- linux-2.6.38.4/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_exec.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_exec.c linux-2.6.38.6/grsecurity/grsec_exec.c
+--- linux-2.6.38.6/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_exec.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,147 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47061,9 +47244,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_exec.c linux-2.6.38.4/grsecurity/grse
 +	return;
 +}
 +#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_fifo.c linux-2.6.38.4/grsecurity/grsec_fifo.c
---- linux-2.6.38.4/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_fifo.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_fifo.c linux-2.6.38.6/grsecurity/grsec_fifo.c
+--- linux-2.6.38.6/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_fifo.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47089,9 +47272,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_fifo.c linux-2.6.38.4/grsecurity/grse
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_fork.c linux-2.6.38.4/grsecurity/grsec_fork.c
---- linux-2.6.38.4/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_fork.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_fork.c linux-2.6.38.6/grsecurity/grsec_fork.c
+--- linux-2.6.38.6/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_fork.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47116,9 +47299,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_fork.c linux-2.6.38.4/grsecurity/grse
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_init.c linux-2.6.38.4/grsecurity/grsec_init.c
---- linux-2.6.38.4/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_init.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_init.c linux-2.6.38.6/grsecurity/grsec_init.c
+--- linux-2.6.38.6/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_init.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,270 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47390,9 +47573,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_init.c linux-2.6.38.4/grsecurity/grse
 +
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_link.c linux-2.6.38.4/grsecurity/grsec_link.c
---- linux-2.6.38.4/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_link.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_link.c linux-2.6.38.6/grsecurity/grsec_link.c
+--- linux-2.6.38.6/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_link.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47437,9 +47620,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_link.c linux-2.6.38.4/grsecurity/grse
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_log.c linux-2.6.38.4/grsecurity/grsec_log.c
---- linux-2.6.38.4/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_log.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_log.c linux-2.6.38.6/grsecurity/grsec_log.c
+--- linux-2.6.38.6/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_log.c	2011-05-10 21:15:15.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47572,14 +47755,14 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_log.c linux-2.6.38.4/grsecurity/grsec
 +{
 +	int logtype;
 +	char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
-+	char *str1, *str2, *str3;
-+	void *voidptr;
-+	int num1, num2;
-+	unsigned long ulong1, ulong2;
-+	struct dentry *dentry;
-+	struct vfsmount *mnt;
-+	struct file *file;
-+	struct task_struct *task;
++	char *str1 = NULL, *str2 = NULL, *str3 = NULL;
++	void *voidptr = NULL;
++	int num1 = 0, num2 = 0;
++	unsigned long ulong1 = 0, ulong2 = 0;
++	struct dentry *dentry = NULL;
++	struct vfsmount *mnt = NULL;
++	struct file *file = NULL;
++	struct task_struct *task = NULL;
 +	const struct cred *cred, *pcred;
 +	va_list ap;
 +
@@ -47751,9 +47934,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_log.c linux-2.6.38.4/grsecurity/grsec
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_mem.c linux-2.6.38.4/grsecurity/grsec_mem.c
---- linux-2.6.38.4/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_mem.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_mem.c linux-2.6.38.6/grsecurity/grsec_mem.c
+--- linux-2.6.38.6/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_mem.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47788,9 +47971,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_mem.c linux-2.6.38.4/grsecurity/grsec
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_mount.c linux-2.6.38.4/grsecurity/grsec_mount.c
---- linux-2.6.38.4/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_mount.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_mount.c linux-2.6.38.6/grsecurity/grsec_mount.c
+--- linux-2.6.38.6/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_mount.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47854,9 +48037,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_mount.c linux-2.6.38.4/grsecurity/grs
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_pax.c linux-2.6.38.4/grsecurity/grsec_pax.c
---- linux-2.6.38.4/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_pax.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_pax.c linux-2.6.38.6/grsecurity/grsec_pax.c
+--- linux-2.6.38.6/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_pax.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47894,9 +48077,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_pax.c linux-2.6.38.4/grsecurity/grsec
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_ptrace.c linux-2.6.38.4/grsecurity/grsec_ptrace.c
---- linux-2.6.38.4/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_ptrace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_ptrace.c linux-2.6.38.6/grsecurity/grsec_ptrace.c
+--- linux-2.6.38.6/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_ptrace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47912,9 +48095,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_ptrace.c linux-2.6.38.4/grsecurity/gr
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_sig.c linux-2.6.38.4/grsecurity/grsec_sig.c
---- linux-2.6.38.4/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_sig.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_sig.c linux-2.6.38.6/grsecurity/grsec_sig.c
+--- linux-2.6.38.6/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_sig.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,197 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48113,9 +48296,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_sig.c linux-2.6.38.4/grsecurity/grsec
 +	return 0;
 +
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_sock.c linux-2.6.38.4/grsecurity/grsec_sock.c
---- linux-2.6.38.4/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_sock.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_sock.c linux-2.6.38.6/grsecurity/grsec_sock.c
+--- linux-2.6.38.6/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_sock.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,275 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -48392,9 +48575,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_sock.c linux-2.6.38.4/grsecurity/grse
 +	return current_cap();
 +#endif
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsec_sysctl.c linux-2.6.38.4/grsecurity/grsec_sysctl.c
---- linux-2.6.38.4/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_sysctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_sysctl.c linux-2.6.38.6/grsecurity/grsec_sysctl.c
+--- linux-2.6.38.6/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_sysctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48829,9 +49012,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_sysctl.c linux-2.6.38.4/grsecurity/gr
 +	{ }
 +};
 +#endif
-diff -urNp linux-2.6.38.4/grsecurity/grsec_time.c linux-2.6.38.4/grsecurity/grsec_time.c
---- linux-2.6.38.4/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_time.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_time.c linux-2.6.38.6/grsecurity/grsec_time.c
+--- linux-2.6.38.6/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_time.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48849,9 +49032,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_time.c linux-2.6.38.4/grsecurity/grse
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.38.4/grsecurity/grsec_tpe.c linux-2.6.38.4/grsecurity/grsec_tpe.c
---- linux-2.6.38.4/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsec_tpe.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsec_tpe.c linux-2.6.38.6/grsecurity/grsec_tpe.c
+--- linux-2.6.38.6/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsec_tpe.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48892,9 +49075,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsec_tpe.c linux-2.6.38.4/grsecurity/grsec
 +#endif
 +	return 1;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/grsum.c linux-2.6.38.4/grsecurity/grsum.c
---- linux-2.6.38.4/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/grsum.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/grsum.c linux-2.6.38.6/grsecurity/grsum.c
+--- linux-2.6.38.6/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/grsum.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -48957,9 +49140,9 @@ diff -urNp linux-2.6.38.4/grsecurity/grsum.c linux-2.6.38.4/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-2.6.38.4/grsecurity/Kconfig linux-2.6.38.4/grsecurity/Kconfig
---- linux-2.6.38.4/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/Kconfig linux-2.6.38.6/grsecurity/Kconfig
+--- linux-2.6.38.6/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/Kconfig	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,1045 @@
 +#
 +# grecurity configuration
@@ -50006,9 +50189,9 @@ diff -urNp linux-2.6.38.4/grsecurity/Kconfig linux-2.6.38.4/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-2.6.38.4/grsecurity/Makefile linux-2.6.38.4/grsecurity/Makefile
---- linux-2.6.38.4/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/grsecurity/Makefile	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/grsecurity/Makefile linux-2.6.38.6/grsecurity/Makefile
+--- linux-2.6.38.6/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/grsecurity/Makefile	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,29 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -50039,9 +50222,9 @@ diff -urNp linux-2.6.38.4/grsecurity/Makefile linux-2.6.38.4/grsecurity/Makefile
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-2.6.38.4/include/acpi/acpi_drivers.h linux-2.6.38.4/include/acpi/acpi_drivers.h
---- linux-2.6.38.4/include/acpi/acpi_drivers.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/acpi/acpi_drivers.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/acpi/acpi_drivers.h linux-2.6.38.6/include/acpi/acpi_drivers.h
+--- linux-2.6.38.6/include/acpi/acpi_drivers.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/acpi/acpi_drivers.h	2011-04-28 19:34:15.000000000 -0400
 @@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
                                    Dock Station
    -------------------------------------------------------------------------- */
@@ -50071,9 +50254,9 @@ diff -urNp linux-2.6.38.4/include/acpi/acpi_drivers.h linux-2.6.38.4/include/acp
  					       void *context)
  {
  	return -ENODEV;
-diff -urNp linux-2.6.38.4/include/asm-generic/atomic-long.h linux-2.6.38.4/include/asm-generic/atomic-long.h
---- linux-2.6.38.4/include/asm-generic/atomic-long.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/atomic-long.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/atomic-long.h linux-2.6.38.6/include/asm-generic/atomic-long.h
+--- linux-2.6.38.6/include/asm-generic/atomic-long.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/atomic-long.h	2011-04-28 19:57:25.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -50374,9 +50557,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/atomic-long.h linux-2.6.38.4/inclu
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.38.4/include/asm-generic/cache.h linux-2.6.38.4/include/asm-generic/cache.h
---- linux-2.6.38.4/include/asm-generic/cache.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/cache.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/cache.h linux-2.6.38.6/include/asm-generic/cache.h
+--- linux-2.6.38.6/include/asm-generic/cache.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/cache.h	2011-04-28 19:57:25.000000000 -0400
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -50387,9 +50570,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/cache.h linux-2.6.38.4/include/asm
 +#define L1_CACHE_BYTES		(1U << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-2.6.38.4/include/asm-generic/dma-mapping-common.h linux-2.6.38.4/include/asm-generic/dma-mapping-common.h
---- linux-2.6.38.4/include/asm-generic/dma-mapping-common.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/dma-mapping-common.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/dma-mapping-common.h linux-2.6.38.6/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.38.6/include/asm-generic/dma-mapping-common.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/dma-mapping-common.h	2011-04-28 19:34:15.000000000 -0400
 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
  					      enum dma_data_direction dir,
  					      struct dma_attrs *attrs)
@@ -50480,9 +50663,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/dma-mapping-common.h linux-2.6.38.
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.38.4/include/asm-generic/futex.h linux-2.6.38.4/include/asm-generic/futex.h
---- linux-2.6.38.4/include/asm-generic/futex.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/futex.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/futex.h linux-2.6.38.6/include/asm-generic/futex.h
+--- linux-2.6.38.6/include/asm-generic/futex.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/futex.h	2011-04-28 19:34:15.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <asm/errno.h>
  
@@ -50501,9 +50684,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/futex.h linux-2.6.38.4/include/asm
  {
  	return -ENOSYS;
  }
-diff -urNp linux-2.6.38.4/include/asm-generic/int-l64.h linux-2.6.38.4/include/asm-generic/int-l64.h
---- linux-2.6.38.4/include/asm-generic/int-l64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/int-l64.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/int-l64.h linux-2.6.38.6/include/asm-generic/int-l64.h
+--- linux-2.6.38.6/include/asm-generic/int-l64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/int-l64.h	2011-04-28 19:34:15.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -50513,9 +50696,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/int-l64.h linux-2.6.38.4/include/a
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.38.4/include/asm-generic/int-ll64.h linux-2.6.38.4/include/asm-generic/int-ll64.h
---- linux-2.6.38.4/include/asm-generic/int-ll64.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/int-ll64.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/int-ll64.h linux-2.6.38.6/include/asm-generic/int-ll64.h
+--- linux-2.6.38.6/include/asm-generic/int-ll64.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/int-ll64.h	2011-04-28 19:34:15.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -50525,9 +50708,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/int-ll64.h linux-2.6.38.4/include/
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.38.4/include/asm-generic/kmap_types.h linux-2.6.38.4/include/asm-generic/kmap_types.h
---- linux-2.6.38.4/include/asm-generic/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/kmap_types.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/kmap_types.h linux-2.6.38.6/include/asm-generic/kmap_types.h
+--- linux-2.6.38.6/include/asm-generic/kmap_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/kmap_types.h	2011-04-28 19:34:15.000000000 -0400
 @@ -29,10 +29,11 @@ KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
  KMAP_D(18)	KM_NMI_PTE,
@@ -50541,9 +50724,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/kmap_types.h linux-2.6.38.4/includ
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.38.4/include/asm-generic/pgtable.h linux-2.6.38.4/include/asm-generic/pgtable.h
---- linux-2.6.38.4/include/asm-generic/pgtable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/pgtable.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/pgtable.h linux-2.6.38.6/include/asm-generic/pgtable.h
+--- linux-2.6.38.6/include/asm-generic/pgtable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/pgtable.h	2011-04-28 19:34:15.000000000 -0400
 @@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd)
  #endif /* __HAVE_ARCH_PMD_WRITE */
  #endif
@@ -50559,9 +50742,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/pgtable.h linux-2.6.38.4/include/a
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/pgtable-nopmd.h linux-2.6.38.6/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.38.6/include/asm-generic/pgtable-nopmd.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/pgtable-nopmd.h	2011-04-28 19:34:15.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -50598,9 +50781,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopmd.h linux-2.6.38.4/inc
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopud.h linux-2.6.38.4/include/asm-generic/pgtable-nopud.h
---- linux-2.6.38.4/include/asm-generic/pgtable-nopud.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/pgtable-nopud.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/pgtable-nopud.h linux-2.6.38.6/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.38.6/include/asm-generic/pgtable-nopud.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/pgtable-nopud.h	2011-04-28 19:34:15.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -50631,9 +50814,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/pgtable-nopud.h linux-2.6.38.4/inc
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.38.4/include/asm-generic/vmlinux.lds.h linux-2.6.38.4/include/asm-generic/vmlinux.lds.h
---- linux-2.6.38.4/include/asm-generic/vmlinux.lds.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/asm-generic/vmlinux.lds.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/asm-generic/vmlinux.lds.h linux-2.6.38.6/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.38.6/include/asm-generic/vmlinux.lds.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/asm-generic/vmlinux.lds.h	2011-04-28 19:34:15.000000000 -0400
 @@ -213,6 +213,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
@@ -50670,9 +50853,9 @@ diff -urNp linux-2.6.38.4/include/asm-generic/vmlinux.lds.h linux-2.6.38.4/inclu
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.38.4/include/drm/drmP.h linux-2.6.38.4/include/drm/drmP.h
---- linux-2.6.38.4/include/drm/drmP.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/drm/drmP.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/drm/drmP.h linux-2.6.38.6/include/drm/drmP.h
+--- linux-2.6.38.6/include/drm/drmP.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/drm/drmP.h	2011-04-28 19:34:15.000000000 -0400
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -50726,9 +50909,9 @@ diff -urNp linux-2.6.38.4/include/drm/drmP.h linux-2.6.38.4/include/drm/drmP.h
  	void *dev_private;		/**< device private data */
  	void *mm_private;
  	struct address_space *dev_mapping;
-diff -urNp linux-2.6.38.4/include/linux/a.out.h linux-2.6.38.4/include/linux/a.out.h
---- linux-2.6.38.4/include/linux/a.out.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/a.out.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/a.out.h linux-2.6.38.6/include/linux/a.out.h
+--- linux-2.6.38.6/include/linux/a.out.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/a.out.h	2011-04-28 19:34:15.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -50744,9 +50927,9 @@ diff -urNp linux-2.6.38.4/include/linux/a.out.h linux-2.6.38.4/include/linux/a.o
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.38.4/include/linux/atmdev.h linux-2.6.38.4/include/linux/atmdev.h
---- linux-2.6.38.4/include/linux/atmdev.h	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/include/linux/atmdev.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/atmdev.h linux-2.6.38.6/include/linux/atmdev.h
+--- linux-2.6.38.6/include/linux/atmdev.h	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/include/linux/atmdev.h	2011-04-28 19:34:15.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -50756,9 +50939,9 @@ diff -urNp linux-2.6.38.4/include/linux/atmdev.h linux-2.6.38.4/include/linux/at
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.38.4/include/linux/binfmts.h linux-2.6.38.4/include/linux/binfmts.h
---- linux-2.6.38.4/include/linux/binfmts.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/binfmts.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/binfmts.h linux-2.6.38.6/include/linux/binfmts.h
+--- linux-2.6.38.6/include/linux/binfmts.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/binfmts.h	2011-04-28 19:34:15.000000000 -0400
 @@ -92,6 +92,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
@@ -50767,9 +50950,9 @@ diff -urNp linux-2.6.38.4/include/linux/binfmts.h linux-2.6.38.4/include/linux/b
  	unsigned long min_coredump;	/* minimal dump size */
  };
  
-diff -urNp linux-2.6.38.4/include/linux/blkdev.h linux-2.6.38.4/include/linux/blkdev.h
---- linux-2.6.38.4/include/linux/blkdev.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/blkdev.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/blkdev.h linux-2.6.38.6/include/linux/blkdev.h
+--- linux-2.6.38.6/include/linux/blkdev.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/blkdev.h	2011-04-28 19:34:15.000000000 -0400
 @@ -1247,22 +1247,22 @@ queue_max_integrity_segments(struct requ
  #endif /* CONFIG_BLK_DEV_INTEGRITY */
  
@@ -50805,9 +50988,9 @@ diff -urNp linux-2.6.38.4/include/linux/blkdev.h linux-2.6.38.4/include/linux/bl
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.38.4/include/linux/blktrace_api.h linux-2.6.38.4/include/linux/blktrace_api.h
---- linux-2.6.38.4/include/linux/blktrace_api.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/blktrace_api.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/blktrace_api.h linux-2.6.38.6/include/linux/blktrace_api.h
+--- linux-2.6.38.6/include/linux/blktrace_api.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/blktrace_api.h	2011-04-28 19:57:25.000000000 -0400
 @@ -161,7 +161,7 @@ struct blk_trace {
  	struct dentry *dir;
  	struct dentry *dropped_file;
@@ -50817,9 +51000,9 @@ diff -urNp linux-2.6.38.4/include/linux/blktrace_api.h linux-2.6.38.4/include/li
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-2.6.38.4/include/linux/byteorder/little_endian.h linux-2.6.38.4/include/linux/byteorder/little_endian.h
---- linux-2.6.38.4/include/linux/byteorder/little_endian.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/byteorder/little_endian.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/byteorder/little_endian.h linux-2.6.38.6/include/linux/byteorder/little_endian.h
+--- linux-2.6.38.6/include/linux/byteorder/little_endian.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/byteorder/little_endian.h	2011-04-28 19:34:15.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -50884,9 +51067,9 @@ diff -urNp linux-2.6.38.4/include/linux/byteorder/little_endian.h linux-2.6.38.4
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-2.6.38.4/include/linux/cache.h linux-2.6.38.4/include/linux/cache.h
---- linux-2.6.38.4/include/linux/cache.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/cache.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/cache.h linux-2.6.38.6/include/linux/cache.h
+--- linux-2.6.38.6/include/linux/cache.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/cache.h	2011-04-28 19:34:15.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -50898,9 +51081,9 @@ diff -urNp linux-2.6.38.4/include/linux/cache.h linux-2.6.38.4/include/linux/cac
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.38.4/include/linux/capability.h linux-2.6.38.4/include/linux/capability.h
---- linux-2.6.38.4/include/linux/capability.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/capability.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/capability.h linux-2.6.38.6/include/linux/capability.h
+--- linux-2.6.38.6/include/linux/capability.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/capability.h	2011-04-28 19:34:15.000000000 -0400
 @@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
  	(security_real_capable_noaudit((t), (cap)) == 0)
  
@@ -50909,9 +51092,9 @@ diff -urNp linux-2.6.38.4/include/linux/capability.h linux-2.6.38.4/include/linu
  
  /* audit system wants to get cap info from files as well */
  struct dentry;
-diff -urNp linux-2.6.38.4/include/linux/compiler-gcc4.h linux-2.6.38.4/include/linux/compiler-gcc4.h
---- linux-2.6.38.4/include/linux/compiler-gcc4.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/compiler-gcc4.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/compiler-gcc4.h linux-2.6.38.6/include/linux/compiler-gcc4.h
+--- linux-2.6.38.6/include/linux/compiler-gcc4.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/compiler-gcc4.h	2011-04-28 19:34:15.000000000 -0400
 @@ -54,6 +54,10 @@
  
  #endif
@@ -50923,9 +51106,9 @@ diff -urNp linux-2.6.38.4/include/linux/compiler-gcc4.h linux-2.6.38.4/include/l
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.38.4/include/linux/compiler.h linux-2.6.38.4/include/linux/compiler.h
---- linux-2.6.38.4/include/linux/compiler.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/compiler.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/compiler.h linux-2.6.38.6/include/linux/compiler.h
+--- linux-2.6.38.6/include/linux/compiler.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/compiler.h	2011-04-28 19:34:15.000000000 -0400
 @@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
@@ -50958,9 +51141,9 @@ diff -urNp linux-2.6.38.4/include/linux/compiler.h linux-2.6.38.4/include/linux/
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.38.4/include/linux/cpuset.h linux-2.6.38.4/include/linux/cpuset.h
---- linux-2.6.38.4/include/linux/cpuset.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/cpuset.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/cpuset.h linux-2.6.38.6/include/linux/cpuset.h
+--- linux-2.6.38.6/include/linux/cpuset.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/cpuset.h	2011-04-28 19:34:15.000000000 -0400
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
  	 * nodemask.
  	 */
@@ -50970,9 +51153,9 @@ diff -urNp linux-2.6.38.4/include/linux/cpuset.h linux-2.6.38.4/include/linux/cp
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-2.6.38.4/include/linux/decompress/mm.h linux-2.6.38.4/include/linux/decompress/mm.h
---- linux-2.6.38.4/include/linux/decompress/mm.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/decompress/mm.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/decompress/mm.h linux-2.6.38.6/include/linux/decompress/mm.h
+--- linux-2.6.38.6/include/linux/decompress/mm.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/decompress/mm.h	2011-04-28 19:34:15.000000000 -0400
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -50982,9 +51165,9 @@ diff -urNp linux-2.6.38.4/include/linux/decompress/mm.h linux-2.6.38.4/include/l
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.38.4/include/linux/dma-mapping.h linux-2.6.38.4/include/linux/dma-mapping.h
---- linux-2.6.38.4/include/linux/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/dma-mapping.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/dma-mapping.h linux-2.6.38.6/include/linux/dma-mapping.h
+--- linux-2.6.38.6/include/linux/dma-mapping.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/dma-mapping.h	2011-04-28 19:34:15.000000000 -0400
 @@ -16,40 +16,40 @@ enum dma_data_direction {
  };
  
@@ -51040,9 +51223,9 @@ diff -urNp linux-2.6.38.4/include/linux/dma-mapping.h linux-2.6.38.4/include/lin
  };
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.38.4/include/linux/elf.h linux-2.6.38.4/include/linux/elf.h
---- linux-2.6.38.4/include/linux/elf.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/elf.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/elf.h linux-2.6.38.6/include/linux/elf.h
+--- linux-2.6.38.6/include/linux/elf.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/elf.h	2011-04-28 19:34:15.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -51115,9 +51298,9 @@ diff -urNp linux-2.6.38.4/include/linux/elf.h linux-2.6.38.4/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-2.6.38.4/include/linux/fscache-cache.h linux-2.6.38.4/include/linux/fscache-cache.h
---- linux-2.6.38.4/include/linux/fscache-cache.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/fscache-cache.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/fscache-cache.h linux-2.6.38.6/include/linux/fscache-cache.h
+--- linux-2.6.38.6/include/linux/fscache-cache.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/fscache-cache.h	2011-04-28 19:57:25.000000000 -0400
 @@ -113,7 +113,7 @@ struct fscache_operation {
  #endif
  };
@@ -51136,9 +51319,9 @@ diff -urNp linux-2.6.38.4/include/linux/fscache-cache.h linux-2.6.38.4/include/l
  	op->processor = processor;
  	op->release = release;
  	INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-2.6.38.4/include/linux/fs.h linux-2.6.38.4/include/linux/fs.h
---- linux-2.6.38.4/include/linux/fs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/fs.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/fs.h linux-2.6.38.6/include/linux/fs.h
+--- linux-2.6.38.6/include/linux/fs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/fs.h	2011-04-28 19:34:15.000000000 -0400
 @@ -105,6 +105,11 @@ struct inodes_stat_t {
  /* File was opened by fanotify and shouldn't generate fanotify events */
  #define FMODE_NONOTIFY		((__force fmode_t)0x1000000)
@@ -51287,9 +51470,9 @@ diff -urNp linux-2.6.38.4/include/linux/fs.h linux-2.6.38.4/include/linux/fs.h
  };
  
  /*
-diff -urNp linux-2.6.38.4/include/linux/fs_struct.h linux-2.6.38.4/include/linux/fs_struct.h
---- linux-2.6.38.4/include/linux/fs_struct.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/fs_struct.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/fs_struct.h linux-2.6.38.6/include/linux/fs_struct.h
+--- linux-2.6.38.6/include/linux/fs_struct.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/fs_struct.h	2011-04-28 19:34:15.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -51299,9 +51482,9 @@ diff -urNp linux-2.6.38.4/include/linux/fs_struct.h linux-2.6.38.4/include/linux
  	spinlock_t lock;
  	seqcount_t seq;
  	int umask;
-diff -urNp linux-2.6.38.4/include/linux/ftrace_event.h linux-2.6.38.4/include/linux/ftrace_event.h
---- linux-2.6.38.4/include/linux/ftrace_event.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/ftrace_event.h	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/ftrace_event.h linux-2.6.38.6/include/linux/ftrace_event.h
+--- linux-2.6.38.6/include/linux/ftrace_event.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/ftrace_event.h	2011-05-02 19:07:09.000000000 -0400
 @@ -236,7 +236,7 @@ extern int trace_define_field(struct ftr
  extern int trace_add_event_call(struct ftrace_event_call *call);
  extern void trace_remove_event_call(struct ftrace_event_call *call);
@@ -51311,9 +51494,9 @@ diff -urNp linux-2.6.38.4/include/linux/ftrace_event.h linux-2.6.38.4/include/li
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-2.6.38.4/include/linux/genhd.h linux-2.6.38.4/include/linux/genhd.h
---- linux-2.6.38.4/include/linux/genhd.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/genhd.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/genhd.h linux-2.6.38.6/include/linux/genhd.h
+--- linux-2.6.38.6/include/linux/genhd.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/genhd.h	2011-04-28 19:34:15.000000000 -0400
 @@ -183,7 +183,7 @@ struct gendisk {
  	struct kobject *slave_dir;
  
@@ -51323,9 +51506,9 @@ diff -urNp linux-2.6.38.4/include/linux/genhd.h linux-2.6.38.4/include/linux/gen
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-2.6.38.4/include/linux/gracl.h linux-2.6.38.4/include/linux/gracl.h
---- linux-2.6.38.4/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/gracl.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/gracl.h linux-2.6.38.6/include/linux/gracl.h
+--- linux-2.6.38.6/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/gracl.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -51644,9 +51827,9 @@ diff -urNp linux-2.6.38.4/include/linux/gracl.h linux-2.6.38.4/include/linux/gra
 +
 +#endif
 +
-diff -urNp linux-2.6.38.4/include/linux/gralloc.h linux-2.6.38.4/include/linux/gralloc.h
---- linux-2.6.38.4/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/gralloc.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/gralloc.h linux-2.6.38.6/include/linux/gralloc.h
+--- linux-2.6.38.6/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/gralloc.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -51657,9 +51840,9 @@ diff -urNp linux-2.6.38.4/include/linux/gralloc.h linux-2.6.38.4/include/linux/g
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.38.4/include/linux/grdefs.h linux-2.6.38.4/include/linux/grdefs.h
---- linux-2.6.38.4/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grdefs.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/grdefs.h linux-2.6.38.6/include/linux/grdefs.h
+--- linux-2.6.38.6/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/grdefs.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,139 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -51800,9 +51983,9 @@ diff -urNp linux-2.6.38.4/include/linux/grdefs.h linux-2.6.38.4/include/linux/gr
 +};
 +
 +#endif
-diff -urNp linux-2.6.38.4/include/linux/grinternal.h linux-2.6.38.4/include/linux/grinternal.h
---- linux-2.6.38.4/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grinternal.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/grinternal.h linux-2.6.38.6/include/linux/grinternal.h
+--- linux-2.6.38.6/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/grinternal.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -52023,9 +52206,9 @@ diff -urNp linux-2.6.38.4/include/linux/grinternal.h linux-2.6.38.4/include/linu
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.38.4/include/linux/grmsg.h linux-2.6.38.4/include/linux/grmsg.h
---- linux-2.6.38.4/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grmsg.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/grmsg.h linux-2.6.38.6/include/linux/grmsg.h
+--- linux-2.6.38.6/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/grmsg.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,108 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -52135,9 +52318,9 @@ diff -urNp linux-2.6.38.4/include/linux/grmsg.h linux-2.6.38.4/include/linux/grm
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-2.6.38.4/include/linux/grsecurity.h linux-2.6.38.4/include/linux/grsecurity.h
---- linux-2.6.38.4/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grsecurity.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/grsecurity.h linux-2.6.38.6/include/linux/grsecurity.h
+--- linux-2.6.38.6/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/grsecurity.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,212 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
@@ -52351,9 +52534,9 @@ diff -urNp linux-2.6.38.4/include/linux/grsecurity.h linux-2.6.38.4/include/linu
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.38.4/include/linux/grsock.h linux-2.6.38.4/include/linux/grsock.h
---- linux-2.6.38.4/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/grsock.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/grsock.h linux-2.6.38.6/include/linux/grsock.h
+--- linux-2.6.38.6/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/grsock.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -52374,9 +52557,9 @@ diff -urNp linux-2.6.38.4/include/linux/grsock.h linux-2.6.38.4/include/linux/gr
 +			    const int protocol);
 +
 +#endif
-diff -urNp linux-2.6.38.4/include/linux/highmem.h linux-2.6.38.4/include/linux/highmem.h
---- linux-2.6.38.4/include/linux/highmem.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/highmem.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/highmem.h linux-2.6.38.6/include/linux/highmem.h
+--- linux-2.6.38.6/include/linux/highmem.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/highmem.h	2011-04-28 19:34:15.000000000 -0400
 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
@@ -52396,9 +52579,9 @@ diff -urNp linux-2.6.38.4/include/linux/highmem.h linux-2.6.38.4/include/linux/h
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-2.6.38.4/include/linux/i2o.h linux-2.6.38.4/include/linux/i2o.h
---- linux-2.6.38.4/include/linux/i2o.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/i2o.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/i2o.h linux-2.6.38.6/include/linux/i2o.h
+--- linux-2.6.38.6/include/linux/i2o.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/i2o.h	2011-04-28 19:57:25.000000000 -0400
 @@ -564,7 +564,7 @@ struct i2o_controller {
  	struct i2o_device *exec;	/* Executive */
  #if BITS_PER_LONG == 64
@@ -52408,9 +52591,9 @@ diff -urNp linux-2.6.38.4/include/linux/i2o.h linux-2.6.38.4/include/linux/i2o.h
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff -urNp linux-2.6.38.4/include/linux/init.h linux-2.6.38.4/include/linux/init.h
---- linux-2.6.38.4/include/linux/init.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/init.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/init.h linux-2.6.38.6/include/linux/init.h
+--- linux-2.6.38.6/include/linux/init.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/init.h	2011-04-28 19:34:15.000000000 -0400
 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
@@ -52427,9 +52610,9 @@ diff -urNp linux-2.6.38.4/include/linux/init.h linux-2.6.38.4/include/linux/init
  	{ return exitfn; }					\
  	void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-2.6.38.4/include/linux/init_task.h linux-2.6.38.4/include/linux/init_task.h
---- linux-2.6.38.4/include/linux/init_task.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/init_task.h	2011-04-30 19:59:43.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/init_task.h linux-2.6.38.6/include/linux/init_task.h
+--- linux-2.6.38.6/include/linux/init_task.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/init_task.h	2011-04-30 19:59:43.000000000 -0400
 @@ -83,6 +83,12 @@ extern struct group_info init_groups;
  #define INIT_IDS
  #endif
@@ -52451,9 +52634,9 @@ diff -urNp linux-2.6.38.4/include/linux/init_task.h linux-2.6.38.4/include/linux
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-2.6.38.4/include/linux/interrupt.h linux-2.6.38.4/include/linux/interrupt.h
---- linux-2.6.38.4/include/linux/interrupt.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/interrupt.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/interrupt.h linux-2.6.38.6/include/linux/interrupt.h
+--- linux-2.6.38.6/include/linux/interrupt.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/interrupt.h	2011-04-28 19:34:15.000000000 -0400
 @@ -393,7 +393,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -52478,9 +52661,9 @@ diff -urNp linux-2.6.38.4/include/linux/interrupt.h linux-2.6.38.4/include/linux
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-2.6.38.4/include/linux/kallsyms.h linux-2.6.38.4/include/linux/kallsyms.h
---- linux-2.6.38.4/include/linux/kallsyms.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kallsyms.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/kallsyms.h linux-2.6.38.6/include/linux/kallsyms.h
+--- linux-2.6.38.6/include/linux/kallsyms.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/kallsyms.h	2011-04-28 19:34:15.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -52507,9 +52690,9 @@ diff -urNp linux-2.6.38.4/include/linux/kallsyms.h linux-2.6.38.4/include/linux/
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.38.4/include/linux/kgdb.h linux-2.6.38.4/include/linux/kgdb.h
---- linux-2.6.38.4/include/linux/kgdb.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kgdb.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/kgdb.h linux-2.6.38.6/include/linux/kgdb.h
+--- linux-2.6.38.6/include/linux/kgdb.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/kgdb.h	2011-04-28 19:57:25.000000000 -0400
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -52552,9 +52735,9 @@ diff -urNp linux-2.6.38.4/include/linux/kgdb.h linux-2.6.38.4/include/linux/kgdb
  
  extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
  extern char *kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.38.4/include/linux/kmod.h linux-2.6.38.4/include/linux/kmod.h
---- linux-2.6.38.4/include/linux/kmod.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kmod.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/kmod.h linux-2.6.38.6/include/linux/kmod.h
+--- linux-2.6.38.6/include/linux/kmod.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/kmod.h	2011-04-28 19:34:15.000000000 -0400
 @@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -52564,9 +52747,9 @@ diff -urNp linux-2.6.38.4/include/linux/kmod.h linux-2.6.38.4/include/linux/kmod
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff -urNp linux-2.6.38.4/include/linux/kvm_host.h linux-2.6.38.4/include/linux/kvm_host.h
---- linux-2.6.38.4/include/linux/kvm_host.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/kvm_host.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/kvm_host.h linux-2.6.38.6/include/linux/kvm_host.h
+--- linux-2.6.38.6/include/linux/kvm_host.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/kvm_host.h	2011-04-28 19:34:15.000000000 -0400
 @@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
@@ -52585,10 +52768,10 @@ diff -urNp linux-2.6.38.4/include/linux/kvm_host.h linux-2.6.38.4/include/linux/
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/libata.h
---- linux-2.6.38.4/include/linux/libata.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/libata.h	2011-04-28 19:34:15.000000000 -0400
-@@ -530,11 +530,11 @@ struct ata_ioports {
+diff -urNp linux-2.6.38.6/include/linux/libata.h linux-2.6.38.6/include/linux/libata.h
+--- linux-2.6.38.6/include/linux/libata.h	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/include/linux/libata.h	2011-05-10 22:06:56.000000000 -0400
+@@ -531,11 +531,11 @@ struct ata_ioports {
  
  struct ata_host {
  	spinlock_t		lock;
@@ -52602,7 +52785,7 @@ diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/li
  	unsigned long		flags;
  
  	struct mutex		eh_mutex;
-@@ -725,7 +725,7 @@ struct ata_link {
+@@ -726,7 +726,7 @@ struct ata_link {
  
  struct ata_port {
  	struct Scsi_Host	*scsi_host; /* our co-allocated scsi host */
@@ -52611,7 +52794,7 @@ diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/li
  	spinlock_t		*lock;
  	/* Flags owned by the EH context. Only EH should touch these once the
  	   port is active */
-@@ -913,7 +913,7 @@ struct ata_port_info {
+@@ -914,7 +914,7 @@ struct ata_port_info {
  	unsigned long		pio_mask;
  	unsigned long		mwdma_mask;
  	unsigned long		udma_mask;
@@ -52620,7 +52803,7 @@ diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/li
  	void 			*private_data;
  };
  
-@@ -937,7 +937,7 @@ extern const unsigned long sata_deb_timi
+@@ -938,7 +938,7 @@ extern const unsigned long sata_deb_timi
  extern const unsigned long sata_deb_timing_hotplug[];
  extern const unsigned long sata_deb_timing_long[];
  
@@ -52629,7 +52812,7 @@ diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/li
  extern const struct ata_port_info ata_dummy_port_info;
  
  static inline const unsigned long *
-@@ -983,7 +983,7 @@ extern int ata_host_activate(struct ata_
+@@ -984,7 +984,7 @@ extern int ata_host_activate(struct ata_
  			     struct scsi_host_template *sht);
  extern void ata_host_detach(struct ata_host *host);
  extern void ata_host_init(struct ata_host *, struct device *,
@@ -52638,9 +52821,9 @@ diff -urNp linux-2.6.38.4/include/linux/libata.h linux-2.6.38.4/include/linux/li
  extern int ata_scsi_detect(struct scsi_host_template *sht);
  extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
  extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
-diff -urNp linux-2.6.38.4/include/linux/lockd/bind.h linux-2.6.38.4/include/linux/lockd/bind.h
---- linux-2.6.38.4/include/linux/lockd/bind.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/lockd/bind.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/lockd/bind.h linux-2.6.38.6/include/linux/lockd/bind.h
+--- linux-2.6.38.6/include/linux/lockd/bind.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/lockd/bind.h	2011-04-28 19:34:15.000000000 -0400
 @@ -23,13 +23,13 @@ struct svc_rqst;
   * This is the set of functions for lockd->nfsd communication
   */
@@ -52658,9 +52841,9 @@ diff -urNp linux-2.6.38.4/include/linux/lockd/bind.h linux-2.6.38.4/include/linu
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
---- linux-2.6.38.4/include/linux/mm.h	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mm.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/mm.h linux-2.6.38.6/include/linux/mm.h
+--- linux-2.6.38.6/include/linux/mm.h	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/include/linux/mm.h	2011-05-10 22:06:56.000000000 -0400
 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
@@ -52676,7 +52859,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
  #define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
  
-@@ -992,12 +999,6 @@ int set_page_dirty(struct page *page);
+@@ -993,12 +1000,6 @@ int set_page_dirty(struct page *page);
  int set_page_dirty_lock(struct page *page);
  int clear_page_dirty_for_io(struct page *page);
  
@@ -52689,7 +52872,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  extern unsigned long move_page_tables(struct vm_area_struct *vma,
  		unsigned long old_addr, struct vm_area_struct *new_vma,
  		unsigned long new_addr, unsigned long len);
-@@ -1149,6 +1150,15 @@ struct shrinker {
+@@ -1150,6 +1151,15 @@ struct shrinker {
  extern void register_shrinker(struct shrinker *);
  extern void unregister_shrinker(struct shrinker *);
  
@@ -52705,7 +52888,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1438,6 +1448,7 @@ out:
+@@ -1439,6 +1449,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -52713,7 +52896,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1494,6 +1505,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1495,6 +1506,10 @@ extern struct vm_area_struct * find_vma(
  extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
  					     struct vm_area_struct **pprev);
  
@@ -52724,7 +52907,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
     NULL if none.  Assume start_addr < end_addr. */
  static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1510,15 +1525,6 @@ static inline unsigned long vma_pages(st
+@@ -1511,15 +1526,6 @@ static inline unsigned long vma_pages(st
  	return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -52740,7 +52923,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
  int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
  			unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1627,7 +1633,7 @@ extern int unpoison_memory(unsigned long
+@@ -1628,7 +1634,7 @@ extern int unpoison_memory(unsigned long
  extern int sysctl_memory_failure_early_kill;
  extern int sysctl_memory_failure_recovery;
  extern void shake_page(struct page *p, int access);
@@ -52749,7 +52932,7 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
  extern int soft_offline_page(struct page *page, int flags);
  #ifdef CONFIG_MEMORY_FAILURE
  int is_hwpoison_address(unsigned long addr);
-@@ -1649,5 +1655,11 @@ extern void copy_user_huge_page(struct p
+@@ -1650,5 +1656,11 @@ extern void copy_user_huge_page(struct p
  				unsigned int pages_per_huge_page);
  #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
  
@@ -52761,9 +52944,9 @@ diff -urNp linux-2.6.38.4/include/linux/mm.h linux-2.6.38.4/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.38.4/include/linux/mm_types.h linux-2.6.38.4/include/linux/mm_types.h
---- linux-2.6.38.4/include/linux/mm_types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mm_types.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/mm_types.h linux-2.6.38.6/include/linux/mm_types.h
+--- linux-2.6.38.6/include/linux/mm_types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/mm_types.h	2011-04-28 19:34:15.000000000 -0400
 @@ -183,6 +183,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
@@ -52798,9 +52981,9 @@ diff -urNp linux-2.6.38.4/include/linux/mm_types.h linux-2.6.38.4/include/linux/
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.38.4/include/linux/mmu_notifier.h linux-2.6.38.4/include/linux/mmu_notifier.h
---- linux-2.6.38.4/include/linux/mmu_notifier.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mmu_notifier.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/mmu_notifier.h linux-2.6.38.6/include/linux/mmu_notifier.h
+--- linux-2.6.38.6/include/linux/mmu_notifier.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/mmu_notifier.h	2011-04-28 19:34:15.000000000 -0400
 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
@@ -52817,9 +53000,9 @@ diff -urNp linux-2.6.38.4/include/linux/mmu_notifier.h linux-2.6.38.4/include/li
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)		\
-diff -urNp linux-2.6.38.4/include/linux/mmzone.h linux-2.6.38.4/include/linux/mmzone.h
---- linux-2.6.38.4/include/linux/mmzone.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mmzone.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/mmzone.h linux-2.6.38.6/include/linux/mmzone.h
+--- linux-2.6.38.6/include/linux/mmzone.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/mmzone.h	2011-04-28 19:34:15.000000000 -0400
 @@ -355,7 +355,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
@@ -52829,9 +53012,9 @@ diff -urNp linux-2.6.38.4/include/linux/mmzone.h linux-2.6.38.4/include/linux/mm
  
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-2.6.38.4/include/linux/mod_devicetable.h linux-2.6.38.4/include/linux/mod_devicetable.h
---- linux-2.6.38.4/include/linux/mod_devicetable.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mod_devicetable.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/mod_devicetable.h linux-2.6.38.6/include/linux/mod_devicetable.h
+--- linux-2.6.38.6/include/linux/mod_devicetable.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/mod_devicetable.h	2011-04-28 19:34:15.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -52850,9 +53033,9 @@ diff -urNp linux-2.6.38.4/include/linux/mod_devicetable.h linux-2.6.38.4/include
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-2.6.38.4/include/linux/module.h linux-2.6.38.4/include/linux/module.h
---- linux-2.6.38.4/include/linux/module.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/module.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/module.h linux-2.6.38.6/include/linux/module.h
+--- linux-2.6.38.6/include/linux/module.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/module.h	2011-04-28 19:34:15.000000000 -0400
 @@ -324,19 +324,16 @@ struct module
  	int (*init)(void);
  
@@ -52928,9 +53111,9 @@ diff -urNp linux-2.6.38.4/include/linux/module.h linux-2.6.38.4/include/linux/mo
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.38.4/include/linux/moduleloader.h linux-2.6.38.4/include/linux/moduleloader.h
---- linux-2.6.38.4/include/linux/moduleloader.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/moduleloader.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/moduleloader.h linux-2.6.38.6/include/linux/moduleloader.h
+--- linux-2.6.38.6/include/linux/moduleloader.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/moduleloader.h	2011-04-28 19:34:15.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -52953,9 +53136,9 @@ diff -urNp linux-2.6.38.4/include/linux/moduleloader.h linux-2.6.38.4/include/li
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.38.4/include/linux/moduleparam.h linux-2.6.38.4/include/linux/moduleparam.h
---- linux-2.6.38.4/include/linux/moduleparam.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/moduleparam.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/moduleparam.h linux-2.6.38.6/include/linux/moduleparam.h
+--- linux-2.6.38.6/include/linux/moduleparam.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/moduleparam.h	2011-04-28 19:34:15.000000000 -0400
 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -52974,9 +53157,9 @@ diff -urNp linux-2.6.38.4/include/linux/moduleparam.h linux-2.6.38.4/include/lin
  	= { ARRAY_SIZE(array), nump, &param_ops_##type,			\
  	    sizeof(array[0]), array };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
-diff -urNp linux-2.6.38.4/include/linux/mutex.h linux-2.6.38.4/include/linux/mutex.h
---- linux-2.6.38.4/include/linux/mutex.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/mutex.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/mutex.h linux-2.6.38.6/include/linux/mutex.h
+--- linux-2.6.38.6/include/linux/mutex.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/mutex.h	2011-04-28 19:34:15.000000000 -0400
 @@ -51,7 +51,7 @@ struct mutex {
  	spinlock_t		wait_lock;
  	struct list_head	wait_list;
@@ -52986,9 +53169,9 @@ diff -urNp linux-2.6.38.4/include/linux/mutex.h linux-2.6.38.4/include/linux/mut
  #endif
  #ifdef CONFIG_DEBUG_MUTEXES
  	const char 		*name;
-diff -urNp linux-2.6.38.4/include/linux/namei.h linux-2.6.38.4/include/linux/namei.h
---- linux-2.6.38.4/include/linux/namei.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/namei.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/namei.h linux-2.6.38.6/include/linux/namei.h
+--- linux-2.6.38.6/include/linux/namei.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/namei.h	2011-04-28 19:34:15.000000000 -0400
 @@ -25,7 +25,7 @@ struct nameidata {
  	unsigned	seq;
  	int		last_type;
@@ -53013,9 +53196,9 @@ diff -urNp linux-2.6.38.4/include/linux/namei.h linux-2.6.38.4/include/linux/nam
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.38.4/include/linux/netfilter/xt_gradm.h linux-2.6.38.4/include/linux/netfilter/xt_gradm.h
---- linux-2.6.38.4/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/include/linux/netfilter/xt_gradm.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/netfilter/xt_gradm.h linux-2.6.38.6/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.38.6/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/include/linux/netfilter/xt_gradm.h	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -53026,9 +53209,9 @@ diff -urNp linux-2.6.38.4/include/linux/netfilter/xt_gradm.h linux-2.6.38.4/incl
 +};
 +
 +#endif
-diff -urNp linux-2.6.38.4/include/linux/oprofile.h linux-2.6.38.4/include/linux/oprofile.h
---- linux-2.6.38.4/include/linux/oprofile.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/oprofile.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/oprofile.h linux-2.6.38.6/include/linux/oprofile.h
+--- linux-2.6.38.6/include/linux/oprofile.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/oprofile.h	2011-04-28 19:34:15.000000000 -0400
 @@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
  	char const * name, ulong * val);
@@ -53041,9 +53224,9 @@ diff -urNp linux-2.6.38.4/include/linux/oprofile.h linux-2.6.38.4/include/linux/
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.38.4/include/linux/padata.h linux-2.6.38.4/include/linux/padata.h
---- linux-2.6.38.4/include/linux/padata.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/padata.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/padata.h linux-2.6.38.6/include/linux/padata.h
+--- linux-2.6.38.6/include/linux/padata.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/padata.h	2011-04-28 19:57:25.000000000 -0400
 @@ -129,7 +129,7 @@ struct parallel_data {
  	struct padata_instance		*pinst;
  	struct padata_parallel_queue	__percpu *pqueue;
@@ -53053,9 +53236,9 @@ diff -urNp linux-2.6.38.4/include/linux/padata.h linux-2.6.38.4/include/linux/pa
  	atomic_t			reorder_objects;
  	atomic_t			refcnt;
  	unsigned int			max_seq_nr;
-diff -urNp linux-2.6.38.4/include/linux/perf_event.h linux-2.6.38.4/include/linux/perf_event.h
---- linux-2.6.38.4/include/linux/perf_event.h	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/include/linux/perf_event.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/perf_event.h linux-2.6.38.6/include/linux/perf_event.h
+--- linux-2.6.38.6/include/linux/perf_event.h	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/include/linux/perf_event.h	2011-04-28 19:57:25.000000000 -0400
 @@ -732,8 +732,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
@@ -53078,9 +53261,9 @@ diff -urNp linux-2.6.38.4/include/linux/perf_event.h linux-2.6.38.4/include/linu
  
  	/*
  	 * Protect attach/detach and child_list:
-diff -urNp linux-2.6.38.4/include/linux/pipe_fs_i.h linux-2.6.38.4/include/linux/pipe_fs_i.h
---- linux-2.6.38.4/include/linux/pipe_fs_i.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/pipe_fs_i.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/pipe_fs_i.h linux-2.6.38.6/include/linux/pipe_fs_i.h
+--- linux-2.6.38.6/include/linux/pipe_fs_i.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/pipe_fs_i.h	2011-04-28 19:34:15.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
  	wait_queue_head_t wait;
@@ -53094,9 +53277,9 @@ diff -urNp linux-2.6.38.4/include/linux/pipe_fs_i.h linux-2.6.38.4/include/linux
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct page *tmp_page;
-diff -urNp linux-2.6.38.4/include/linux/pm_runtime.h linux-2.6.38.4/include/linux/pm_runtime.h
---- linux-2.6.38.4/include/linux/pm_runtime.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/pm_runtime.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/pm_runtime.h linux-2.6.38.6/include/linux/pm_runtime.h
+--- linux-2.6.38.6/include/linux/pm_runtime.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/pm_runtime.h	2011-04-28 19:34:15.000000000 -0400
 @@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(st
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
@@ -53106,9 +53289,9 @@ diff -urNp linux-2.6.38.4/include/linux/pm_runtime.h linux-2.6.38.4/include/linu
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-2.6.38.4/include/linux/poison.h linux-2.6.38.4/include/linux/poison.h
---- linux-2.6.38.4/include/linux/poison.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/poison.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/poison.h linux-2.6.38.6/include/linux/poison.h
+--- linux-2.6.38.6/include/linux/poison.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/poison.h	2011-04-28 19:34:15.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -53120,9 +53303,9 @@ diff -urNp linux-2.6.38.4/include/linux/poison.h linux-2.6.38.4/include/linux/po
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.38.4/include/linux/proc_fs.h linux-2.6.38.4/include/linux/proc_fs.h
---- linux-2.6.38.4/include/linux/proc_fs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/proc_fs.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/proc_fs.h linux-2.6.38.6/include/linux/proc_fs.h
+--- linux-2.6.38.6/include/linux/proc_fs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/proc_fs.h	2011-04-28 19:34:15.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -53143,9 +53326,9 @@ diff -urNp linux-2.6.38.4/include/linux/proc_fs.h linux-2.6.38.4/include/linux/p
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
  	mode_t mode, struct proc_dir_entry *base, 
  	read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.38.4/include/linux/ptrace.h linux-2.6.38.4/include/linux/ptrace.h
---- linux-2.6.38.4/include/linux/ptrace.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/ptrace.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/ptrace.h linux-2.6.38.6/include/linux/ptrace.h
+--- linux-2.6.38.6/include/linux/ptrace.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/ptrace.h	2011-04-28 19:34:15.000000000 -0400
 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
@@ -53159,9 +53342,9 @@ diff -urNp linux-2.6.38.4/include/linux/ptrace.h linux-2.6.38.4/include/linux/pt
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-2.6.38.4/include/linux/random.h linux-2.6.38.4/include/linux/random.h
---- linux-2.6.38.4/include/linux/random.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/random.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/random.h linux-2.6.38.6/include/linux/random.h
+--- linux-2.6.38.6/include/linux/random.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/random.h	2011-04-28 19:34:15.000000000 -0400
 @@ -80,12 +80,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -53181,9 +53364,9 @@ diff -urNp linux-2.6.38.4/include/linux/random.h linux-2.6.38.4/include/linux/ra
  }
  
  /**
-diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs.h linux-2.6.38.4/include/linux/reiserfs_fs.h
---- linux-2.6.38.4/include/linux/reiserfs_fs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/reiserfs_fs.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/reiserfs_fs.h linux-2.6.38.6/include/linux/reiserfs_fs.h
+--- linux-2.6.38.6/include/linux/reiserfs_fs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/reiserfs_fs.h	2011-04-28 19:34:15.000000000 -0400
 @@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
@@ -53230,9 +53413,9 @@ diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs.h linux-2.6.38.4/include/lin
  
  #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
  #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs_sb.h linux-2.6.38.4/include/linux/reiserfs_fs_sb.h
---- linux-2.6.38.4/include/linux/reiserfs_fs_sb.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/reiserfs_fs_sb.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/reiserfs_fs_sb.h linux-2.6.38.6/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.38.6/include/linux/reiserfs_fs_sb.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/reiserfs_fs_sb.h	2011-04-28 19:34:15.000000000 -0400
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -53242,9 +53425,9 @@ diff -urNp linux-2.6.38.4/include/linux/reiserfs_fs_sb.h linux-2.6.38.4/include/
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-2.6.38.4/include/linux/rmap.h linux-2.6.38.4/include/linux/rmap.h
---- linux-2.6.38.4/include/linux/rmap.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/rmap.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/rmap.h linux-2.6.38.6/include/linux/rmap.h
+--- linux-2.6.38.6/include/linux/rmap.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/rmap.h	2011-04-28 19:34:15.000000000 -0400
 @@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struc
  void anon_vma_init(void);	/* create anon_vma_cachep */
  int  anon_vma_prepare(struct vm_area_struct *);
@@ -53256,9 +53439,9 @@ diff -urNp linux-2.6.38.4/include/linux/rmap.h linux-2.6.38.4/include/linux/rmap
  void __anon_vma_link(struct vm_area_struct *);
  void anon_vma_free(struct anon_vma *);
  
-diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sched.h
---- linux-2.6.38.4/include/linux/sched.h	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sched.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/sched.h linux-2.6.38.6/include/linux/sched.h
+--- linux-2.6.38.6/include/linux/sched.h	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/include/linux/sched.h	2011-05-11 18:39:40.000000000 -0400
 @@ -99,6 +99,7 @@ struct robust_list_head;
  struct bio_list;
  struct fs_struct;
@@ -53396,7 +53579,7 @@ diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sch
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
  	/* Index of current stored address in ret_stack */
  	int curr_ret_stack;
-@@ -1533,6 +1574,51 @@ struct task_struct {
+@@ -1533,6 +1574,67 @@ struct task_struct {
  #endif
  };
  
@@ -53445,10 +53628,26 @@ diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sch
 +void pax_report_refcount_overflow(struct pt_regs *regs);
 +void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
 +
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++#define stackleak_probe(var)					\
++	do {							\
++		size_t maxidx = sizeof(var) / sizeof(long);	\
++		long *p = (long *)&var;				\
++		unsigned int i;					\
++								\
++		BUILD_BUG_ON(sizeof(var) < 64);			\
++								\
++		for (i = 0; i < maxidx; i += 64 / sizeof(long))	\
++			p[i] = 0;				\
++	} while (0)
++#else
++#define stackleak_probe(var)	do { } while (0)
++#endif
++
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -2002,7 +2088,9 @@ void yield(void);
+@@ -2002,7 +2104,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -53458,7 +53657,7 @@ diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sch
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2172,7 +2260,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2172,7 +2276,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -53467,7 +53666,7 @@ diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sch
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2313,13 +2401,17 @@ static inline unsigned long *end_of_stac
+@@ -2313,13 +2417,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -53487,9 +53686,9 @@ diff -urNp linux-2.6.38.4/include/linux/sched.h linux-2.6.38.4/include/linux/sch
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.38.4/include/linux/screen_info.h linux-2.6.38.4/include/linux/screen_info.h
---- linux-2.6.38.4/include/linux/screen_info.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/screen_info.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/screen_info.h linux-2.6.38.6/include/linux/screen_info.h
+--- linux-2.6.38.6/include/linux/screen_info.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/screen_info.h	2011-04-28 19:34:15.000000000 -0400
 @@ -43,7 +43,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -53500,9 +53699,9 @@ diff -urNp linux-2.6.38.4/include/linux/screen_info.h linux-2.6.38.4/include/lin
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-2.6.38.4/include/linux/security.h linux-2.6.38.4/include/linux/security.h
---- linux-2.6.38.4/include/linux/security.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/security.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/security.h linux-2.6.38.6/include/linux/security.h
+--- linux-2.6.38.6/include/linux/security.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/security.h	2011-04-28 19:34:15.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -53511,9 +53710,9 @@ diff -urNp linux-2.6.38.4/include/linux/security.h linux-2.6.38.4/include/linux/
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.38.4/include/linux/shm.h linux-2.6.38.4/include/linux/shm.h
---- linux-2.6.38.4/include/linux/shm.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/shm.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/shm.h linux-2.6.38.6/include/linux/shm.h
+--- linux-2.6.38.6/include/linux/shm.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/shm.h	2011-04-28 19:34:15.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
@@ -53525,9 +53724,9 @@ diff -urNp linux-2.6.38.4/include/linux/shm.h linux-2.6.38.4/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.38.4/include/linux/skbuff.h linux-2.6.38.4/include/linux/skbuff.h
---- linux-2.6.38.4/include/linux/skbuff.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/skbuff.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/skbuff.h linux-2.6.38.6/include/linux/skbuff.h
+--- linux-2.6.38.6/include/linux/skbuff.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/skbuff.h	2011-04-28 19:57:25.000000000 -0400
 @@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -53564,9 +53763,9 @@ diff -urNp linux-2.6.38.4/include/linux/skbuff.h linux-2.6.38.4/include/linux/sk
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-2.6.38.4/include/linux/slab_def.h linux-2.6.38.4/include/linux/slab_def.h
---- linux-2.6.38.4/include/linux/slab_def.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/slab_def.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/slab_def.h linux-2.6.38.6/include/linux/slab_def.h
+--- linux-2.6.38.6/include/linux/slab_def.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/slab_def.h	2011-04-28 19:57:25.000000000 -0400
 @@ -96,10 +96,10 @@ struct kmem_cache {
  	unsigned long node_allocs;
  	unsigned long node_frees;
@@ -53582,9 +53781,9 @@ diff -urNp linux-2.6.38.4/include/linux/slab_def.h linux-2.6.38.4/include/linux/
  
  	/*
  	 * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-2.6.38.4/include/linux/slab.h linux-2.6.38.4/include/linux/slab.h
---- linux-2.6.38.4/include/linux/slab.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/slab.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/slab.h linux-2.6.38.6/include/linux/slab.h
+--- linux-2.6.38.6/include/linux/slab.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/slab.h	2011-04-28 19:34:15.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -53669,9 +53868,9 @@ diff -urNp linux-2.6.38.4/include/linux/slab.h linux-2.6.38.4/include/linux/slab
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-2.6.38.4/include/linux/slub_def.h linux-2.6.38.4/include/linux/slub_def.h
---- linux-2.6.38.4/include/linux/slub_def.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/slub_def.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/slub_def.h linux-2.6.38.6/include/linux/slub_def.h
+--- linux-2.6.38.6/include/linux/slub_def.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/slub_def.h	2011-04-28 19:34:15.000000000 -0400
 @@ -79,7 +79,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
@@ -53681,9 +53880,9 @@ diff -urNp linux-2.6.38.4/include/linux/slub_def.h linux-2.6.38.4/include/linux/
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-diff -urNp linux-2.6.38.4/include/linux/sonet.h linux-2.6.38.4/include/linux/sonet.h
---- linux-2.6.38.4/include/linux/sonet.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sonet.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/sonet.h linux-2.6.38.6/include/linux/sonet.h
+--- linux-2.6.38.6/include/linux/sonet.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/sonet.h	2011-04-28 19:34:15.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -53693,9 +53892,9 @@ diff -urNp linux-2.6.38.4/include/linux/sonet.h linux-2.6.38.4/include/linux/son
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.38.4/include/linux/sunrpc/clnt.h linux-2.6.38.4/include/linux/sunrpc/clnt.h
---- linux-2.6.38.4/include/linux/sunrpc/clnt.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sunrpc/clnt.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/sunrpc/clnt.h linux-2.6.38.6/include/linux/sunrpc/clnt.h
+--- linux-2.6.38.6/include/linux/sunrpc/clnt.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/sunrpc/clnt.h	2011-04-28 19:34:15.000000000 -0400
 @@ -168,9 +168,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
@@ -53726,9 +53925,9 @@ diff -urNp linux-2.6.38.4/include/linux/sunrpc/clnt.h linux-2.6.38.4/include/lin
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h
---- linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/sunrpc/svc_rdma.h linux-2.6.38.6/include/linux/sunrpc/svc_rdma.h
+--- linux-2.6.38.6/include/linux/sunrpc/svc_rdma.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/sunrpc/svc_rdma.h	2011-04-28 19:57:25.000000000 -0400
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -53754,9 +53953,9 @@ diff -urNp linux-2.6.38.4/include/linux/sunrpc/svc_rdma.h linux-2.6.38.4/include
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-2.6.38.4/include/linux/suspend.h linux-2.6.38.4/include/linux/suspend.h
---- linux-2.6.38.4/include/linux/suspend.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/suspend.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/suspend.h linux-2.6.38.6/include/linux/suspend.h
+--- linux-2.6.38.6/include/linux/suspend.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/suspend.h	2011-04-28 19:34:15.000000000 -0400
 @@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
   *	which require special recovery actions in that situation.
   */
@@ -53809,9 +54008,9 @@ diff -urNp linux-2.6.38.4/include/linux/suspend.h linux-2.6.38.4/include/linux/s
  };
  
  #ifdef CONFIG_HIBERNATION
-diff -urNp linux-2.6.38.4/include/linux/sysctl.h linux-2.6.38.4/include/linux/sysctl.h
---- linux-2.6.38.4/include/linux/sysctl.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sysctl.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/sysctl.h linux-2.6.38.6/include/linux/sysctl.h
+--- linux-2.6.38.6/include/linux/sysctl.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/sysctl.h	2011-04-28 19:34:15.000000000 -0400
 @@ -155,7 +155,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -53834,9 +54033,9 @@ diff -urNp linux-2.6.38.4/include/linux/sysctl.h linux-2.6.38.4/include/linux/sy
  extern int proc_dointvec(struct ctl_table *, int,
  			 void __user *, size_t *, loff_t *);
  extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff -urNp linux-2.6.38.4/include/linux/sysfs.h linux-2.6.38.4/include/linux/sysfs.h
---- linux-2.6.38.4/include/linux/sysfs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/sysfs.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/sysfs.h linux-2.6.38.6/include/linux/sysfs.h
+--- linux-2.6.38.6/include/linux/sysfs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/sysfs.h	2011-04-28 19:34:15.000000000 -0400
 @@ -110,8 +110,8 @@ struct bin_attribute {
  #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
  
@@ -53848,9 +54047,9 @@ diff -urNp linux-2.6.38.4/include/linux/sysfs.h linux-2.6.38.4/include/linux/sys
  };
  
  struct sysfs_dirent;
-diff -urNp linux-2.6.38.4/include/linux/tty.h linux-2.6.38.4/include/linux/tty.h
---- linux-2.6.38.4/include/linux/tty.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/tty.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/tty.h linux-2.6.38.6/include/linux/tty.h
+--- linux-2.6.38.6/include/linux/tty.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/tty.h	2011-04-28 19:34:15.000000000 -0400
 @@ -13,6 +13,8 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_ldisc.h>
@@ -53887,9 +54086,9 @@ diff -urNp linux-2.6.38.4/include/linux/tty.h linux-2.6.38.4/include/linux/tty.h
  
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.38.4/include/linux/tty_ldisc.h linux-2.6.38.4/include/linux/tty_ldisc.h
---- linux-2.6.38.4/include/linux/tty_ldisc.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/tty_ldisc.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/tty_ldisc.h linux-2.6.38.6/include/linux/tty_ldisc.h
+--- linux-2.6.38.6/include/linux/tty_ldisc.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/tty_ldisc.h	2011-04-28 19:34:15.000000000 -0400
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -53899,9 +54098,9 @@ diff -urNp linux-2.6.38.4/include/linux/tty_ldisc.h linux-2.6.38.4/include/linux
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.38.4/include/linux/types.h linux-2.6.38.4/include/linux/types.h
---- linux-2.6.38.4/include/linux/types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/types.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/types.h linux-2.6.38.6/include/linux/types.h
+--- linux-2.6.38.6/include/linux/types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/types.h	2011-04-28 19:34:15.000000000 -0400
 @@ -207,10 +207,26 @@ typedef struct {
  	int counter;
  } atomic_t;
@@ -53929,9 +54128,9 @@ diff -urNp linux-2.6.38.4/include/linux/types.h linux-2.6.38.4/include/linux/typ
  #endif
  
  struct list_head {
-diff -urNp linux-2.6.38.4/include/linux/uaccess.h linux-2.6.38.4/include/linux/uaccess.h
---- linux-2.6.38.4/include/linux/uaccess.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/uaccess.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/uaccess.h linux-2.6.38.6/include/linux/uaccess.h
+--- linux-2.6.38.6/include/linux/uaccess.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/uaccess.h	2011-04-28 19:34:15.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -53967,9 +54166,9 @@ diff -urNp linux-2.6.38.4/include/linux/uaccess.h linux-2.6.38.4/include/linux/u
 +extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif		/* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.38.4/include/linux/unaligned/access_ok.h linux-2.6.38.4/include/linux/unaligned/access_ok.h
---- linux-2.6.38.4/include/linux/unaligned/access_ok.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/unaligned/access_ok.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/unaligned/access_ok.h linux-2.6.38.6/include/linux/unaligned/access_ok.h
+--- linux-2.6.38.6/include/linux/unaligned/access_ok.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/unaligned/access_ok.h	2011-04-28 19:34:15.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -54009,9 +54208,9 @@ diff -urNp linux-2.6.38.4/include/linux/unaligned/access_ok.h linux-2.6.38.4/inc
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.38.4/include/linux/usb/hcd.h linux-2.6.38.4/include/linux/usb/hcd.h
---- linux-2.6.38.4/include/linux/usb/hcd.h	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/include/linux/usb/hcd.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/usb/hcd.h linux-2.6.38.6/include/linux/usb/hcd.h
+--- linux-2.6.38.6/include/linux/usb/hcd.h	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/include/linux/usb/hcd.h	2011-04-28 19:34:15.000000000 -0400
 @@ -589,7 +589,7 @@ struct usb_mon_operations {
  	/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
  };
@@ -54030,9 +54229,9 @@ diff -urNp linux-2.6.38.4/include/linux/usb/hcd.h linux-2.6.38.4/include/linux/u
  void usb_mon_deregister(void);
  
  #else
-diff -urNp linux-2.6.38.4/include/linux/vmalloc.h linux-2.6.38.4/include/linux/vmalloc.h
---- linux-2.6.38.4/include/linux/vmalloc.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/vmalloc.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/vmalloc.h linux-2.6.38.6/include/linux/vmalloc.h
+--- linux-2.6.38.6/include/linux/vmalloc.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/vmalloc.h	2011-04-28 19:34:15.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_MAP		0x00000004	/* vmap()ed pages */
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
@@ -54149,9 +54348,9 @@ diff -urNp linux-2.6.38.4/include/linux/vmalloc.h linux-2.6.38.4/include/linux/v
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.38.4/include/linux/vmstat.h linux-2.6.38.4/include/linux/vmstat.h
---- linux-2.6.38.4/include/linux/vmstat.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/linux/vmstat.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/linux/vmstat.h linux-2.6.38.6/include/linux/vmstat.h
+--- linux-2.6.38.6/include/linux/vmstat.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/linux/vmstat.h	2011-04-28 19:34:15.000000000 -0400
 @@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -54215,9 +54414,9 @@ diff -urNp linux-2.6.38.4/include/linux/vmstat.h linux-2.6.38.4/include/linux/vm
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.38.4/include/media/v4l2-device.h linux-2.6.38.4/include/media/v4l2-device.h
---- linux-2.6.38.4/include/media/v4l2-device.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/media/v4l2-device.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/media/v4l2-device.h linux-2.6.38.6/include/media/v4l2-device.h
+--- linux-2.6.38.6/include/media/v4l2-device.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/media/v4l2-device.h	2011-04-28 19:57:25.000000000 -0400
 @@ -77,7 +77,7 @@ int __must_check v4l2_device_register(st
     this function returns 0. If the name ends with a digit (e.g. cx18),
     then the name will be set to cx18-0 since cx180 looks really odd. */
@@ -54227,9 +54426,9 @@ diff -urNp linux-2.6.38.4/include/media/v4l2-device.h linux-2.6.38.4/include/med
  
  /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
     Since the parent disappears this ensures that v4l2_dev doesn't have an
-diff -urNp linux-2.6.38.4/include/net/caif/cfctrl.h linux-2.6.38.4/include/net/caif/cfctrl.h
---- linux-2.6.38.4/include/net/caif/cfctrl.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/caif/cfctrl.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/caif/cfctrl.h linux-2.6.38.6/include/net/caif/cfctrl.h
+--- linux-2.6.38.6/include/net/caif/cfctrl.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/caif/cfctrl.h	2011-04-28 19:57:25.000000000 -0400
 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
  struct cfctrl {
  	struct cfsrvl serv;
@@ -54241,9 +54440,9 @@ diff -urNp linux-2.6.38.4/include/net/caif/cfctrl.h linux-2.6.38.4/include/net/c
  	struct list_head list;
  	/* Protects from simultaneous access to first_req list */
  	spinlock_t info_list_lock;
-diff -urNp linux-2.6.38.4/include/net/flow.h linux-2.6.38.4/include/net/flow.h
---- linux-2.6.38.4/include/net/flow.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/flow.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/flow.h linux-2.6.38.6/include/net/flow.h
+--- linux-2.6.38.6/include/net/flow.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/flow.h	2011-04-28 19:57:25.000000000 -0400
 @@ -109,7 +109,7 @@ extern struct flow_cache_object *flow_ca
  		u8 dir, flow_resolve_t resolver, void *ctx);
  
@@ -54253,9 +54452,9 @@ diff -urNp linux-2.6.38.4/include/net/flow.h linux-2.6.38.4/include/net/flow.h
  
  static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
  {
-diff -urNp linux-2.6.38.4/include/net/inetpeer.h linux-2.6.38.4/include/net/inetpeer.h
---- linux-2.6.38.4/include/net/inetpeer.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/inetpeer.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/inetpeer.h linux-2.6.38.6/include/net/inetpeer.h
+--- linux-2.6.38.6/include/net/inetpeer.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/inetpeer.h	2011-04-28 19:34:15.000000000 -0400
 @@ -38,8 +38,8 @@ struct inet_peer {
  	 */
  	union {
@@ -54276,9 +54475,9 @@ diff -urNp linux-2.6.38.4/include/net/inetpeer.h linux-2.6.38.4/include/net/inet
  }
  
  #endif /* _NET_INETPEER_H */
-diff -urNp linux-2.6.38.4/include/net/ip_vs.h linux-2.6.38.4/include/net/ip_vs.h
---- linux-2.6.38.4/include/net/ip_vs.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/ip_vs.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/ip_vs.h linux-2.6.38.6/include/net/ip_vs.h
+--- linux-2.6.38.6/include/net/ip_vs.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/ip_vs.h	2011-04-28 19:57:25.000000000 -0400
 @@ -404,7 +404,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
@@ -54297,9 +54496,9 @@ diff -urNp linux-2.6.38.4/include/net/ip_vs.h linux-2.6.38.4/include/net/ip_vs.h
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff -urNp linux-2.6.38.4/include/net/irda/ircomm_tty.h linux-2.6.38.4/include/net/irda/ircomm_tty.h
---- linux-2.6.38.4/include/net/irda/ircomm_tty.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/irda/ircomm_tty.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/irda/ircomm_tty.h linux-2.6.38.6/include/net/irda/ircomm_tty.h
+--- linux-2.6.38.6/include/net/irda/ircomm_tty.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/irda/ircomm_tty.h	2011-04-28 19:34:15.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -54319,9 +54518,9 @@ diff -urNp linux-2.6.38.4/include/net/irda/ircomm_tty.h linux-2.6.38.4/include/n
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-2.6.38.4/include/net/iucv/af_iucv.h linux-2.6.38.4/include/net/iucv/af_iucv.h
---- linux-2.6.38.4/include/net/iucv/af_iucv.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/iucv/af_iucv.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/iucv/af_iucv.h linux-2.6.38.6/include/net/iucv/af_iucv.h
+--- linux-2.6.38.6/include/net/iucv/af_iucv.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/iucv/af_iucv.h	2011-04-28 19:57:25.000000000 -0400
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
  	struct hlist_head head;
@@ -54331,9 +54530,9 @@ diff -urNp linux-2.6.38.4/include/net/iucv/af_iucv.h linux-2.6.38.4/include/net/
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-2.6.38.4/include/net/neighbour.h linux-2.6.38.4/include/net/neighbour.h
---- linux-2.6.38.4/include/net/neighbour.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/neighbour.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/neighbour.h linux-2.6.38.6/include/net/neighbour.h
+--- linux-2.6.38.6/include/net/neighbour.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/neighbour.h	2011-04-28 19:34:15.000000000 -0400
 @@ -118,12 +118,12 @@ struct neighbour {
  
  struct neigh_ops {
@@ -54353,9 +54552,9 @@ diff -urNp linux-2.6.38.4/include/net/neighbour.h linux-2.6.38.4/include/net/nei
  };
  
  struct pneigh_entry {
-diff -urNp linux-2.6.38.4/include/net/netlink.h linux-2.6.38.4/include/net/netlink.h
---- linux-2.6.38.4/include/net/netlink.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/netlink.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/netlink.h linux-2.6.38.6/include/net/netlink.h
+--- linux-2.6.38.6/include/net/netlink.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/netlink.h	2011-04-28 19:34:15.000000000 -0400
 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
@@ -54365,9 +54564,9 @@ diff -urNp linux-2.6.38.4/include/net/netlink.h linux-2.6.38.4/include/net/netli
  }
  
  /**
-diff -urNp linux-2.6.38.4/include/net/netns/ipv4.h linux-2.6.38.4/include/net/netns/ipv4.h
---- linux-2.6.38.4/include/net/netns/ipv4.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/netns/ipv4.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/netns/ipv4.h linux-2.6.38.6/include/net/netns/ipv4.h
+--- linux-2.6.38.6/include/net/netns/ipv4.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/netns/ipv4.h	2011-04-28 19:57:25.000000000 -0400
 @@ -55,7 +55,7 @@ struct netns_ipv4 {
  	int sysctl_rt_cache_rebuild_count;
  	int current_rt_cache_rebuild_count;
@@ -54377,9 +54576,9 @@ diff -urNp linux-2.6.38.4/include/net/netns/ipv4.h linux-2.6.38.4/include/net/ne
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-2.6.38.4/include/net/sctp/sctp.h linux-2.6.38.4/include/net/sctp/sctp.h
---- linux-2.6.38.4/include/net/sctp/sctp.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/sctp/sctp.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/sctp/sctp.h linux-2.6.38.6/include/net/sctp/sctp.h
+--- linux-2.6.38.6/include/net/sctp/sctp.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/sctp/sctp.h	2011-04-28 19:34:15.000000000 -0400
 @@ -316,9 +316,9 @@ do {									\
  
  #else	/* SCTP_DEBUG */
@@ -54393,9 +54592,9 @@ diff -urNp linux-2.6.38.4/include/net/sctp/sctp.h linux-2.6.38.4/include/net/sct
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.38.4/include/net/sock.h linux-2.6.38.4/include/net/sock.h
---- linux-2.6.38.4/include/net/sock.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/sock.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/sock.h linux-2.6.38.6/include/net/sock.h
+--- linux-2.6.38.6/include/net/sock.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/sock.h	2011-04-28 19:57:25.000000000 -0400
 @@ -277,7 +277,7 @@ struct sock {
  #ifdef CONFIG_RPS
  	__u32			sk_rxhash;
@@ -54405,9 +54604,9 @@ diff -urNp linux-2.6.38.4/include/net/sock.h linux-2.6.38.4/include/net/sock.h
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-diff -urNp linux-2.6.38.4/include/net/tcp.h linux-2.6.38.4/include/net/tcp.h
---- linux-2.6.38.4/include/net/tcp.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/tcp.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/tcp.h linux-2.6.38.6/include/net/tcp.h
+--- linux-2.6.38.6/include/net/tcp.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/tcp.h	2011-04-28 19:34:15.000000000 -0400
 @@ -1382,7 +1382,7 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
@@ -54417,9 +54616,9 @@ diff -urNp linux-2.6.38.4/include/net/tcp.h linux-2.6.38.4/include/net/tcp.h
  	struct seq_operations	seq_ops;
  };
  
-diff -urNp linux-2.6.38.4/include/net/udp.h linux-2.6.38.4/include/net/udp.h
---- linux-2.6.38.4/include/net/udp.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/udp.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/udp.h linux-2.6.38.6/include/net/udp.h
+--- linux-2.6.38.6/include/net/udp.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/udp.h	2011-04-28 19:34:15.000000000 -0400
 @@ -223,7 +223,7 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -54429,9 +54628,9 @@ diff -urNp linux-2.6.38.4/include/net/udp.h linux-2.6.38.4/include/net/udp.h
  	struct seq_operations	seq_ops;
  };
  
-diff -urNp linux-2.6.38.4/include/net/xfrm.h linux-2.6.38.4/include/net/xfrm.h
---- linux-2.6.38.4/include/net/xfrm.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/net/xfrm.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/net/xfrm.h linux-2.6.38.6/include/net/xfrm.h
+--- linux-2.6.38.6/include/net/xfrm.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/net/xfrm.h	2011-04-28 19:57:25.000000000 -0400
 @@ -484,7 +484,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
@@ -54441,9 +54640,9 @@ diff -urNp linux-2.6.38.4/include/net/xfrm.h linux-2.6.38.4/include/net/xfrm.h
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
-diff -urNp linux-2.6.38.4/include/scsi/scsi_device.h linux-2.6.38.4/include/scsi/scsi_device.h
---- linux-2.6.38.4/include/scsi/scsi_device.h	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/include/scsi/scsi_device.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/scsi/scsi_device.h linux-2.6.38.6/include/scsi/scsi_device.h
+--- linux-2.6.38.6/include/scsi/scsi_device.h	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/include/scsi/scsi_device.h	2011-04-28 19:57:25.000000000 -0400
 @@ -161,9 +161,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
@@ -54457,9 +54656,9 @@ diff -urNp linux-2.6.38.4/include/scsi/scsi_device.h linux-2.6.38.4/include/scsi
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff -urNp linux-2.6.38.4/include/sound/ac97_codec.h linux-2.6.38.4/include/sound/ac97_codec.h
---- linux-2.6.38.4/include/sound/ac97_codec.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/sound/ac97_codec.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/sound/ac97_codec.h linux-2.6.38.6/include/sound/ac97_codec.h
+--- linux-2.6.38.6/include/sound/ac97_codec.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/sound/ac97_codec.h	2011-04-28 19:34:15.000000000 -0400
 @@ -419,15 +419,15 @@
  struct snd_ac97;
  
@@ -54483,9 +54682,9 @@ diff -urNp linux-2.6.38.4/include/sound/ac97_codec.h linux-2.6.38.4/include/soun
  };
  
  struct snd_ac97_bus_ops {
-diff -urNp linux-2.6.38.4/include/sound/ymfpci.h linux-2.6.38.4/include/sound/ymfpci.h
---- linux-2.6.38.4/include/sound/ymfpci.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/sound/ymfpci.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/sound/ymfpci.h linux-2.6.38.6/include/sound/ymfpci.h
+--- linux-2.6.38.6/include/sound/ymfpci.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/sound/ymfpci.h	2011-04-28 19:57:25.000000000 -0400
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
  	spinlock_t reg_lock;
  	spinlock_t voice_lock;
@@ -54495,9 +54694,9 @@ diff -urNp linux-2.6.38.4/include/sound/ymfpci.h linux-2.6.38.4/include/sound/ym
  	struct snd_info_entry *proc_entry;
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
-diff -urNp linux-2.6.38.4/include/target/target_core_base.h linux-2.6.38.4/include/target/target_core_base.h
---- linux-2.6.38.4/include/target/target_core_base.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/target/target_core_base.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/target/target_core_base.h linux-2.6.38.6/include/target/target_core_base.h
+--- linux-2.6.38.6/include/target/target_core_base.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/target/target_core_base.h	2011-04-28 19:57:25.000000000 -0400
 @@ -431,8 +431,8 @@ struct se_transport_task {
  	atomic_t		t_task_cdbs_left;
  	atomic_t		t_task_cdbs_ex_left;
@@ -54518,9 +54717,9 @@ diff -urNp linux-2.6.38.4/include/target/target_core_base.h linux-2.6.38.4/inclu
  	atomic_t		dev_tur_active;
  	atomic_t		execute_tasks;
  	atomic_t		dev_status_thr_count;
-diff -urNp linux-2.6.38.4/include/trace/events/irq.h linux-2.6.38.4/include/trace/events/irq.h
---- linux-2.6.38.4/include/trace/events/irq.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/trace/events/irq.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/trace/events/irq.h linux-2.6.38.6/include/trace/events/irq.h
+--- linux-2.6.38.6/include/trace/events/irq.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/trace/events/irq.h	2011-04-28 19:34:15.000000000 -0400
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -54539,9 +54738,9 @@ diff -urNp linux-2.6.38.4/include/trace/events/irq.h linux-2.6.38.4/include/trac
  
  	TP_ARGS(irq, action, ret),
  
-diff -urNp linux-2.6.38.4/include/video/udlfb.h linux-2.6.38.4/include/video/udlfb.h
---- linux-2.6.38.4/include/video/udlfb.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/video/udlfb.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/include/video/udlfb.h linux-2.6.38.6/include/video/udlfb.h
+--- linux-2.6.38.6/include/video/udlfb.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/video/udlfb.h	2011-04-28 19:57:25.000000000 -0400
 @@ -51,10 +51,10 @@ struct dlfb_data {
  	int base8;
  	u32 pseudo_palette[256];
@@ -54557,9 +54756,9 @@ diff -urNp linux-2.6.38.4/include/video/udlfb.h linux-2.6.38.4/include/video/udl
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-2.6.38.4/include/video/uvesafb.h linux-2.6.38.4/include/video/uvesafb.h
---- linux-2.6.38.4/include/video/uvesafb.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/include/video/uvesafb.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/include/video/uvesafb.h linux-2.6.38.6/include/video/uvesafb.h
+--- linux-2.6.38.6/include/video/uvesafb.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/include/video/uvesafb.h	2011-04-28 19:34:15.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -54568,9 +54767,9 @@ diff -urNp linux-2.6.38.4/include/video/uvesafb.h linux-2.6.38.4/include/video/u
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-2.6.38.4/init/do_mounts.c linux-2.6.38.4/init/do_mounts.c
---- linux-2.6.38.4/init/do_mounts.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/do_mounts.c linux-2.6.38.6/init/do_mounts.c
+--- linux-2.6.38.6/init/do_mounts.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/init/do_mounts.c	2011-04-28 19:34:15.000000000 -0400
 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -54610,9 +54809,9 @@ diff -urNp linux-2.6.38.4/init/do_mounts.c linux-2.6.38.4/init/do_mounts.c
 +	sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
  	sys_chroot((const char __user __force *)".");
  }
-diff -urNp linux-2.6.38.4/init/do_mounts.h linux-2.6.38.4/init/do_mounts.h
---- linux-2.6.38.4/init/do_mounts.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/do_mounts.h linux-2.6.38.6/init/do_mounts.h
+--- linux-2.6.38.6/init/do_mounts.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/init/do_mounts.h	2011-04-28 19:34:15.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -54632,9 +54831,9 @@ diff -urNp linux-2.6.38.4/init/do_mounts.h linux-2.6.38.4/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-2.6.38.4/init/do_mounts_initrd.c linux-2.6.38.4/init/do_mounts_initrd.c
---- linux-2.6.38.4/init/do_mounts_initrd.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts_initrd.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/do_mounts_initrd.c linux-2.6.38.6/init/do_mounts_initrd.c
+--- linux-2.6.38.6/init/do_mounts_initrd.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/init/do_mounts_initrd.c	2011-04-28 19:34:15.000000000 -0400
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
@@ -54709,9 +54908,9 @@ diff -urNp linux-2.6.38.4/init/do_mounts_initrd.c linux-2.6.38.4/init/do_mounts_
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-2.6.38.4/init/do_mounts_md.c linux-2.6.38.4/init/do_mounts_md.c
---- linux-2.6.38.4/init/do_mounts_md.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/do_mounts_md.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/do_mounts_md.c linux-2.6.38.6/init/do_mounts_md.c
+--- linux-2.6.38.6/init/do_mounts_md.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/init/do_mounts_md.c	2011-04-28 19:34:15.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -54730,9 +54929,9 @@ diff -urNp linux-2.6.38.4/init/do_mounts_md.c linux-2.6.38.4/init/do_mounts_md.c
  			sys_ioctl(fd, BLKRRPART, 0);
  		}
  		sys_close(fd);
-diff -urNp linux-2.6.38.4/init/initramfs.c linux-2.6.38.4/init/initramfs.c
---- linux-2.6.38.4/init/initramfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/initramfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/initramfs.c linux-2.6.38.6/init/initramfs.c
+--- linux-2.6.38.6/init/initramfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/init/initramfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -54841,9 +55040,9 @@ diff -urNp linux-2.6.38.4/init/initramfs.c linux-2.6.38.4/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-2.6.38.4/init/Kconfig linux-2.6.38.4/init/Kconfig
---- linux-2.6.38.4/init/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/Kconfig linux-2.6.38.6/init/Kconfig
+--- linux-2.6.38.6/init/Kconfig	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/init/Kconfig	2011-05-10 22:06:56.000000000 -0400
 @@ -1185,7 +1185,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
@@ -54853,9 +55052,9 @@ diff -urNp linux-2.6.38.4/init/Kconfig linux-2.6.38.4/init/Kconfig
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.38.4/init/main.c linux-2.6.38.4/init/main.c
---- linux-2.6.38.4/init/main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/init/main.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/init/main.c linux-2.6.38.6/init/main.c
+--- linux-2.6.38.6/init/main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/init/main.c	2011-04-28 19:34:15.000000000 -0400
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -54965,9 +55164,9 @@ diff -urNp linux-2.6.38.4/init/main.c linux-2.6.38.4/init/main.c
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.38.4/ipc/mqueue.c linux-2.6.38.4/ipc/mqueue.c
---- linux-2.6.38.4/ipc/mqueue.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/ipc/mqueue.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/ipc/mqueue.c linux-2.6.38.6/ipc/mqueue.c
+--- linux-2.6.38.6/ipc/mqueue.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/ipc/mqueue.c	2011-04-28 19:34:15.000000000 -0400
 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -54976,9 +55175,30 @@ diff -urNp linux-2.6.38.4/ipc/mqueue.c linux-2.6.38.4/ipc/mqueue.c
  			spin_lock(&mq_lock);
  			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		 	    u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.38.4/ipc/shm.c linux-2.6.38.4/ipc/shm.c
---- linux-2.6.38.4/ipc/shm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/ipc/shm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/ipc/sem.c linux-2.6.38.6/ipc/sem.c
+--- linux-2.6.38.6/ipc/sem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/ipc/sem.c	2011-05-11 18:34:57.000000000 -0400
+@@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namesp
+ 	int nsems;
+ 	struct list_head tasks;
+ 
++	stackleak_probe(fast_sem_io);
++
+ 	sma = sem_lock_check(ns, semid);
+ 	if (IS_ERR(sma))
+ 		return PTR_ERR(sma);
+@@ -1299,6 +1301,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
+ 	struct ipc_namespace *ns;
+ 	struct list_head tasks;
+ 
++	stackleak_probe(fast_sops);
++
+ 	ns = current->nsproxy->ipc_ns;
+ 
+ 	if (nsops < 1 || semid < 0)
+diff -urNp linux-2.6.38.6/ipc/shm.c linux-2.6.38.6/ipc/shm.c
+--- linux-2.6.38.6/ipc/shm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/ipc/shm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -55040,9 +55260,9 @@ diff -urNp linux-2.6.38.4/ipc/shm.c linux-2.6.38.4/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-2.6.38.4/kernel/acct.c linux-2.6.38.4/kernel/acct.c
---- linux-2.6.38.4/kernel/acct.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/acct.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/acct.c linux-2.6.38.6/kernel/acct.c
+--- linux-2.6.38.6/kernel/acct.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/acct.c	2011-04-28 19:34:15.000000000 -0400
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -55052,9 +55272,9 @@ diff -urNp linux-2.6.38.4/kernel/acct.c linux-2.6.38.4/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-2.6.38.4/kernel/audit.c linux-2.6.38.4/kernel/audit.c
---- linux-2.6.38.4/kernel/audit.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/audit.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/audit.c linux-2.6.38.6/kernel/audit.c
+--- linux-2.6.38.6/kernel/audit.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/audit.c	2011-04-28 19:57:25.000000000 -0400
 @@ -110,7 +110,7 @@ u32		audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
@@ -55091,9 +55311,9 @@ diff -urNp linux-2.6.38.4/kernel/audit.c linux-2.6.38.4/kernel/audit.c
  		status_set.backlog	 = skb_queue_len(&audit_skb_queue);
  		audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
  				 &status_set, sizeof(status_set));
-diff -urNp linux-2.6.38.4/kernel/auditsc.c linux-2.6.38.4/kernel/auditsc.c
---- linux-2.6.38.4/kernel/auditsc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/auditsc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/auditsc.c linux-2.6.38.6/kernel/auditsc.c
+--- linux-2.6.38.6/kernel/auditsc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/auditsc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -55112,9 +55332,9 @@ diff -urNp linux-2.6.38.4/kernel/auditsc.c linux-2.6.38.4/kernel/auditsc.c
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff -urNp linux-2.6.38.4/kernel/capability.c linux-2.6.38.4/kernel/capability.c
---- linux-2.6.38.4/kernel/capability.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/capability.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/capability.c linux-2.6.38.6/kernel/capability.c
+--- linux-2.6.38.6/kernel/capability.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/capability.c	2011-04-28 19:34:15.000000000 -0400
 @@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
  		 * before modification is attempted and the application
  		 * fails.
@@ -55153,9 +55373,9 @@ diff -urNp linux-2.6.38.4/kernel/capability.c linux-2.6.38.4/kernel/capability.c
 +
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.38.4/kernel/compat.c linux-2.6.38.4/kernel/compat.c
---- linux-2.6.38.4/kernel/compat.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/compat.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/compat.c linux-2.6.38.6/kernel/compat.c
+--- linux-2.6.38.6/kernel/compat.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/compat.c	2011-04-28 19:34:15.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -55164,9 +55384,9 @@ diff -urNp linux-2.6.38.4/kernel/compat.c linux-2.6.38.4/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff -urNp linux-2.6.38.4/kernel/configs.c linux-2.6.38.4/kernel/configs.c
---- linux-2.6.38.4/kernel/configs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/configs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/configs.c linux-2.6.38.6/kernel/configs.c
+--- linux-2.6.38.6/kernel/configs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/configs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -55187,9 +55407,9 @@ diff -urNp linux-2.6.38.4/kernel/configs.c linux-2.6.38.4/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.38.4/kernel/cred.c linux-2.6.38.4/kernel/cred.c
---- linux-2.6.38.4/kernel/cred.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/cred.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/cred.c linux-2.6.38.6/kernel/cred.c
+--- linux-2.6.38.6/kernel/cred.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/cred.c	2011-04-28 19:34:15.000000000 -0400
 @@ -483,6 +483,8 @@ int commit_creds(struct cred *new)
  
  	get_cred(new); /* we will require a ref for the subj creds too */
@@ -55199,9 +55419,9 @@ diff -urNp linux-2.6.38.4/kernel/cred.c linux-2.6.38.4/kernel/cred.c
  	/* dumpability changes */
  	if (old->euid != new->euid ||
  	    old->egid != new->egid ||
-diff -urNp linux-2.6.38.4/kernel/debug/debug_core.c linux-2.6.38.4/kernel/debug/debug_core.c
---- linux-2.6.38.4/kernel/debug/debug_core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/debug/debug_core.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/debug/debug_core.c linux-2.6.38.6/kernel/debug/debug_core.c
+--- linux-2.6.38.6/kernel/debug/debug_core.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/debug/debug_core.c	2011-04-28 19:57:25.000000000 -0400
 @@ -72,7 +72,7 @@ int			kgdb_io_module_registered;
  /* Guard for recursive entry */
  static int			exception_level;
@@ -55289,9 +55509,9 @@ diff -urNp linux-2.6.38.4/kernel/debug/debug_core.c linux-2.6.38.4/kernel/debug/
  {
  	BUG_ON(kgdb_connected);
  
-diff -urNp linux-2.6.38.4/kernel/debug/kdb/kdb_main.c linux-2.6.38.4/kernel/debug/kdb/kdb_main.c
---- linux-2.6.38.4/kernel/debug/kdb/kdb_main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/debug/kdb/kdb_main.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/debug/kdb/kdb_main.c linux-2.6.38.6/kernel/debug/kdb/kdb_main.c
+--- linux-2.6.38.6/kernel/debug/kdb/kdb_main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/debug/kdb/kdb_main.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
  	list_for_each_entry(mod, kdb_modules, list) {
  
@@ -55310,9 +55530,9 @@ diff -urNp linux-2.6.38.4/kernel/debug/kdb/kdb_main.c linux-2.6.38.4/kernel/debu
  
  #ifdef CONFIG_MODULE_UNLOAD
  		{
-diff -urNp linux-2.6.38.4/kernel/exit.c linux-2.6.38.4/kernel/exit.c
---- linux-2.6.38.4/kernel/exit.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/exit.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/exit.c linux-2.6.38.6/kernel/exit.c
+--- linux-2.6.38.6/kernel/exit.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/exit.c	2011-04-28 19:34:15.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -55432,9 +55652,9 @@ diff -urNp linux-2.6.38.4/kernel/exit.c linux-2.6.38.4/kernel/exit.c
  	exit_mm(tsk);
  
  	if (group_dead)
-diff -urNp linux-2.6.38.4/kernel/fork.c linux-2.6.38.4/kernel/fork.c
---- linux-2.6.38.4/kernel/fork.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/fork.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/fork.c linux-2.6.38.6/kernel/fork.c
+--- linux-2.6.38.6/kernel/fork.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/fork.c	2011-04-28 19:34:15.000000000 -0400
 @@ -280,7 +280,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
@@ -55731,9 +55951,9 @@ diff -urNp linux-2.6.38.4/kernel/fork.c linux-2.6.38.4/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-2.6.38.4/kernel/futex.c linux-2.6.38.4/kernel/futex.c
---- linux-2.6.38.4/kernel/futex.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/kernel/futex.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/futex.c linux-2.6.38.6/kernel/futex.c
+--- linux-2.6.38.6/kernel/futex.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/kernel/futex.c	2011-04-28 19:34:15.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -55800,9 +56020,9 @@ diff -urNp linux-2.6.38.4/kernel/futex.c linux-2.6.38.4/kernel/futex.c
  	if (curval == -EFAULT)
  		futex_cmpxchg_enabled = 1;
  
-diff -urNp linux-2.6.38.4/kernel/futex_compat.c linux-2.6.38.4/kernel/futex_compat.c
---- linux-2.6.38.4/kernel/futex_compat.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/futex_compat.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/futex_compat.c linux-2.6.38.6/kernel/futex_compat.c
+--- linux-2.6.38.6/kernel/futex_compat.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/futex_compat.c	2011-04-28 19:34:15.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -55840,9 +56060,9 @@ diff -urNp linux-2.6.38.4/kernel/futex_compat.c linux-2.6.38.4/kernel/futex_comp
  		head = p->compat_robust_list;
  		rcu_read_unlock();
  	}
-diff -urNp linux-2.6.38.4/kernel/gcov/base.c linux-2.6.38.4/kernel/gcov/base.c
---- linux-2.6.38.4/kernel/gcov/base.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/gcov/base.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/gcov/base.c linux-2.6.38.6/kernel/gcov/base.c
+--- linux-2.6.38.6/kernel/gcov/base.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/gcov/base.c	2011-04-28 19:34:15.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -55864,9 +56084,9 @@ diff -urNp linux-2.6.38.4/kernel/gcov/base.c linux-2.6.38.4/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-2.6.38.4/kernel/hrtimer.c linux-2.6.38.4/kernel/hrtimer.c
---- linux-2.6.38.4/kernel/hrtimer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/hrtimer.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/hrtimer.c linux-2.6.38.6/kernel/hrtimer.c
+--- linux-2.6.38.6/kernel/hrtimer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/hrtimer.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
@@ -55876,9 +56096,9 @@ diff -urNp linux-2.6.38.4/kernel/hrtimer.c linux-2.6.38.4/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.38.4/kernel/jump_label.c linux-2.6.38.4/kernel/jump_label.c
---- linux-2.6.38.4/kernel/jump_label.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/jump_label.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/jump_label.c linux-2.6.38.6/kernel/jump_label.c
+--- linux-2.6.38.6/kernel/jump_label.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/jump_label.c	2011-04-28 19:34:15.000000000 -0400
 @@ -49,6 +49,17 @@ void jump_label_unlock(void)
  	mutex_unlock(&jump_label_mutex);
  }
@@ -55919,9 +56139,9 @@ diff -urNp linux-2.6.38.4/kernel/jump_label.c linux-2.6.38.4/kernel/jump_label.c
  					iter++;
  				}
  			}
-diff -urNp linux-2.6.38.4/kernel/kallsyms.c linux-2.6.38.4/kernel/kallsyms.c
---- linux-2.6.38.4/kernel/kallsyms.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/kallsyms.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/kallsyms.c linux-2.6.38.6/kernel/kallsyms.c
+--- linux-2.6.38.6/kernel/kallsyms.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/kallsyms.c	2011-04-28 19:34:15.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -56024,9 +56244,9 @@ diff -urNp linux-2.6.38.4/kernel/kallsyms.c linux-2.6.38.4/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-2.6.38.4/kernel/kmod.c linux-2.6.38.4/kernel/kmod.c
---- linux-2.6.38.4/kernel/kmod.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/kmod.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/kmod.c linux-2.6.38.6/kernel/kmod.c
+--- linux-2.6.38.6/kernel/kmod.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/kmod.c	2011-04-28 19:34:15.000000000 -0400
 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -56123,9 +56343,9 @@ diff -urNp linux-2.6.38.4/kernel/kmod.c linux-2.6.38.4/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-2.6.38.4/kernel/kprobes.c linux-2.6.38.4/kernel/kprobes.c
---- linux-2.6.38.4/kernel/kprobes.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/kprobes.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/kprobes.c linux-2.6.38.6/kernel/kprobes.c
+--- linux-2.6.38.6/kernel/kprobes.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/kprobes.c	2011-04-28 19:34:15.000000000 -0400
 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
  	 * kernel image and loaded module images reside. This is required
  	 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -56162,9 +56382,9 @@ diff -urNp linux-2.6.38.4/kernel/kprobes.c linux-2.6.38.4/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-2.6.38.4/kernel/lockdep.c linux-2.6.38.4/kernel/lockdep.c
---- linux-2.6.38.4/kernel/lockdep.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/lockdep.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/lockdep.c linux-2.6.38.6/kernel/lockdep.c
+--- linux-2.6.38.6/kernel/lockdep.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/lockdep.c	2011-04-28 19:34:15.000000000 -0400
 @@ -571,6 +571,10 @@ static int static_obj(void *obj)
  		      end   = (unsigned long) &_end,
  		      addr  = (unsigned long) obj;
@@ -56193,9 +56413,9 @@ diff -urNp linux-2.6.38.4/kernel/lockdep.c linux-2.6.38.4/kernel/lockdep.c
  	if (very_verbose(class)) {
  		printk("\nacquire class [%p] %s", class->key, class->name);
  		if (class->name_version > 1)
-diff -urNp linux-2.6.38.4/kernel/lockdep_proc.c linux-2.6.38.4/kernel/lockdep_proc.c
---- linux-2.6.38.4/kernel/lockdep_proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/lockdep_proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/lockdep_proc.c linux-2.6.38.6/kernel/lockdep_proc.c
+--- linux-2.6.38.6/kernel/lockdep_proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/lockdep_proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -56205,9 +56425,9 @@ diff -urNp linux-2.6.38.4/kernel/lockdep_proc.c linux-2.6.38.4/kernel/lockdep_pr
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-2.6.38.4/kernel/module.c linux-2.6.38.4/kernel/module.c
---- linux-2.6.38.4/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/module.c	2011-04-29 18:46:41.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/module.c linux-2.6.38.6/kernel/module.c
+--- linux-2.6.38.6/kernel/module.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/module.c	2011-04-29 18:46:41.000000000 -0400
 @@ -57,6 +57,7 @@
  #include <linux/kmemleak.h>
  #include <linux/jump_label.h>
@@ -56936,9 +57156,9 @@ diff -urNp linux-2.6.38.4/kernel/module.c linux-2.6.38.4/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-2.6.38.4/kernel/mutex.c linux-2.6.38.4/kernel/mutex.c
---- linux-2.6.38.4/kernel/mutex.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/mutex.c linux-2.6.38.6/kernel/mutex.c
+--- linux-2.6.38.6/kernel/mutex.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/mutex.c	2011-04-28 19:34:15.000000000 -0400
 @@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock, 
  	 */
  
@@ -56976,9 +57196,9 @@ diff -urNp linux-2.6.38.4/kernel/mutex.c linux-2.6.38.4/kernel/mutex.c
  	mutex_set_owner(lock);
  
  	/* set it to 0 if there are no waiters left: */
-diff -urNp linux-2.6.38.4/kernel/mutex-debug.c linux-2.6.38.4/kernel/mutex-debug.c
---- linux-2.6.38.4/kernel/mutex-debug.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex-debug.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/mutex-debug.c linux-2.6.38.6/kernel/mutex-debug.c
+--- linux-2.6.38.6/kernel/mutex-debug.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/mutex-debug.c	2011-04-28 19:34:15.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -57016,9 +57236,9 @@ diff -urNp linux-2.6.38.4/kernel/mutex-debug.c linux-2.6.38.4/kernel/mutex-debug
  	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
  	mutex_clear_owner(lock);
  }
-diff -urNp linux-2.6.38.4/kernel/mutex-debug.h linux-2.6.38.4/kernel/mutex-debug.h
---- linux-2.6.38.4/kernel/mutex-debug.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex-debug.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/mutex-debug.h linux-2.6.38.6/kernel/mutex-debug.h
+--- linux-2.6.38.6/kernel/mutex-debug.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/mutex-debug.h	2011-04-28 19:34:15.000000000 -0400
 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -57039,9 +57259,9 @@ diff -urNp linux-2.6.38.4/kernel/mutex-debug.h linux-2.6.38.4/kernel/mutex-debug
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.38.4/kernel/mutex.h linux-2.6.38.4/kernel/mutex.h
---- linux-2.6.38.4/kernel/mutex.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/mutex.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/mutex.h linux-2.6.38.6/kernel/mutex.h
+--- linux-2.6.38.6/kernel/mutex.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/mutex.h	2011-04-28 19:34:15.000000000 -0400
 @@ -19,7 +19,7 @@
  #ifdef CONFIG_SMP
  static inline void mutex_set_owner(struct mutex *lock)
@@ -57051,9 +57271,9 @@ diff -urNp linux-2.6.38.4/kernel/mutex.h linux-2.6.38.4/kernel/mutex.h
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.38.4/kernel/padata.c linux-2.6.38.4/kernel/padata.c
---- linux-2.6.38.4/kernel/padata.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/padata.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/padata.c linux-2.6.38.6/kernel/padata.c
+--- linux-2.6.38.6/kernel/padata.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/padata.c	2011-04-28 19:57:25.000000000 -0400
 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
  	padata->pd = pd;
  	padata->cb_cpu = cb_cpu;
@@ -57077,9 +57297,9 @@ diff -urNp linux-2.6.38.4/kernel/padata.c linux-2.6.38.4/kernel/padata.c
  	atomic_set(&pd->reorder_objects, 0);
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
-diff -urNp linux-2.6.38.4/kernel/panic.c linux-2.6.38.4/kernel/panic.c
---- linux-2.6.38.4/kernel/panic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/panic.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/panic.c linux-2.6.38.6/kernel/panic.c
+--- linux-2.6.38.6/kernel/panic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/panic.c	2011-04-28 19:34:15.000000000 -0400
 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
@@ -57099,9 +57319,9 @@ diff -urNp linux-2.6.38.4/kernel/panic.c linux-2.6.38.4/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.38.4/kernel/perf_event.c linux-2.6.38.4/kernel/perf_event.c
---- linux-2.6.38.4/kernel/perf_event.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/kernel/perf_event.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/perf_event.c linux-2.6.38.6/kernel/perf_event.c
+--- linux-2.6.38.6/kernel/perf_event.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/kernel/perf_event.c	2011-04-28 19:57:25.000000000 -0400
 @@ -70,7 +70,7 @@ int sysctl_perf_event_mlock __read_mostl
   */
  int sysctl_perf_event_sample_rate __read_mostly = 100000;
@@ -57182,9 +57402,9 @@ diff -urNp linux-2.6.38.4/kernel/perf_event.c linux-2.6.38.4/kernel/perf_event.c
  		     &parent_event->child_total_time_running);
  
  	/*
-diff -urNp linux-2.6.38.4/kernel/pid.c linux-2.6.38.4/kernel/pid.c
---- linux-2.6.38.4/kernel/pid.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/kernel/pid.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/pid.c linux-2.6.38.6/kernel/pid.c
+--- linux-2.6.38.6/kernel/pid.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/kernel/pid.c	2011-04-28 19:34:15.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -57219,9 +57439,9 @@ diff -urNp linux-2.6.38.4/kernel/pid.c linux-2.6.38.4/kernel/pid.c
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.38.4/kernel/posix-cpu-timers.c linux-2.6.38.4/kernel/posix-cpu-timers.c
---- linux-2.6.38.4/kernel/posix-cpu-timers.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/posix-cpu-timers.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/posix-cpu-timers.c linux-2.6.38.6/kernel/posix-cpu-timers.c
+--- linux-2.6.38.6/kernel/posix-cpu-timers.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/posix-cpu-timers.c	2011-04-28 19:34:15.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -57230,9 +57450,9 @@ diff -urNp linux-2.6.38.4/kernel/posix-cpu-timers.c linux-2.6.38.4/kernel/posix-
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-diff -urNp linux-2.6.38.4/kernel/posix-timers.c linux-2.6.38.4/kernel/posix-timers.c
---- linux-2.6.38.4/kernel/posix-timers.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/posix-timers.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/posix-timers.c linux-2.6.38.6/kernel/posix-timers.c
+--- linux-2.6.38.6/kernel/posix-timers.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/posix-timers.c	2011-04-28 19:34:15.000000000 -0400
 @@ -42,6 +42,7 @@
  #include <linux/compiler.h>
  #include <linux/idr.h>
@@ -57255,9 +57475,9 @@ diff -urNp linux-2.6.38.4/kernel/posix-timers.c linux-2.6.38.4/kernel/posix-time
  	return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
  }
  
-diff -urNp linux-2.6.38.4/kernel/power/poweroff.c linux-2.6.38.4/kernel/power/poweroff.c
---- linux-2.6.38.4/kernel/power/poweroff.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/power/poweroff.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/power/poweroff.c linux-2.6.38.6/kernel/power/poweroff.c
+--- linux-2.6.38.6/kernel/power/poweroff.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/power/poweroff.c	2011-04-28 19:34:15.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
@@ -57267,9 +57487,9 @@ diff -urNp linux-2.6.38.4/kernel/power/poweroff.c linux-2.6.38.4/kernel/power/po
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-2.6.38.4/kernel/power/process.c linux-2.6.38.4/kernel/power/process.c
---- linux-2.6.38.4/kernel/power/process.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/power/process.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/power/process.c linux-2.6.38.6/kernel/power/process.c
+--- linux-2.6.38.6/kernel/power/process.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/power/process.c	2011-04-28 19:34:15.000000000 -0400
 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
  	u64 elapsed_csecs64;
  	unsigned int elapsed_csecs;
@@ -57312,9 +57532,9 @@ diff -urNp linux-2.6.38.4/kernel/power/process.c linux-2.6.38.4/kernel/power/pro
  			break;
  
  		if (pm_wakeup_pending()) {
-diff -urNp linux-2.6.38.4/kernel/printk.c linux-2.6.38.4/kernel/printk.c
---- linux-2.6.38.4/kernel/printk.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/printk.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/printk.c linux-2.6.38.6/kernel/printk.c
+--- linux-2.6.38.6/kernel/printk.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/printk.c	2011-04-28 19:34:15.000000000 -0400
 @@ -279,12 +279,17 @@ static int check_syslog_permissions(int 
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
@@ -57334,9 +57554,9 @@ diff -urNp linux-2.6.38.4/kernel/printk.c linux-2.6.38.4/kernel/printk.c
  				 "but no CAP_SYSLOG (deprecated).\n");
  			return 0;
  		}
-diff -urNp linux-2.6.38.4/kernel/profile.c linux-2.6.38.4/kernel/profile.c
---- linux-2.6.38.4/kernel/profile.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/profile.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/profile.c linux-2.6.38.6/kernel/profile.c
+--- linux-2.6.38.6/kernel/profile.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/profile.c	2011-04-28 19:57:25.000000000 -0400
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -57394,9 +57614,9 @@ diff -urNp linux-2.6.38.4/kernel/profile.c linux-2.6.38.4/kernel/profile.c
  	return count;
  }
  
-diff -urNp linux-2.6.38.4/kernel/ptrace.c linux-2.6.38.4/kernel/ptrace.c
---- linux-2.6.38.4/kernel/ptrace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/ptrace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/ptrace.c linux-2.6.38.6/kernel/ptrace.c
+--- linux-2.6.38.6/kernel/ptrace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/ptrace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -116,7 +116,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
@@ -57538,9 +57758,9 @@ diff -urNp linux-2.6.38.4/kernel/ptrace.c linux-2.6.38.4/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-2.6.38.4/kernel/rcutorture.c linux-2.6.38.4/kernel/rcutorture.c
---- linux-2.6.38.4/kernel/rcutorture.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rcutorture.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/rcutorture.c linux-2.6.38.6/kernel/rcutorture.c
+--- linux-2.6.38.6/kernel/rcutorture.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/rcutorture.c	2011-04-28 19:57:25.000000000 -0400
 @@ -139,12 +139,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
  	{ 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -57705,9 +57925,9 @@ diff -urNp linux-2.6.38.4/kernel/rcutorture.c linux-2.6.38.4/kernel/rcutorture.c
  	for_each_possible_cpu(cpu) {
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-2.6.38.4/kernel/rcutree.c linux-2.6.38.4/kernel/rcutree.c
---- linux-2.6.38.4/kernel/rcutree.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rcutree.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/rcutree.c linux-2.6.38.6/kernel/rcutree.c
+--- linux-2.6.38.6/kernel/rcutree.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/rcutree.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
@@ -57717,9 +57937,9 @@ diff -urNp linux-2.6.38.4/kernel/rcutree.c linux-2.6.38.4/kernel/rcutree.c
  {
  	/*
  	 * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.38.4/kernel/rcutree_plugin.h linux-2.6.38.4/kernel/rcutree_plugin.h
---- linux-2.6.38.4/kernel/rcutree_plugin.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rcutree_plugin.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/rcutree_plugin.h linux-2.6.38.6/kernel/rcutree_plugin.h
+--- linux-2.6.38.6/kernel/rcutree_plugin.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/rcutree_plugin.h	2011-04-28 19:57:25.000000000 -0400
 @@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
@@ -57782,9 +58002,9 @@ diff -urNp linux-2.6.38.4/kernel/rcutree_plugin.h linux-2.6.38.4/kernel/rcutree_
  
  	put_online_cpus();
  }
-diff -urNp linux-2.6.38.4/kernel/resource.c linux-2.6.38.4/kernel/resource.c
---- linux-2.6.38.4/kernel/resource.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/resource.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/resource.c linux-2.6.38.6/kernel/resource.c
+--- linux-2.6.38.6/kernel/resource.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/resource.c	2011-04-28 19:34:15.000000000 -0400
 @@ -133,8 +133,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -57804,9 +58024,9 @@ diff -urNp linux-2.6.38.4/kernel/resource.c linux-2.6.38.4/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.38.4/kernel/rtmutex.c linux-2.6.38.4/kernel/rtmutex.c
---- linux-2.6.38.4/kernel/rtmutex.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rtmutex.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/rtmutex.c linux-2.6.38.6/kernel/rtmutex.c
+--- linux-2.6.38.6/kernel/rtmutex.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/rtmutex.c	2011-04-28 19:34:15.000000000 -0400
 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
  	 */
  	raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -57816,9 +58036,9 @@ diff -urNp linux-2.6.38.4/kernel/rtmutex.c linux-2.6.38.4/kernel/rtmutex.c
  	WARN_ON(pendowner->pi_blocked_on != waiter);
  	WARN_ON(pendowner->pi_blocked_on->lock != lock);
  
-diff -urNp linux-2.6.38.4/kernel/rtmutex-tester.c linux-2.6.38.4/kernel/rtmutex-tester.c
---- linux-2.6.38.4/kernel/rtmutex-tester.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/rtmutex-tester.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/rtmutex-tester.c linux-2.6.38.6/kernel/rtmutex-tester.c
+--- linux-2.6.38.6/kernel/rtmutex-tester.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/rtmutex-tester.c	2011-04-28 19:57:25.000000000 -0400
 @@ -21,7 +21,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
@@ -57909,9 +58129,9 @@ diff -urNp linux-2.6.38.4/kernel/rtmutex-tester.c linux-2.6.38.4/kernel/rtmutex-
  		return;
  
  	case RTTEST_LOCKBKL:
-diff -urNp linux-2.6.38.4/kernel/sched_autogroup.c linux-2.6.38.4/kernel/sched_autogroup.c
---- linux-2.6.38.4/kernel/sched_autogroup.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/sched_autogroup.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/sched_autogroup.c linux-2.6.38.6/kernel/sched_autogroup.c
+--- linux-2.6.38.6/kernel/sched_autogroup.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/sched_autogroup.c	2011-04-28 19:57:25.000000000 -0400
 @@ -7,7 +7,7 @@
  
  unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -57930,9 +58150,9 @@ diff -urNp linux-2.6.38.4/kernel/sched_autogroup.c linux-2.6.38.4/kernel/sched_a
  	ag->tg = tg;
  #ifdef CONFIG_RT_GROUP_SCHED
  	/*
-diff -urNp linux-2.6.38.4/kernel/sched.c linux-2.6.38.4/kernel/sched.c
---- linux-2.6.38.4/kernel/sched.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/kernel/sched.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/sched.c linux-2.6.38.6/kernel/sched.c
+--- linux-2.6.38.6/kernel/sched.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/kernel/sched.c	2011-04-28 19:34:15.000000000 -0400
 @@ -4024,7 +4024,7 @@ EXPORT_SYMBOL(schedule);
   * Look out! "owner" is an entirely speculative pointer
   * access and not reliable.
@@ -58000,9 +58220,9 @@ diff -urNp linux-2.6.38.4/kernel/sched.c linux-2.6.38.4/kernel/sched.c
  
  	if (cpu != group_first_cpu(sd->groups))
  		return;
-diff -urNp linux-2.6.38.4/kernel/sched_fair.c linux-2.6.38.4/kernel/sched_fair.c
---- linux-2.6.38.4/kernel/sched_fair.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/kernel/sched_fair.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/sched_fair.c linux-2.6.38.6/kernel/sched_fair.c
+--- linux-2.6.38.6/kernel/sched_fair.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/kernel/sched_fair.c	2011-04-28 19:34:15.000000000 -0400
 @@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_c
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
@@ -58012,9 +58232,9 @@ diff -urNp linux-2.6.38.4/kernel/sched_fair.c linux-2.6.38.4/kernel/sched_fair.c
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-2.6.38.4/kernel/signal.c linux-2.6.38.4/kernel/signal.c
---- linux-2.6.38.4/kernel/signal.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/kernel/signal.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/signal.c linux-2.6.38.6/kernel/signal.c
+--- linux-2.6.38.6/kernel/signal.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/kernel/signal.c	2011-04-28 19:34:15.000000000 -0400
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -58117,9 +58337,9 @@ diff -urNp linux-2.6.38.4/kernel/signal.c linux-2.6.38.4/kernel/signal.c
  
  	return ret;
  }
-diff -urNp linux-2.6.38.4/kernel/smp.c linux-2.6.38.4/kernel/smp.c
---- linux-2.6.38.4/kernel/smp.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/kernel/smp.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/smp.c linux-2.6.38.6/kernel/smp.c
+--- linux-2.6.38.6/kernel/smp.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/kernel/smp.c	2011-04-28 19:34:15.000000000 -0400
 @@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -58147,9 +58367,9 @@ diff -urNp linux-2.6.38.4/kernel/smp.c linux-2.6.38.4/kernel/smp.c
  {
  	raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.38.4/kernel/softirq.c linux-2.6.38.4/kernel/softirq.c
---- linux-2.6.38.4/kernel/softirq.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/softirq.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/softirq.c linux-2.6.38.6/kernel/softirq.c
+--- linux-2.6.38.6/kernel/softirq.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/softirq.c	2011-04-28 19:34:15.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -58204,9 +58424,9 @@ diff -urNp linux-2.6.38.4/kernel/softirq.c linux-2.6.38.4/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-2.6.38.4/kernel/sys.c linux-2.6.38.4/kernel/sys.c
---- linux-2.6.38.4/kernel/sys.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/sys.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/sys.c linux-2.6.38.6/kernel/sys.c
+--- linux-2.6.38.6/kernel/sys.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/sys.c	2011-04-28 19:34:15.000000000 -0400
 @@ -136,6 +136,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
@@ -58328,9 +58548,9 @@ diff -urNp linux-2.6.38.4/kernel/sys.c linux-2.6.38.4/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-2.6.38.4/kernel/sysctl.c linux-2.6.38.4/kernel/sysctl.c
---- linux-2.6.38.4/kernel/sysctl.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/kernel/sysctl.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/sysctl.c linux-2.6.38.6/kernel/sysctl.c
+--- linux-2.6.38.6/kernel/sysctl.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/kernel/sysctl.c	2011-04-28 19:34:15.000000000 -0400
 @@ -84,6 +84,13 @@
  
  
@@ -58519,9 +58739,9 @@ diff -urNp linux-2.6.38.4/kernel/sysctl.c linux-2.6.38.4/kernel/sysctl.c
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-2.6.38.4/kernel/sysctl_check.c linux-2.6.38.4/kernel/sysctl_check.c
---- linux-2.6.38.4/kernel/sysctl_check.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/sysctl_check.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/sysctl_check.c linux-2.6.38.6/kernel/sysctl_check.c
+--- linux-2.6.38.6/kernel/sysctl_check.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/sysctl_check.c	2011-04-28 19:34:15.000000000 -0400
 @@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *n
  				set_fail(&fail, table, "Directory with extra2");
  		} else {
@@ -58530,9 +58750,9 @@ diff -urNp linux-2.6.38.4/kernel/sysctl_check.c linux-2.6.38.4/kernel/sysctl_che
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.38.4/kernel/taskstats.c linux-2.6.38.4/kernel/taskstats.c
---- linux-2.6.38.4/kernel/taskstats.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/taskstats.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/taskstats.c linux-2.6.38.6/kernel/taskstats.c
+--- linux-2.6.38.6/kernel/taskstats.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/taskstats.c	2011-04-28 19:34:15.000000000 -0400
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -58556,9 +58776,9 @@ diff -urNp linux-2.6.38.4/kernel/taskstats.c linux-2.6.38.4/kernel/taskstats.c
  	if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
  		return cmd_attr_register_cpumask(info);
  	else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff -urNp linux-2.6.38.4/kernel/time/tick-broadcast.c linux-2.6.38.4/kernel/time/tick-broadcast.c
---- linux-2.6.38.4/kernel/time/tick-broadcast.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/tick-broadcast.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/time/tick-broadcast.c linux-2.6.38.6/kernel/time/tick-broadcast.c
+--- linux-2.6.38.6/kernel/time/tick-broadcast.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/time/tick-broadcast.c	2011-04-28 19:34:15.000000000 -0400
 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
@@ -58568,9 +58788,9 @@ diff -urNp linux-2.6.38.4/kernel/time/tick-broadcast.c linux-2.6.38.4/kernel/tim
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.38.4/kernel/time/timekeeping.c linux-2.6.38.4/kernel/time/timekeeping.c
---- linux-2.6.38.4/kernel/time/timekeeping.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/timekeeping.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/time/timekeeping.c linux-2.6.38.6/kernel/time/timekeeping.c
+--- linux-2.6.38.6/kernel/time/timekeeping.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/time/timekeeping.c	2011-04-28 19:34:15.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -58588,9 +58808,9 @@ diff -urNp linux-2.6.38.4/kernel/time/timekeeping.c linux-2.6.38.4/kernel/time/t
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-2.6.38.4/kernel/time/timer_list.c linux-2.6.38.4/kernel/time/timer_list.c
---- linux-2.6.38.4/kernel/time/timer_list.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/timer_list.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/time/timer_list.c linux-2.6.38.6/kernel/time/timer_list.c
+--- linux-2.6.38.6/kernel/time/timer_list.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/time/timer_list.c	2011-04-28 19:34:15.000000000 -0400
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -58632,9 +58852,9 @@ diff -urNp linux-2.6.38.4/kernel/time/timer_list.c linux-2.6.38.4/kernel/time/ti
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.38.4/kernel/time/timer_stats.c linux-2.6.38.4/kernel/time/timer_stats.c
---- linux-2.6.38.4/kernel/time/timer_stats.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time/timer_stats.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/time/timer_stats.c linux-2.6.38.6/kernel/time/timer_stats.c
+--- linux-2.6.38.6/kernel/time/timer_stats.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/time/timer_stats.c	2011-04-28 19:57:25.000000000 -0400
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -58703,9 +58923,9 @@ diff -urNp linux-2.6.38.4/kernel/time/timer_stats.c linux-2.6.38.4/kernel/time/t
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.38.4/kernel/time.c linux-2.6.38.4/kernel/time.c
---- linux-2.6.38.4/kernel/time.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/time.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/time.c linux-2.6.38.6/kernel/time.c
+--- linux-2.6.38.6/kernel/time.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/time.c	2011-04-28 19:34:15.000000000 -0400
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec 
  		return error;
  
@@ -58718,9 +58938,9 @@ diff -urNp linux-2.6.38.4/kernel/time.c linux-2.6.38.4/kernel/time.c
  		/* SMP safe, global irq locking makes it work. */
  		sys_tz = *tz;
  		update_vsyscall_tz();
-diff -urNp linux-2.6.38.4/kernel/timer.c linux-2.6.38.4/kernel/timer.c
---- linux-2.6.38.4/kernel/timer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/timer.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/timer.c linux-2.6.38.6/kernel/timer.c
+--- linux-2.6.38.6/kernel/timer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/timer.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1276,7 +1276,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -58730,9 +58950,9 @@ diff -urNp linux-2.6.38.4/kernel/timer.c linux-2.6.38.4/kernel/timer.c
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-2.6.38.4/kernel/trace/blktrace.c linux-2.6.38.4/kernel/trace/blktrace.c
---- linux-2.6.38.4/kernel/trace/blktrace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/blktrace.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/blktrace.c linux-2.6.38.6/kernel/trace/blktrace.c
+--- linux-2.6.38.6/kernel/trace/blktrace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/blktrace.c	2011-04-28 19:57:25.000000000 -0400
 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
  	struct blk_trace *bt = filp->private_data;
  	char buf[16];
@@ -58760,9 +58980,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/blktrace.c linux-2.6.38.4/kernel/trace/bl
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-2.6.38.4/kernel/trace/ftrace.c linux-2.6.38.4/kernel/trace/ftrace.c
---- linux-2.6.38.4/kernel/trace/ftrace.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/ftrace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/ftrace.c linux-2.6.38.6/kernel/trace/ftrace.c
+--- linux-2.6.38.6/kernel/trace/ftrace.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/ftrace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, 
  
  	ip = rec->ip;
@@ -58784,9 +59004,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/ftrace.c linux-2.6.38.4/kernel/trace/ftra
  }
  
  /*
-diff -urNp linux-2.6.38.4/kernel/trace/ring_buffer.c linux-2.6.38.4/kernel/trace/ring_buffer.c
---- linux-2.6.38.4/kernel/trace/ring_buffer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/ring_buffer.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/ring_buffer.c linux-2.6.38.6/kernel/trace/ring_buffer.c
+--- linux-2.6.38.6/kernel/trace/ring_buffer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/ring_buffer.c	2011-04-28 19:34:15.000000000 -0400
 @@ -669,7 +669,7 @@ static struct list_head *rb_list_head(st
   * the reader page). But if the next page is a header page,
   * its flags will be non zero.
@@ -58796,9 +59016,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/ring_buffer.c linux-2.6.38.4/kernel/trace
  rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
  		struct buffer_page *page, struct list_head *list)
  {
-diff -urNp linux-2.6.38.4/kernel/trace/trace.c linux-2.6.38.4/kernel/trace/trace.c
---- linux-2.6.38.4/kernel/trace/trace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/trace.c linux-2.6.38.6/kernel/trace/trace.c
+--- linux-2.6.38.6/kernel/trace/trace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/trace.c	2011-04-28 19:34:15.000000000 -0400
 @@ -3967,10 +3967,9 @@ static const struct file_operations trac
  };
  #endif
@@ -58823,9 +59043,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/trace.c linux-2.6.38.4/kernel/trace/trace
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-2.6.38.4/kernel/trace/trace_events.c linux-2.6.38.4/kernel/trace/trace_events.c
---- linux-2.6.38.4/kernel/trace/trace_events.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_events.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/trace_events.c linux-2.6.38.6/kernel/trace/trace_events.c
+--- linux-2.6.38.6/kernel/trace/trace_events.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/trace_events.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
  	struct list_head		list;
@@ -58841,9 +59061,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/trace_events.c linux-2.6.38.4/kernel/trac
  };
  
  static struct ftrace_module_file_ops *
-diff -urNp linux-2.6.38.4/kernel/trace/trace_mmiotrace.c linux-2.6.38.4/kernel/trace/trace_mmiotrace.c
---- linux-2.6.38.4/kernel/trace/trace_mmiotrace.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_mmiotrace.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/trace_mmiotrace.c linux-2.6.38.6/kernel/trace/trace_mmiotrace.c
+--- linux-2.6.38.6/kernel/trace/trace_mmiotrace.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/trace_mmiotrace.c	2011-04-28 19:57:25.000000000 -0400
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -58880,9 +59100,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/trace_mmiotrace.c linux-2.6.38.4/kernel/t
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff -urNp linux-2.6.38.4/kernel/trace/trace_output.c linux-2.6.38.4/kernel/trace/trace_output.c
---- linux-2.6.38.4/kernel/trace/trace_output.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_output.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/trace_output.c linux-2.6.38.6/kernel/trace/trace_output.c
+--- linux-2.6.38.6/kernel/trace/trace_output.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/trace_output.c	2011-04-28 19:34:15.000000000 -0400
 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -58892,9 +59112,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/trace_output.c linux-2.6.38.4/kernel/trac
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-2.6.38.4/kernel/trace/trace_stack.c linux-2.6.38.4/kernel/trace/trace_stack.c
---- linux-2.6.38.4/kernel/trace/trace_stack.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_stack.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/trace_stack.c linux-2.6.38.6/kernel/trace/trace_stack.c
+--- linux-2.6.38.6/kernel/trace/trace_stack.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/trace_stack.c	2011-04-28 19:34:15.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -58904,9 +59124,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/trace_stack.c linux-2.6.38.4/kernel/trace
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.38.4/kernel/trace/trace_workqueue.c linux-2.6.38.4/kernel/trace/trace_workqueue.c
---- linux-2.6.38.4/kernel/trace/trace_workqueue.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/kernel/trace/trace_workqueue.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/kernel/trace/trace_workqueue.c linux-2.6.38.6/kernel/trace/trace_workqueue.c
+--- linux-2.6.38.6/kernel/trace/trace_workqueue.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/kernel/trace/trace_workqueue.c	2011-04-28 19:34:15.000000000 -0400
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -58934,9 +59154,9 @@ diff -urNp linux-2.6.38.4/kernel/trace/trace_workqueue.c linux-2.6.38.4/kernel/t
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-2.6.38.4/lib/bug.c linux-2.6.38.4/lib/bug.c
---- linux-2.6.38.4/lib/bug.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/bug.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/bug.c linux-2.6.38.6/lib/bug.c
+--- linux-2.6.38.6/lib/bug.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/lib/bug.c	2011-04-28 19:34:15.000000000 -0400
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
@@ -58946,9 +59166,9 @@ diff -urNp linux-2.6.38.4/lib/bug.c linux-2.6.38.4/lib/bug.c
  
  	file = NULL;
  	line = 0;
-diff -urNp linux-2.6.38.4/lib/debugobjects.c linux-2.6.38.4/lib/debugobjects.c
---- linux-2.6.38.4/lib/debugobjects.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/debugobjects.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/debugobjects.c linux-2.6.38.6/lib/debugobjects.c
+--- linux-2.6.38.6/lib/debugobjects.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/lib/debugobjects.c	2011-04-28 19:34:15.000000000 -0400
 @@ -281,7 +281,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
@@ -58958,9 +59178,9 @@ diff -urNp linux-2.6.38.4/lib/debugobjects.c linux-2.6.38.4/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-2.6.38.4/lib/dma-debug.c linux-2.6.38.4/lib/dma-debug.c
---- linux-2.6.38.4/lib/dma-debug.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/dma-debug.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/dma-debug.c linux-2.6.38.6/lib/dma-debug.c
+--- linux-2.6.38.6/lib/dma-debug.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/lib/dma-debug.c	2011-04-28 19:34:15.000000000 -0400
 @@ -862,7 +862,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -58970,9 +59190,9 @@ diff -urNp linux-2.6.38.4/lib/dma-debug.c linux-2.6.38.4/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.38.4/lib/inflate.c linux-2.6.38.4/lib/inflate.c
---- linux-2.6.38.4/lib/inflate.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/inflate.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/inflate.c linux-2.6.38.6/lib/inflate.c
+--- linux-2.6.38.6/lib/inflate.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/lib/inflate.c	2011-04-28 19:34:15.000000000 -0400
 @@ -269,7 +269,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -58982,9 +59202,9 @@ diff -urNp linux-2.6.38.4/lib/inflate.c linux-2.6.38.4/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.38.4/lib/Kconfig.debug linux-2.6.38.4/lib/Kconfig.debug
---- linux-2.6.38.4/lib/Kconfig.debug	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/lib/Kconfig.debug	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/Kconfig.debug linux-2.6.38.6/lib/Kconfig.debug
+--- linux-2.6.38.6/lib/Kconfig.debug	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/lib/Kconfig.debug	2011-04-28 19:34:15.000000000 -0400
 @@ -1066,6 +1066,7 @@ config LATENCYTOP
  	depends on DEBUG_KERNEL
  	depends on STACKTRACE_SUPPORT
@@ -58993,9 +59213,9 @@ diff -urNp linux-2.6.38.4/lib/Kconfig.debug linux-2.6.38.4/lib/Kconfig.debug
  	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
  	select KALLSYMS
  	select KALLSYMS_ALL
-diff -urNp linux-2.6.38.4/lib/kref.c linux-2.6.38.4/lib/kref.c
---- linux-2.6.38.4/lib/kref.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/kref.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/kref.c linux-2.6.38.6/lib/kref.c
+--- linux-2.6.38.6/lib/kref.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/lib/kref.c	2011-04-28 19:34:15.000000000 -0400
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -59005,9 +59225,9 @@ diff -urNp linux-2.6.38.4/lib/kref.c linux-2.6.38.4/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.38.4/lib/radix-tree.c linux-2.6.38.4/lib/radix-tree.c
---- linux-2.6.38.4/lib/radix-tree.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/lib/radix-tree.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/radix-tree.c linux-2.6.38.6/lib/radix-tree.c
+--- linux-2.6.38.6/lib/radix-tree.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/lib/radix-tree.c	2011-04-28 19:34:15.000000000 -0400
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -59017,9 +59237,9 @@ diff -urNp linux-2.6.38.4/lib/radix-tree.c linux-2.6.38.4/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-2.6.38.4/lib/vsprintf.c linux-2.6.38.4/lib/vsprintf.c
---- linux-2.6.38.4/lib/vsprintf.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/lib/vsprintf.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/lib/vsprintf.c linux-2.6.38.6/lib/vsprintf.c
+--- linux-2.6.38.6/lib/vsprintf.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/lib/vsprintf.c	2011-04-28 19:34:15.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -59113,14 +59333,14 @@ diff -urNp linux-2.6.38.4/lib/vsprintf.c linux-2.6.38.4/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-2.6.38.4/localversion-grsec linux-2.6.38.4/localversion-grsec
---- linux-2.6.38.4/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/localversion-grsec	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/localversion-grsec linux-2.6.38.6/localversion-grsec
+--- linux-2.6.38.6/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/localversion-grsec	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.38.4/Makefile linux-2.6.38.4/Makefile
---- linux-2.6.38.4/Makefile	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/Makefile	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/Makefile linux-2.6.38.6/Makefile
+--- linux-2.6.38.6/Makefile	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/Makefile	2011-05-10 22:08:57.000000000 -0400
 @@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -59149,9 +59369,9 @@ diff -urNp linux-2.6.38.4/Makefile linux-2.6.38.4/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.38.4/mm/bootmem.c linux-2.6.38.4/mm/bootmem.c
---- linux-2.6.38.4/mm/bootmem.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/bootmem.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/bootmem.c linux-2.6.38.6/mm/bootmem.c
+--- linux-2.6.38.6/mm/bootmem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/bootmem.c	2011-04-28 19:34:15.000000000 -0400
 @@ -201,19 +201,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
@@ -59185,9 +59405,9 @@ diff -urNp linux-2.6.38.4/mm/bootmem.c linux-2.6.38.4/mm/bootmem.c
  
  	return count;
  }
-diff -urNp linux-2.6.38.4/mm/filemap.c linux-2.6.38.4/mm/filemap.c
---- linux-2.6.38.4/mm/filemap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/filemap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/filemap.c linux-2.6.38.6/mm/filemap.c
+--- linux-2.6.38.6/mm/filemap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/filemap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
@@ -59205,9 +59425,9 @@ diff -urNp linux-2.6.38.4/mm/filemap.c linux-2.6.38.4/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-2.6.38.4/mm/fremap.c linux-2.6.38.4/mm/fremap.c
---- linux-2.6.38.4/mm/fremap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/fremap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/fremap.c linux-2.6.38.6/mm/fremap.c
+--- linux-2.6.38.6/mm/fremap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/fremap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
@@ -59229,9 +59449,9 @@ diff -urNp linux-2.6.38.4/mm/fremap.c linux-2.6.38.4/mm/fremap.c
  		munlock_vma_pages_range(vma, start, start + size);
  		vma->vm_flags = saved_flags;
  	}
-diff -urNp linux-2.6.38.4/mm/highmem.c linux-2.6.38.4/mm/highmem.c
---- linux-2.6.38.4/mm/highmem.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/highmem.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/highmem.c linux-2.6.38.6/mm/highmem.c
+--- linux-2.6.38.6/mm/highmem.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/highmem.c	2011-04-28 19:34:15.000000000 -0400
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -59257,9 +59477,9 @@ diff -urNp linux-2.6.38.4/mm/highmem.c linux-2.6.38.4/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.38.4/mm/huge_memory.c linux-2.6.38.4/mm/huge_memory.c
---- linux-2.6.38.4/mm/huge_memory.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/huge_memory.c	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/huge_memory.c linux-2.6.38.6/mm/huge_memory.c
+--- linux-2.6.38.6/mm/huge_memory.c	2011-05-10 22:06:27.000000000 -0400
++++ linux-2.6.38.6/mm/huge_memory.c	2011-05-10 22:06:56.000000000 -0400
 @@ -698,7 +698,7 @@ out:
  	 * run pte_offset_map on the pmd, if an huge pmd could
  	 * materialize from under us from a different thread.
@@ -59269,9 +59489,9 @@ diff -urNp linux-2.6.38.4/mm/huge_memory.c linux-2.6.38.4/mm/huge_memory.c
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-diff -urNp linux-2.6.38.4/mm/hugetlb.c linux-2.6.38.4/mm/hugetlb.c
---- linux-2.6.38.4/mm/hugetlb.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/hugetlb.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/hugetlb.c linux-2.6.38.6/mm/hugetlb.c
+--- linux-2.6.38.6/mm/hugetlb.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/hugetlb.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
@@ -59361,9 +59581,9 @@ diff -urNp linux-2.6.38.4/mm/hugetlb.c linux-2.6.38.4/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-2.6.38.4/mm/Kconfig linux-2.6.38.4/mm/Kconfig
---- linux-2.6.38.4/mm/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/Kconfig linux-2.6.38.6/mm/Kconfig
+--- linux-2.6.38.6/mm/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/Kconfig	2011-04-28 19:34:15.000000000 -0400
 @@ -240,7 +240,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -59373,9 +59593,9 @@ diff -urNp linux-2.6.38.4/mm/Kconfig linux-2.6.38.4/mm/Kconfig
          help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.38.4/mm/kmemleak.c linux-2.6.38.4/mm/kmemleak.c
---- linux-2.6.38.4/mm/kmemleak.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/kmemleak.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/kmemleak.c linux-2.6.38.6/mm/kmemleak.c
+--- linux-2.6.38.6/mm/kmemleak.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/kmemleak.c	2011-04-28 19:34:15.000000000 -0400
 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
@@ -59385,9 +59605,9 @@ diff -urNp linux-2.6.38.4/mm/kmemleak.c linux-2.6.38.4/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-2.6.38.4/mm/maccess.c linux-2.6.38.4/mm/maccess.c
---- linux-2.6.38.4/mm/maccess.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/maccess.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/maccess.c linux-2.6.38.6/mm/maccess.c
+--- linux-2.6.38.6/mm/maccess.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/maccess.c	2011-04-28 19:34:15.000000000 -0400
 @@ -15,10 +15,10 @@
   * happens, handle that and return -EFAULT.
   */
@@ -59414,9 +59634,9 @@ diff -urNp linux-2.6.38.4/mm/maccess.c linux-2.6.38.4/mm/maccess.c
  {
  	long ret;
  	mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.38.4/mm/madvise.c linux-2.6.38.4/mm/madvise.c
---- linux-2.6.38.4/mm/madvise.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/madvise.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/madvise.c linux-2.6.38.6/mm/madvise.c
+--- linux-2.6.38.6/mm/madvise.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/madvise.c	2011-04-28 19:34:15.000000000 -0400
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
@@ -59493,9 +59713,9 @@ diff -urNp linux-2.6.38.4/mm/madvise.c linux-2.6.38.4/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
---- linux-2.6.38.4/mm/memory.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/memory.c	2011-05-02 19:07:09.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/memory.c linux-2.6.38.6/mm/memory.c
+--- linux-2.6.38.6/mm/memory.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/mm/memory.c	2011-05-10 22:09:01.000000000 -0400
 @@ -259,8 +259,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -59558,21 +59778,20 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  		    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
  		    !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1502,13 +1502,6 @@ int __get_user_pages(struct task_struct 
+@@ -1502,12 +1502,6 @@ int __get_user_pages(struct task_struct 
  			continue;
  		}
  
 -		/*
--		 * If we don't actually want the page itself,
--		 * and it's the stack guard page, just skip it.
+-		 * For mlock, just skip the stack guard page.
 -		 */
--		if (!pages && stack_guard_page(vma, start))
+-		if ((gup_flags & FOLL_MLOCK) && stack_guard_page(vma, start))
 -			goto next_page;
 -
  		do {
  			struct page *page;
  			unsigned int foll_flags = gup_flags;
-@@ -1585,7 +1578,7 @@ next_page:
+@@ -1584,7 +1578,7 @@ next_page:
  			start += PAGE_SIZE;
  			nr_pages--;
  		} while (nr_pages && start < vma->vm_end);
@@ -59581,7 +59800,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	return i;
  }
  
-@@ -1734,6 +1727,10 @@ static int insert_page(struct vm_area_st
+@@ -1733,6 +1727,10 @@ static int insert_page(struct vm_area_st
  	page_add_file_rmap(page);
  	set_pte_at(mm, addr, pte, mk_pte(page, prot));
  
@@ -59592,7 +59811,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	retval = 0;
  	pte_unmap_unlock(pte, ptl);
  	return retval;
-@@ -1768,10 +1765,22 @@ out:
+@@ -1767,10 +1765,22 @@ out:
  int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
  			struct page *page)
  {
@@ -59615,7 +59834,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	vma->vm_flags |= VM_INSERTPAGE;
  	return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -1857,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struc
+@@ -1856,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struc
  			unsigned long pfn)
  {
  	BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -59623,7 +59842,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  
  	if (addr < vma->vm_start || addr >= vma->vm_end)
  		return -EFAULT;
-@@ -2172,6 +2182,186 @@ static inline void cow_user_page(struct 
+@@ -2171,6 +2182,186 @@ static inline void cow_user_page(struct 
  		copy_user_highpage(dst, src, va, vma);
  }
  
@@ -59810,7 +60029,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  /*
   * This routine handles present pages, when users try to write
   * to a shared page. It is done by copying the page to a new address
-@@ -2383,6 +2573,12 @@ gotten:
+@@ -2382,6 +2573,12 @@ gotten:
  	 */
  	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -59823,7 +60042,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  		if (old_page) {
  			if (!PageAnon(old_page)) {
  				dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2434,6 +2630,10 @@ gotten:
+@@ -2433,6 +2630,10 @@ gotten:
  			page_remove_rmap(old_page);
  		}
  
@@ -59834,7 +60053,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  		/* Free the old page.. */
  		new_page = old_page;
  		ret |= VM_FAULT_WRITE;
-@@ -2844,6 +3044,11 @@ static int do_swap_page(struct mm_struct
+@@ -2843,6 +3044,11 @@ static int do_swap_page(struct mm_struct
  	swap_free(entry);
  	if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
  		try_to_free_swap(page);
@@ -59846,7 +60065,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	unlock_page(page);
  	if (swapcache) {
  		/*
-@@ -2867,6 +3072,11 @@ static int do_swap_page(struct mm_struct
+@@ -2866,6 +3072,11 @@ static int do_swap_page(struct mm_struct
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -59858,7 +60077,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  out:
-@@ -2886,40 +3096,6 @@ out_release:
+@@ -2885,40 +3096,6 @@ out_release:
  }
  
  /*
@@ -59899,7 +60118,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
   * but allow concurrent faults), and pte mapped but not yet locked.
   * We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -2928,27 +3104,23 @@ static int do_anonymous_page(struct mm_s
+@@ -2927,27 +3104,23 @@ static int do_anonymous_page(struct mm_s
  		unsigned long address, pte_t *page_table, pmd_t *pmd,
  		unsigned int flags)
  {
@@ -59932,7 +60151,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	if (unlikely(anon_vma_prepare(vma)))
  		goto oom;
  	page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2967,6 +3139,11 @@ static int do_anonymous_page(struct mm_s
+@@ -2966,6 +3139,11 @@ static int do_anonymous_page(struct mm_s
  	if (!pte_none(*page_table))
  		goto release;
  
@@ -59944,7 +60163,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	inc_mm_counter_fast(mm, MM_ANONPAGES);
  	page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -2974,6 +3151,12 @@ setpte:
+@@ -2973,6 +3151,12 @@ setpte:
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -59957,7 +60176,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  	return 0;
-@@ -3111,6 +3294,12 @@ static int __do_fault(struct mm_struct *
+@@ -3110,6 +3294,12 @@ static int __do_fault(struct mm_struct *
  	 */
  	/* Only go through if we didn't race with anybody else... */
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -59970,7 +60189,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  		flush_icache_page(vma, page);
  		entry = mk_pte(page, vma->vm_page_prot);
  		if (flags & FAULT_FLAG_WRITE)
-@@ -3130,6 +3319,14 @@ static int __do_fault(struct mm_struct *
+@@ -3129,6 +3319,14 @@ static int __do_fault(struct mm_struct *
  
  		/* no need to invalidate: a not-present page won't be cached */
  		update_mmu_cache(vma, address, page_table);
@@ -59985,7 +60204,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	} else {
  		if (charged)
  			mem_cgroup_uncharge_page(page);
-@@ -3277,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *m
+@@ -3276,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *m
  		if (flags & FAULT_FLAG_WRITE)
  			flush_tlb_fix_spurious_fault(vma, address);
  	}
@@ -59998,7 +60217,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  unlock:
  	pte_unmap_unlock(pte, ptl);
  	return 0;
-@@ -3293,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3292,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm
  	pmd_t *pmd;
  	pte_t *pte;
  
@@ -60009,7 +60228,7 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	__set_current_state(TASK_RUNNING);
  
  	count_vm_event(PGFAULT);
-@@ -3303,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3302,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm
  	if (unlikely(is_vm_hugetlb_page(vma)))
  		return hugetlb_fault(mm, vma, address, flags);
  
@@ -60044,16 +60263,16 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	pgd = pgd_offset(mm, address);
  	pud = pud_alloc(mm, pgd, address);
  	if (!pud)
-@@ -3332,7 +3567,7 @@ int handle_mm_fault(struct mm_struct *mm
+@@ -3331,7 +3567,7 @@ int handle_mm_fault(struct mm_struct *mm
  	 * run pte_offset_map on the pmd, if an huge pmd could
  	 * materialize from under us from a different thread.
  	 */
--	if (unlikely(__pte_alloc(mm, vma, pmd, address)))
+-	if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
 +	if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-@@ -3436,7 +3671,7 @@ static int __init gate_vma_init(void)
+@@ -3435,7 +3671,7 @@ static int __init gate_vma_init(void)
  	gate_vma.vm_start = FIXADDR_USER_START;
  	gate_vma.vm_end = FIXADDR_USER_END;
  	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
@@ -60062,9 +60281,9 @@ diff -urNp linux-2.6.38.4/mm/memory.c linux-2.6.38.4/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.38.4/mm/memory-failure.c linux-2.6.38.4/mm/memory-failure.c
---- linux-2.6.38.4/mm/memory-failure.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/memory-failure.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/memory-failure.c linux-2.6.38.6/mm/memory-failure.c
+--- linux-2.6.38.6/mm/memory-failure.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/memory-failure.c	2011-04-28 19:34:15.000000000 -0400
 @@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -60137,9 +60356,9 @@ diff -urNp linux-2.6.38.4/mm/memory-failure.c linux-2.6.38.4/mm/memory-failure.c
  	SetPageHWPoison(page);
  	/* keep elevated page count for bad page */
  	return ret;
-diff -urNp linux-2.6.38.4/mm/mempolicy.c linux-2.6.38.4/mm/mempolicy.c
---- linux-2.6.38.4/mm/mempolicy.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/mempolicy.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/mempolicy.c linux-2.6.38.6/mm/mempolicy.c
+--- linux-2.6.38.6/mm/mempolicy.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/mempolicy.c	2011-04-28 19:34:15.000000000 -0400
 @@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct 
  	unsigned long vmstart;
  	unsigned long vmend;
@@ -60220,9 +60439,9 @@ diff -urNp linux-2.6.38.4/mm/mempolicy.c linux-2.6.38.4/mm/mempolicy.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.38.4/mm/migrate.c linux-2.6.38.4/mm/migrate.c
---- linux-2.6.38.4/mm/migrate.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/migrate.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/migrate.c linux-2.6.38.6/mm/migrate.c
+--- linux-2.6.38.6/mm/migrate.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/migrate.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1299,6 +1299,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
  	if (!mm)
  		return -EINVAL;
@@ -60248,9 +60467,9 @@ diff -urNp linux-2.6.38.4/mm/migrate.c linux-2.6.38.4/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
---- linux-2.6.38.4/mm/mlock.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/mlock.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/mlock.c linux-2.6.38.6/mm/mlock.c
+--- linux-2.6.38.6/mm/mlock.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/mm/mlock.c	2011-05-10 22:09:01.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -60259,7 +60478,7 @@ diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
  #include <linux/sched.h>
  #include <linux/module.h>
  #include <linux/rmap.h>
-@@ -380,6 +381,9 @@ static int do_mlock(unsigned long start,
+@@ -377,6 +378,9 @@ static int do_mlock(unsigned long start,
  		return -EINVAL;
  	if (end == start)
  		return 0;
@@ -60269,7 +60488,7 @@ diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
  	vma = find_vma_prev(current->mm, start, &prev);
  	if (!vma || vma->vm_start > start)
  		return -ENOMEM;
-@@ -390,6 +394,11 @@ static int do_mlock(unsigned long start,
+@@ -387,6 +391,11 @@ static int do_mlock(unsigned long start,
  	for (nstart = start ; ; ) {
  		unsigned int newflags;
  
@@ -60281,7 +60500,7 @@ diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
  		/* Here we know that  vma->vm_start <= nstart < vma->vm_end. */
  
  		newflags = vma->vm_flags | VM_LOCKED;
-@@ -495,6 +504,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -492,6 +501,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
  	lock_limit >>= PAGE_SHIFT;
  
  	/* check against resource limits */
@@ -60289,7 +60508,7 @@ diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
  	if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
  		error = do_mlock(start, len, 1);
  	up_write(&current->mm->mmap_sem);
-@@ -518,17 +528,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, 
+@@ -515,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, 
  static int do_mlockall(int flags)
  {
  	struct vm_area_struct * vma, * prev = NULL;
@@ -60317,7 +60536,7 @@ diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
  		newflags = vma->vm_flags | VM_LOCKED;
  		if (!(flags & MCL_CURRENT))
  			newflags &= ~VM_LOCKED;
-@@ -560,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -557,6 +573,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
  	lock_limit >>= PAGE_SHIFT;
  
  	ret = -ENOMEM;
@@ -60325,9 +60544,9 @@ diff -urNp linux-2.6.38.4/mm/mlock.c linux-2.6.38.4/mm/mlock.c
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-2.6.38.4/mm/mmap.c linux-2.6.38.4/mm/mmap.c
---- linux-2.6.38.4/mm/mmap.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/mm/mmap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/mmap.c linux-2.6.38.6/mm/mmap.c
+--- linux-2.6.38.6/mm/mmap.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/mm/mmap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -61589,9 +61808,9 @@ diff -urNp linux-2.6.38.4/mm/mmap.c linux-2.6.38.4/mm/mmap.c
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.38.4/mm/mprotect.c linux-2.6.38.4/mm/mprotect.c
---- linux-2.6.38.4/mm/mprotect.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/mprotect.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/mprotect.c linux-2.6.38.6/mm/mprotect.c
+--- linux-2.6.38.6/mm/mprotect.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/mprotect.c	2011-04-28 19:34:15.000000000 -0400
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -61818,9 +62037,9 @@ diff -urNp linux-2.6.38.4/mm/mprotect.c linux-2.6.38.4/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-2.6.38.4/mm/mremap.c linux-2.6.38.4/mm/mremap.c
---- linux-2.6.38.4/mm/mremap.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/mm/mremap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/mremap.c linux-2.6.38.6/mm/mremap.c
+--- linux-2.6.38.6/mm/mremap.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/mm/mremap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -61925,9 +62144,9 @@ diff -urNp linux-2.6.38.4/mm/mremap.c linux-2.6.38.4/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.38.4/mm/nommu.c linux-2.6.38.4/mm/nommu.c
---- linux-2.6.38.4/mm/nommu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/nommu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/nommu.c linux-2.6.38.6/mm/nommu.c
+--- linux-2.6.38.6/mm/nommu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/nommu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -61960,9 +62179,9 @@ diff -urNp linux-2.6.38.4/mm/nommu.c linux-2.6.38.4/mm/nommu.c
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-diff -urNp linux-2.6.38.4/mm/page_alloc.c linux-2.6.38.4/mm/page_alloc.c
---- linux-2.6.38.4/mm/page_alloc.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/page_alloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/page_alloc.c linux-2.6.38.6/mm/page_alloc.c
+--- linux-2.6.38.6/mm/page_alloc.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/mm/page_alloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -644,6 +644,10 @@ static bool free_pages_prepare(struct pa
  	int i;
  	int bad = 0;
@@ -61998,9 +62217,9 @@ diff -urNp linux-2.6.38.4/mm/page_alloc.c linux-2.6.38.4/mm/page_alloc.c
  
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
-diff -urNp linux-2.6.38.4/mm/percpu.c linux-2.6.38.4/mm/percpu.c
---- linux-2.6.38.4/mm/percpu.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/percpu.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/percpu.c linux-2.6.38.6/mm/percpu.c
+--- linux-2.6.38.6/mm/percpu.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/percpu.c	2011-04-28 19:34:15.000000000 -0400
 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -62010,9 +62229,9 @@ diff -urNp linux-2.6.38.4/mm/percpu.c linux-2.6.38.4/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-2.6.38.4/mm/rmap.c linux-2.6.38.4/mm/rmap.c
---- linux-2.6.38.4/mm/rmap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/rmap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/rmap.c linux-2.6.38.6/mm/rmap.c
+--- linux-2.6.38.6/mm/rmap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/rmap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_stru
  	struct anon_vma *anon_vma = vma->anon_vma;
  	struct anon_vma_chain *avc;
@@ -62102,9 +62321,9 @@ diff -urNp linux-2.6.38.4/mm/rmap.c linux-2.6.38.4/mm/rmap.c
  {
  	struct anon_vma_chain *avc;
  	struct anon_vma *anon_vma;
-diff -urNp linux-2.6.38.4/mm/shmem.c linux-2.6.38.4/mm/shmem.c
---- linux-2.6.38.4/mm/shmem.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/shmem.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/shmem.c linux-2.6.38.6/mm/shmem.c
+--- linux-2.6.38.6/mm/shmem.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/mm/shmem.c	2011-05-11 18:34:57.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -62132,9 +62351,19 @@ diff -urNp linux-2.6.38.4/mm/shmem.c linux-2.6.38.4/mm/shmem.c
  		/* do it inline */
  		memcpy(info, symname, len);
  		inode->i_op = &shmem_symlink_inline_operations;
-diff -urNp linux-2.6.38.4/mm/slab.c linux-2.6.38.4/mm/slab.c
---- linux-2.6.38.4/mm/slab.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/slab.c	2011-04-28 19:57:25.000000000 -0400
+@@ -2341,8 +2343,7 @@ int shmem_fill_super(struct super_block 
+ 	int err = -ENOMEM;
+ 
+ 	/* Round up to L1_CACHE_BYTES to resist false sharing */
+-	sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
+-				L1_CACHE_BYTES), GFP_KERNEL);
++	sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
+ 	if (!sbinfo)
+ 		return -ENOMEM;
+ 
+diff -urNp linux-2.6.38.6/mm/slab.c linux-2.6.38.6/mm/slab.c
+--- linux-2.6.38.6/mm/slab.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/mm/slab.c	2011-04-28 19:57:25.000000000 -0400
 @@ -150,7 +150,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -62306,9 +62535,9 @@ diff -urNp linux-2.6.38.4/mm/slab.c linux-2.6.38.4/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-2.6.38.4/mm/slob.c linux-2.6.38.4/mm/slob.c
---- linux-2.6.38.4/mm/slob.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/slob.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/slob.c linux-2.6.38.6/mm/slob.c
+--- linux-2.6.38.6/mm/slob.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/slob.c	2011-04-28 19:34:15.000000000 -0400
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -62625,9 +62854,9 @@ diff -urNp linux-2.6.38.4/mm/slob.c linux-2.6.38.4/mm/slob.c
  	}
  
  	trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.38.4/mm/slub.c linux-2.6.38.4/mm/slub.c
---- linux-2.6.38.4/mm/slub.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/slub.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/slub.c linux-2.6.38.6/mm/slub.c
+--- linux-2.6.38.6/mm/slub.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/slub.c	2011-04-28 19:34:15.000000000 -0400
 @@ -390,7 +390,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
@@ -62802,9 +63031,9 @@ diff -urNp linux-2.6.38.4/mm/slub.c linux-2.6.38.4/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-2.6.38.4/mm/swapfile.c linux-2.6.38.4/mm/swapfile.c
---- linux-2.6.38.4/mm/swapfile.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/mm/swapfile.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/swapfile.c linux-2.6.38.6/mm/swapfile.c
+--- linux-2.6.38.6/mm/swapfile.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/mm/swapfile.c	2011-04-28 19:57:25.000000000 -0400
 @@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -62852,9 +63081,9 @@ diff -urNp linux-2.6.38.4/mm/swapfile.c linux-2.6.38.4/mm/swapfile.c
  	wake_up_interruptible(&proc_poll_wait);
  
  	error = 0;
-diff -urNp linux-2.6.38.4/mm/util.c linux-2.6.38.4/mm/util.c
---- linux-2.6.38.4/mm/util.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/util.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/util.c linux-2.6.38.6/mm/util.c
+--- linux-2.6.38.6/mm/util.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/util.c	2011-04-28 19:34:15.000000000 -0400
 @@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user);
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
@@ -62868,9 +63097,9 @@ diff -urNp linux-2.6.38.4/mm/util.c linux-2.6.38.4/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.38.4/mm/vmalloc.c linux-2.6.38.4/mm/vmalloc.c
---- linux-2.6.38.4/mm/vmalloc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/vmalloc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/vmalloc.c linux-2.6.38.6/mm/vmalloc.c
+--- linux-2.6.38.6/mm/vmalloc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/vmalloc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -63103,9 +63332,9 @@ diff -urNp linux-2.6.38.4/mm/vmalloc.c linux-2.6.38.4/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-2.6.38.4/mm/vmstat.c linux-2.6.38.4/mm/vmstat.c
---- linux-2.6.38.4/mm/vmstat.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/mm/vmstat.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/mm/vmstat.c linux-2.6.38.6/mm/vmstat.c
+--- linux-2.6.38.6/mm/vmstat.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/mm/vmstat.c	2011-04-28 19:34:15.000000000 -0400
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -63158,9 +63387,9 @@ diff -urNp linux-2.6.38.4/mm/vmstat.c linux-2.6.38.4/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-2.6.38.4/net/8021q/vlan.c linux-2.6.38.4/net/8021q/vlan.c
---- linux-2.6.38.4/net/8021q/vlan.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/8021q/vlan.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/8021q/vlan.c linux-2.6.38.6/net/8021q/vlan.c
+--- linux-2.6.38.6/net/8021q/vlan.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/8021q/vlan.c	2011-04-28 19:34:15.000000000 -0400
 @@ -589,8 +589,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
@@ -63171,9 +63400,9 @@ diff -urNp linux-2.6.38.4/net/8021q/vlan.c linux-2.6.38.4/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.38.4/net/atm/atm_misc.c linux-2.6.38.4/net/atm/atm_misc.c
---- linux-2.6.38.4/net/atm/atm_misc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/atm/atm_misc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/atm/atm_misc.c linux-2.6.38.6/net/atm/atm_misc.c
+--- linux-2.6.38.6/net/atm/atm_misc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/atm/atm_misc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int 
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
@@ -63210,9 +63439,9 @@ diff -urNp linux-2.6.38.4/net/atm/atm_misc.c linux-2.6.38.4/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.38.4/net/atm/proc.c linux-2.6.38.4/net/atm/proc.c
---- linux-2.6.38.4/net/atm/proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/atm/proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/atm/proc.c linux-2.6.38.6/net/atm/proc.c
+--- linux-2.6.38.6/net/atm/proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/atm/proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -63251,9 +63480,9 @@ diff -urNp linux-2.6.38.4/net/atm/proc.c linux-2.6.38.4/net/atm/proc.c
  	else
  		seq_printf(seq, "%3d %3d %5d         ",
  			   vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.38.4/net/atm/resources.c linux-2.6.38.4/net/atm/resources.c
---- linux-2.6.38.4/net/atm/resources.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/atm/resources.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/atm/resources.c linux-2.6.38.6/net/atm/resources.c
+--- linux-2.6.38.6/net/atm/resources.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/atm/resources.c	2011-04-28 19:34:15.000000000 -0400
 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
@@ -63272,9 +63501,9 @@ diff -urNp linux-2.6.38.4/net/atm/resources.c linux-2.6.38.4/net/atm/resources.c
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.38.4/net/batman-adv/hard-interface.c linux-2.6.38.4/net/batman-adv/hard-interface.c
---- linux-2.6.38.4/net/batman-adv/hard-interface.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/hard-interface.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/batman-adv/hard-interface.c linux-2.6.38.6/net/batman-adv/hard-interface.c
+--- linux-2.6.38.6/net/batman-adv/hard-interface.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/batman-adv/hard-interface.c	2011-04-28 19:57:25.000000000 -0400
 @@ -325,8 +325,8 @@ int hardif_enable_interface(struct batma
  	kref_get(&batman_if->refcount);
  	dev_add_pack(&batman_if->batman_adv_ptype);
@@ -63286,9 +63515,9 @@ diff -urNp linux-2.6.38.4/net/batman-adv/hard-interface.c linux-2.6.38.4/net/bat
  	bat_info(batman_if->soft_iface, "Adding interface: %s\n",
  		 batman_if->net_dev->name);
  
-diff -urNp linux-2.6.38.4/net/batman-adv/routing.c linux-2.6.38.4/net/batman-adv/routing.c
---- linux-2.6.38.4/net/batman-adv/routing.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/routing.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/batman-adv/routing.c linux-2.6.38.6/net/batman-adv/routing.c
+--- linux-2.6.38.6/net/batman-adv/routing.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/batman-adv/routing.c	2011-04-28 19:57:25.000000000 -0400
 @@ -569,7 +569,7 @@ void receive_bat_packet(struct ethhdr *e
  		return;
  
@@ -63298,9 +63527,9 @@ diff -urNp linux-2.6.38.4/net/batman-adv/routing.c linux-2.6.38.4/net/batman-adv
  
  	has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-2.6.38.4/net/batman-adv/send.c linux-2.6.38.4/net/batman-adv/send.c
---- linux-2.6.38.4/net/batman-adv/send.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/send.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/batman-adv/send.c linux-2.6.38.6/net/batman-adv/send.c
+--- linux-2.6.38.6/net/batman-adv/send.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/batman-adv/send.c	2011-04-28 19:57:25.000000000 -0400
 @@ -277,7 +277,7 @@ void schedule_own_packet(struct batman_i
  
  	/* change sequence number to network order */
@@ -63319,9 +63548,9 @@ diff -urNp linux-2.6.38.4/net/batman-adv/send.c linux-2.6.38.4/net/batman-adv/se
  
  	slide_own_bcast_window(batman_if);
  	send_time = own_send_time(bat_priv);
-diff -urNp linux-2.6.38.4/net/batman-adv/soft-interface.c linux-2.6.38.4/net/batman-adv/soft-interface.c
---- linux-2.6.38.4/net/batman-adv/soft-interface.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/soft-interface.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/batman-adv/soft-interface.c linux-2.6.38.6/net/batman-adv/soft-interface.c
+--- linux-2.6.38.6/net/batman-adv/soft-interface.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/batman-adv/soft-interface.c	2011-04-28 19:57:25.000000000 -0400
 @@ -410,7 +410,7 @@ int interface_tx(struct sk_buff *skb, st
  
  		/* set broadcast sequence number */
@@ -63340,9 +63569,9 @@ diff -urNp linux-2.6.38.4/net/batman-adv/soft-interface.c linux-2.6.38.4/net/bat
  	atomic_set(&bat_priv->hna_local_changed, 0);
  
  	bat_priv->primary_if = NULL;
-diff -urNp linux-2.6.38.4/net/batman-adv/types.h linux-2.6.38.4/net/batman-adv/types.h
---- linux-2.6.38.4/net/batman-adv/types.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/types.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/batman-adv/types.h linux-2.6.38.6/net/batman-adv/types.h
+--- linux-2.6.38.6/net/batman-adv/types.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/batman-adv/types.h	2011-04-28 19:57:25.000000000 -0400
 @@ -38,8 +38,8 @@ struct batman_if {
  	int16_t if_num;
  	char if_status;
@@ -63363,9 +63592,9 @@ diff -urNp linux-2.6.38.4/net/batman-adv/types.h linux-2.6.38.4/net/batman-adv/t
  	atomic_t bcast_queue_left;
  	atomic_t batman_queue_left;
  	char num_ifaces;
-diff -urNp linux-2.6.38.4/net/batman-adv/unicast.c linux-2.6.38.4/net/batman-adv/unicast.c
---- linux-2.6.38.4/net/batman-adv/unicast.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/batman-adv/unicast.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/batman-adv/unicast.c linux-2.6.38.6/net/batman-adv/unicast.c
+--- linux-2.6.38.6/net/batman-adv/unicast.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/batman-adv/unicast.c	2011-04-28 19:57:25.000000000 -0400
 @@ -261,9 +261,9 @@ int frag_send_skb(struct sk_buff *skb, s
  	frag1->flags |= UNI_FRAG_HEAD;
  	frag2->flags &= ~UNI_FRAG_HEAD;
@@ -63378,9 +63607,9 @@ diff -urNp linux-2.6.38.4/net/batman-adv/unicast.c linux-2.6.38.4/net/batman-adv
  			     &batman_if->frag_seqno));
  
  	send_skb_packet(skb, batman_if, dstaddr);
-diff -urNp linux-2.6.38.4/net/bridge/br_multicast.c linux-2.6.38.4/net/bridge/br_multicast.c
---- linux-2.6.38.4/net/bridge/br_multicast.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/net/bridge/br_multicast.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/bridge/br_multicast.c linux-2.6.38.6/net/bridge/br_multicast.c
+--- linux-2.6.38.6/net/bridge/br_multicast.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/net/bridge/br_multicast.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct 
  	nexthdr = ip6h->nexthdr;
  	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -63390,9 +63619,9 @@ diff -urNp linux-2.6.38.4/net/bridge/br_multicast.c linux-2.6.38.4/net/bridge/br
  		return 0;
  
  	/* Okay, we found ICMPv6 header */
-diff -urNp linux-2.6.38.4/net/bridge/netfilter/ebtables.c linux-2.6.38.4/net/bridge/netfilter/ebtables.c
---- linux-2.6.38.4/net/bridge/netfilter/ebtables.c	2011-04-18 17:27:18.000000000 -0400
-+++ linux-2.6.38.4/net/bridge/netfilter/ebtables.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/bridge/netfilter/ebtables.c linux-2.6.38.6/net/bridge/netfilter/ebtables.c
+--- linux-2.6.38.6/net/bridge/netfilter/ebtables.c	2011-04-18 17:27:18.000000000 -0400
++++ linux-2.6.38.6/net/bridge/netfilter/ebtables.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
  			tmp.valid_hooks = t->table->valid_hooks;
  		}
@@ -63402,9 +63631,9 @@ diff -urNp linux-2.6.38.4/net/bridge/netfilter/ebtables.c linux-2.6.38.4/net/bri
  			BUGPRINT("c2u Didn't work\n");
  			ret = -EFAULT;
  			break;
-diff -urNp linux-2.6.38.4/net/caif/caif_socket.c linux-2.6.38.4/net/caif/caif_socket.c
---- linux-2.6.38.4/net/caif/caif_socket.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/caif/caif_socket.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/caif/caif_socket.c linux-2.6.38.6/net/caif/caif_socket.c
+--- linux-2.6.38.6/net/caif/caif_socket.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/caif/caif_socket.c	2011-04-28 19:57:25.000000000 -0400
 @@ -48,18 +48,19 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
@@ -63522,9 +63751,9 @@ diff -urNp linux-2.6.38.4/net/caif/caif_socket.c linux-2.6.38.4/net/caif/caif_so
  
  	if (cf_sk->debugfs_socket_dir != NULL)
  		debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
-diff -urNp linux-2.6.38.4/net/caif/cfctrl.c linux-2.6.38.4/net/caif/cfctrl.c
---- linux-2.6.38.4/net/caif/cfctrl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/caif/cfctrl.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/caif/cfctrl.c linux-2.6.38.6/net/caif/cfctrl.c
+--- linux-2.6.38.6/net/caif/cfctrl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/caif/cfctrl.c	2011-04-28 19:57:25.000000000 -0400
 @@ -46,8 +46,8 @@ struct cflayer *cfctrl_create(void)
  	dev_info.id = 0xff;
  	memset(this, 0, sizeof(*this));
@@ -63556,9 +63785,9 @@ diff -urNp linux-2.6.38.4/net/caif/cfctrl.c linux-2.6.38.4/net/caif/cfctrl.c
  					 p->sequence_no);
  			list_del(&p->list);
  			goto out;
-diff -urNp linux-2.6.38.4/net/can/bcm.c linux-2.6.38.4/net/can/bcm.c
---- linux-2.6.38.4/net/can/bcm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/can/bcm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/can/bcm.c linux-2.6.38.6/net/can/bcm.c
+--- linux-2.6.38.6/net/can/bcm.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/net/can/bcm.c	2011-05-10 22:09:01.000000000 -0400
 @@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file
  	struct bcm_sock *bo = bcm_sk(sk);
  	struct bcm_op *op;
@@ -63575,26 +63804,9 @@ diff -urNp linux-2.6.38.4/net/can/bcm.c linux-2.6.38.4/net/can/bcm.c
  	seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
  	seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
  	seq_printf(m, " <<<\n");
-diff -urNp linux-2.6.38.4/net/can/raw.c linux-2.6.38.4/net/can/raw.c
---- linux-2.6.38.4/net/can/raw.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/can/raw.c	2011-04-28 19:34:15.000000000 -0400
-@@ -305,7 +305,12 @@ static int raw_init(struct sock *sk)
- static int raw_release(struct socket *sock)
- {
- 	struct sock *sk = sock->sk;
--	struct raw_sock *ro = raw_sk(sk);
-+	struct raw_sock *ro;
-+
-+	if (!sk)
-+		return 0;
-+
-+	ro = raw_sk(sk);
- 
- 	unregister_netdevice_notifier(&ro->notifier);
- 
-diff -urNp linux-2.6.38.4/net/core/datagram.c linux-2.6.38.4/net/core/datagram.c
---- linux-2.6.38.4/net/core/datagram.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/datagram.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/core/datagram.c linux-2.6.38.6/net/core/datagram.c
+--- linux-2.6.38.6/net/core/datagram.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/core/datagram.c	2011-04-28 19:57:25.000000000 -0400
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
  	}
  
@@ -63604,9 +63816,9 @@ diff -urNp linux-2.6.38.4/net/core/datagram.c linux-2.6.38.4/net/core/datagram.c
  	sk_mem_reclaim_partial(sk);
  
  	return err;
-diff -urNp linux-2.6.38.4/net/core/dev.c linux-2.6.38.4/net/core/dev.c
---- linux-2.6.38.4/net/core/dev.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/dev.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/core/dev.c linux-2.6.38.6/net/core/dev.c
+--- linux-2.6.38.6/net/core/dev.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/core/dev.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
@@ -63640,9 +63852,9 @@ diff -urNp linux-2.6.38.4/net/core/dev.c linux-2.6.38.4/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.38.4/net/core/flow.c linux-2.6.38.4/net/core/flow.c
---- linux-2.6.38.4/net/core/flow.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/flow.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/core/flow.c linux-2.6.38.6/net/core/flow.c
+--- linux-2.6.38.6/net/core/flow.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/core/flow.c	2011-04-28 19:57:25.000000000 -0400
 @@ -60,7 +60,7 @@ struct flow_cache {
  	struct timer_list		rnd_timer;
  };
@@ -63679,9 +63891,9 @@ diff -urNp linux-2.6.38.4/net/core/flow.c linux-2.6.38.4/net/core/flow.c
  		if (!IS_ERR(flo))
  			fle->object = flo;
  		else
-diff -urNp linux-2.6.38.4/net/core/sock.c linux-2.6.38.4/net/core/sock.c
---- linux-2.6.38.4/net/core/sock.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/core/sock.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/core/sock.c linux-2.6.38.6/net/core/sock.c
+--- linux-2.6.38.6/net/core/sock.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/core/sock.c	2011-04-28 19:57:25.000000000 -0400
 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	 */
  	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
@@ -63754,9 +63966,9 @@ diff -urNp linux-2.6.38.4/net/core/sock.c linux-2.6.38.4/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-2.6.38.4/net/decnet/sysctl_net_decnet.c linux-2.6.38.4/net/decnet/sysctl_net_decnet.c
---- linux-2.6.38.4/net/decnet/sysctl_net_decnet.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/decnet/sysctl_net_decnet.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/decnet/sysctl_net_decnet.c linux-2.6.38.6/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.38.6/net/decnet/sysctl_net_decnet.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/decnet/sysctl_net_decnet.c	2011-04-28 19:34:15.000000000 -0400
 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
@@ -63775,9 +63987,9 @@ diff -urNp linux-2.6.38.4/net/decnet/sysctl_net_decnet.c linux-2.6.38.4/net/decn
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-2.6.38.4/net/econet/Kconfig linux-2.6.38.4/net/econet/Kconfig
---- linux-2.6.38.4/net/econet/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/econet/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/econet/Kconfig linux-2.6.38.6/net/econet/Kconfig
+--- linux-2.6.38.6/net/econet/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/econet/Kconfig	2011-04-28 19:34:15.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -63787,9 +63999,9 @@ diff -urNp linux-2.6.38.4/net/econet/Kconfig linux-2.6.38.4/net/econet/Kconfig
  	---help---
  	  Econet is a fairly old and slow networking protocol mainly used by
  	  Acorn computers to access file and print servers. It uses native
-diff -urNp linux-2.6.38.4/net/ipv4/inet_diag.c linux-2.6.38.4/net/ipv4/inet_diag.c
---- linux-2.6.38.4/net/ipv4/inet_diag.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/inet_diag.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/inet_diag.c linux-2.6.38.6/net/ipv4/inet_diag.c
+--- linux-2.6.38.6/net/ipv4/inet_diag.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/inet_diag.c	2011-04-28 19:34:15.000000000 -0400
 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
@@ -63851,9 +64063,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/inet_diag.c linux-2.6.38.4/net/ipv4/inet_diag
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-2.6.38.4/net/ipv4/inet_hashtables.c linux-2.6.38.4/net/ipv4/inet_hashtables.c
---- linux-2.6.38.4/net/ipv4/inet_hashtables.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/inet_hashtables.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/inet_hashtables.c linux-2.6.38.6/net/ipv4/inet_hashtables.c
+--- linux-2.6.38.6/net/ipv4/inet_hashtables.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/inet_hashtables.c	2011-04-28 19:34:15.000000000 -0400
 @@ -18,11 +18,14 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -63878,9 +64090,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/inet_hashtables.c linux-2.6.38.4/net/ipv4/ine
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			while (twrefcnt) {
-diff -urNp linux-2.6.38.4/net/ipv4/inetpeer.c linux-2.6.38.4/net/ipv4/inetpeer.c
---- linux-2.6.38.4/net/ipv4/inetpeer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/inetpeer.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/inetpeer.c linux-2.6.38.6/net/ipv4/inetpeer.c
+--- linux-2.6.38.6/net/ipv4/inetpeer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/inetpeer.c	2011-04-28 19:34:15.000000000 -0400
 @@ -509,8 +509,8 @@ struct inet_peer *inet_getpeer(struct in
  	if (p) {
  		p->daddr = *daddr;
@@ -63892,9 +64104,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/inetpeer.c linux-2.6.38.4/net/ipv4/inetpeer.c
  		p->tcp_ts_stamp = 0;
  		INIT_LIST_HEAD(&p->unused);
  
-diff -urNp linux-2.6.38.4/net/ipv4/ip_fragment.c linux-2.6.38.4/net/ipv4/ip_fragment.c
---- linux-2.6.38.4/net/ipv4/ip_fragment.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/ip_fragment.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/ip_fragment.c linux-2.6.38.6/net/ipv4/ip_fragment.c
+--- linux-2.6.38.6/net/ipv4/ip_fragment.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/ip_fragment.c	2011-04-28 19:34:15.000000000 -0400
 @@ -298,7 +298,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
@@ -63904,9 +64116,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/ip_fragment.c linux-2.6.38.4/net/ipv4/ip_frag
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.6/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.38.6/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-04-28 19:34:15.000000000 -0400
 @@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
@@ -63916,9 +64128,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.38.4/
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.38.4/net/ipv4/raw.c linux-2.6.38.4/net/ipv4/raw.c
---- linux-2.6.38.4/net/ipv4/raw.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/raw.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/raw.c linux-2.6.38.6/net/ipv4/raw.c
+--- linux-2.6.38.6/net/ipv4/raw.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/raw.c	2011-05-04 18:00:09.000000000 -0400
 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
@@ -63960,18 +64172,24 @@ diff -urNp linux-2.6.38.4/net/ipv4/raw.c linux-2.6.38.4/net/ipv4/raw.c
  		goto out;
  	ret = 0;
  out:	return ret;
-@@ -972,7 +977,7 @@ static void raw_sock_seq_show(struct seq
+@@ -972,7 +977,13 @@ static void raw_sock_seq_show(struct seq
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
 -		atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
-+		atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
++		atomic_read(&sp->sk_refcnt),
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++		NULL,
++#else
++		sp,
++#endif
++		atomic_read_unchecked(&sp->sk_drops));
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv4/route.c linux-2.6.38.4/net/ipv4/route.c
---- linux-2.6.38.4/net/ipv4/route.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/route.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/route.c linux-2.6.38.6/net/ipv4/route.c
+--- linux-2.6.38.6/net/ipv4/route.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/route.c	2011-04-28 19:57:25.000000000 -0400
 @@ -270,7 +270,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
@@ -63999,9 +64217,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/route.c linux-2.6.38.4/net/ipv4/route.c
  		if (rt->peer->tcp_ts_stamp) {
  			ts = rt->peer->tcp_ts;
  			tsage = get_seconds() - rt->peer->tcp_ts_stamp;
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_ipv4.c linux-2.6.38.4/net/ipv4/tcp_ipv4.c
---- linux-2.6.38.4/net/ipv4/tcp_ipv4.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_ipv4.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/tcp_ipv4.c linux-2.6.38.6/net/ipv4/tcp_ipv4.c
+--- linux-2.6.38.6/net/ipv4/tcp_ipv4.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/tcp_ipv4.c	2011-04-28 19:34:15.000000000 -0400
 @@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -64097,9 +64315,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/tcp_ipv4.c linux-2.6.38.4/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_minisocks.c linux-2.6.38.4/net/ipv4/tcp_minisocks.c
---- linux-2.6.38.4/net/ipv4/tcp_minisocks.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_minisocks.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/tcp_minisocks.c linux-2.6.38.6/net/ipv4/tcp_minisocks.c
+--- linux-2.6.38.6/net/ipv4/tcp_minisocks.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/tcp_minisocks.c	2011-04-28 19:34:15.000000000 -0400
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -64122,9 +64340,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/tcp_minisocks.c linux-2.6.38.4/net/ipv4/tcp_m
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_probe.c linux-2.6.38.4/net/ipv4/tcp_probe.c
---- linux-2.6.38.4/net/ipv4/tcp_probe.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_probe.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/tcp_probe.c linux-2.6.38.6/net/ipv4/tcp_probe.c
+--- linux-2.6.38.6/net/ipv4/tcp_probe.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/tcp_probe.c	2011-04-28 19:34:15.000000000 -0400
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
@@ -64134,9 +64352,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/tcp_probe.c linux-2.6.38.4/net/ipv4/tcp_probe
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-2.6.38.4/net/ipv4/tcp_timer.c linux-2.6.38.4/net/ipv4/tcp_timer.c
---- linux-2.6.38.4/net/ipv4/tcp_timer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/tcp_timer.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/tcp_timer.c linux-2.6.38.6/net/ipv4/tcp_timer.c
+--- linux-2.6.38.6/net/ipv4/tcp_timer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/tcp_timer.c	2011-04-28 19:34:15.000000000 -0400
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -64162,9 +64380,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/tcp_timer.c linux-2.6.38.4/net/ipv4/tcp_timer
  	if (retransmits_timed_out(sk, retry_until,
  				  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
  		/* Has it gone just too far? */
-diff -urNp linux-2.6.38.4/net/ipv4/udp.c linux-2.6.38.4/net/ipv4/udp.c
---- linux-2.6.38.4/net/ipv4/udp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv4/udp.c	2011-04-28 20:09:30.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv4/udp.c linux-2.6.38.6/net/ipv4/udp.c
+--- linux-2.6.38.6/net/ipv4/udp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv4/udp.c	2011-04-28 20:09:30.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -64277,9 +64495,9 @@ diff -urNp linux-2.6.38.4/net/ipv4/udp.c linux-2.6.38.4/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv6/inet6_connection_sock.c linux-2.6.38.4/net/ipv6/inet6_connection_sock.c
---- linux-2.6.38.4/net/ipv6/inet6_connection_sock.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/inet6_connection_sock.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv6/inet6_connection_sock.c linux-2.6.38.6/net/ipv6/inet6_connection_sock.c
+--- linux-2.6.38.6/net/ipv6/inet6_connection_sock.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv6/inet6_connection_sock.c	2011-04-28 19:57:25.000000000 -0400
 @@ -183,7 +183,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
  	{
@@ -64298,9 +64516,21 @@ diff -urNp linux-2.6.38.4/net/ipv6/inet6_connection_sock.c linux-2.6.38.4/net/ip
  			__sk_dst_reset(sk);
  			dst = NULL;
  		}
-diff -urNp linux-2.6.38.4/net/ipv6/raw.c linux-2.6.38.4/net/ipv6/raw.c
---- linux-2.6.38.4/net/ipv6/raw.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/raw.c	2011-04-28 20:08:36.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv6/inet6_hashtables.c linux-2.6.38.6/net/ipv6/inet6_hashtables.c
+--- linux-2.6.38.6/net/ipv6/inet6_hashtables.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv6/inet6_hashtables.c	2011-05-11 18:35:16.000000000 -0400
+@@ -124,7 +124,7 @@ out:
+ }
+ EXPORT_SYMBOL(__inet6_lookup_established);
+ 
+-static int inline compute_score(struct sock *sk, struct net *net,
++static inline int compute_score(struct sock *sk, struct net *net,
+ 				const unsigned short hnum,
+ 				const struct in6_addr *daddr,
+ 				const int dif)
+diff -urNp linux-2.6.38.6/net/ipv6/raw.c linux-2.6.38.6/net/ipv6/raw.c
+--- linux-2.6.38.6/net/ipv6/raw.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv6/raw.c	2011-04-28 20:08:36.000000000 -0400
 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
  {
  	if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
@@ -64387,9 +64617,9 @@ diff -urNp linux-2.6.38.4/net/ipv6/raw.c linux-2.6.38.4/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv6/tcp_ipv6.c linux-2.6.38.4/net/ipv6/tcp_ipv6.c
---- linux-2.6.38.4/net/ipv6/tcp_ipv6.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/tcp_ipv6.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv6/tcp_ipv6.c linux-2.6.38.6/net/ipv6/tcp_ipv6.c
+--- linux-2.6.38.6/net/ipv6/tcp_ipv6.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv6/tcp_ipv6.c	2011-04-28 19:34:15.000000000 -0400
 @@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -64489,9 +64719,9 @@ diff -urNp linux-2.6.38.4/net/ipv6/tcp_ipv6.c linux-2.6.38.4/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/ipv6/udp.c linux-2.6.38.4/net/ipv6/udp.c
---- linux-2.6.38.4/net/ipv6/udp.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/ipv6/udp.c	2011-04-28 20:09:04.000000000 -0400
+diff -urNp linux-2.6.38.6/net/ipv6/udp.c linux-2.6.38.6/net/ipv6/udp.c
+--- linux-2.6.38.6/net/ipv6/udp.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/ipv6/udp.c	2011-04-28 20:09:04.000000000 -0400
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -64556,9 +64786,9 @@ diff -urNp linux-2.6.38.4/net/ipv6/udp.c linux-2.6.38.4/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/irda/ircomm/ircomm_tty.c linux-2.6.38.6/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.38.6/net/irda/ircomm/ircomm_tty.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/irda/ircomm/ircomm_tty.c	2011-04-28 19:34:15.000000000 -0400
 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
@@ -64681,9 +64911,9 @@ diff -urNp linux-2.6.38.4/net/irda/ircomm/ircomm_tty.c linux-2.6.38.4/net/irda/i
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.38.4/net/iucv/af_iucv.c linux-2.6.38.4/net/iucv/af_iucv.c
---- linux-2.6.38.4/net/iucv/af_iucv.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/iucv/af_iucv.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/iucv/af_iucv.c linux-2.6.38.6/net/iucv/af_iucv.c
+--- linux-2.6.38.6/net/iucv/af_iucv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/iucv/af_iucv.c	2011-04-28 19:57:25.000000000 -0400
 @@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct soc
  
  	write_lock_bh(&iucv_sk_list.lock);
@@ -64697,9 +64927,9 @@ diff -urNp linux-2.6.38.4/net/iucv/af_iucv.c linux-2.6.38.4/net/iucv/af_iucv.c
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-2.6.38.4/net/key/af_key.c linux-2.6.38.4/net/key/af_key.c
---- linux-2.6.38.4/net/key/af_key.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/key/af_key.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/key/af_key.c linux-2.6.38.6/net/key/af_key.c
+--- linux-2.6.38.6/net/key/af_key.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/key/af_key.c	2011-04-28 19:57:25.000000000 -0400
 @@ -3003,10 +3003,10 @@ static int pfkey_send_policy_notify(stru
  static u32 get_acqseq(void)
  {
@@ -64725,10 +64955,10 @@ diff -urNp linux-2.6.38.4/net/key/af_key.c linux-2.6.38.4/net/key/af_key.c
  			       atomic_read(&s->sk_refcnt),
  			       sk_rmem_alloc_get(s),
  			       sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.38.4/net/mac80211/cfg.c linux-2.6.38.4/net/mac80211/cfg.c
---- linux-2.6.38.4/net/mac80211/cfg.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/cfg.c	2011-04-28 19:34:15.000000000 -0400
-@@ -1939,7 +1939,7 @@ static int ieee80211_get_antenna(struct 
+diff -urNp linux-2.6.38.6/net/mac80211/cfg.c linux-2.6.38.6/net/mac80211/cfg.c
+--- linux-2.6.38.6/net/mac80211/cfg.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/cfg.c	2011-05-10 22:09:03.000000000 -0400
+@@ -1941,7 +1941,7 @@ static int ieee80211_get_antenna(struct 
  	return drv_get_antenna(local, tx_ant, rx_ant);
  }
  
@@ -64737,9 +64967,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/cfg.c linux-2.6.38.4/net/mac80211/cfg.c
  	.add_virtual_intf = ieee80211_add_iface,
  	.del_virtual_intf = ieee80211_del_iface,
  	.change_virtual_intf = ieee80211_change_iface,
-diff -urNp linux-2.6.38.4/net/mac80211/cfg.h linux-2.6.38.4/net/mac80211/cfg.h
---- linux-2.6.38.4/net/mac80211/cfg.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/cfg.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/cfg.h linux-2.6.38.6/net/mac80211/cfg.h
+--- linux-2.6.38.6/net/mac80211/cfg.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/cfg.h	2011-04-28 19:34:15.000000000 -0400
 @@ -4,6 +4,6 @@
  #ifndef __CFG_H
  #define __CFG_H
@@ -64748,9 +64978,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/cfg.h linux-2.6.38.4/net/mac80211/cfg.h
 +extern const struct cfg80211_ops mac80211_config_ops;
  
  #endif /* __CFG_H */
-diff -urNp linux-2.6.38.4/net/mac80211/ieee80211_i.h linux-2.6.38.4/net/mac80211/ieee80211_i.h
---- linux-2.6.38.4/net/mac80211/ieee80211_i.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/ieee80211_i.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/ieee80211_i.h linux-2.6.38.6/net/mac80211/ieee80211_i.h
+--- linux-2.6.38.6/net/mac80211/ieee80211_i.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/ieee80211_i.h	2011-04-28 19:34:15.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -64768,9 +64998,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/ieee80211_i.h linux-2.6.38.4/net/mac80211
  	int monitors, cooked_mntrs;
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
-diff -urNp linux-2.6.38.4/net/mac80211/iface.c linux-2.6.38.4/net/mac80211/iface.c
---- linux-2.6.38.4/net/mac80211/iface.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/iface.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/iface.c linux-2.6.38.6/net/mac80211/iface.c
+--- linux-2.6.38.6/net/mac80211/iface.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/iface.c	2011-04-28 19:34:15.000000000 -0400
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
  		break;
  	}
@@ -64825,9 +65055,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/iface.c linux-2.6.38.4/net/mac80211/iface
  		if (local->ops->napi_poll)
  			napi_disable(&local->napi);
  		ieee80211_clear_tx_pending(local);
-diff -urNp linux-2.6.38.4/net/mac80211/main.c linux-2.6.38.4/net/mac80211/main.c
---- linux-2.6.38.4/net/mac80211/main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/main.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/main.c linux-2.6.38.6/net/mac80211/main.c
+--- linux-2.6.38.6/net/mac80211/main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/main.c	2011-04-28 19:34:15.000000000 -0400
 @@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
@@ -64837,9 +65067,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/main.c linux-2.6.38.4/net/mac80211/main.c
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-2.6.38.4/net/mac80211/pm.c linux-2.6.38.4/net/mac80211/pm.c
---- linux-2.6.38.4/net/mac80211/pm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/pm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/pm.c linux-2.6.38.6/net/mac80211/pm.c
+--- linux-2.6.38.6/net/mac80211/pm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/pm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211
  	}
  
@@ -64849,9 +65079,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/pm.c linux-2.6.38.4/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
  	local->suspended = true;
-diff -urNp linux-2.6.38.4/net/mac80211/rate.c linux-2.6.38.4/net/mac80211/rate.c
---- linux-2.6.38.4/net/mac80211/rate.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/rate.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/rate.c linux-2.6.38.6/net/mac80211/rate.c
+--- linux-2.6.38.6/net/mac80211/rate.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/rate.c	2011-04-28 19:34:15.000000000 -0400
 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
  	ASSERT_RTNL();
@@ -64861,9 +65091,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/rate.c linux-2.6.38.4/net/mac80211/rate.c
  		return -EBUSY;
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.6/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.38.6/net/mac80211/rc80211_pid_debugfs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/rc80211_pid_debugfs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
  	spin_unlock_irqrestore(&events->lock, status);
@@ -64873,9 +65103,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.38.4/net/
  		return -EFAULT;
  
  	return p;
-diff -urNp linux-2.6.38.4/net/mac80211/tx.c linux-2.6.38.4/net/mac80211/tx.c
---- linux-2.6.38.4/net/mac80211/tx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/tx.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/tx.c linux-2.6.38.6/net/mac80211/tx.c
+--- linux-2.6.38.6/net/mac80211/tx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/tx.c	2011-04-28 19:34:15.000000000 -0400
 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 
  	return cpu_to_le16(dur);
  }
@@ -64885,9 +65115,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/tx.c linux-2.6.38.4/net/mac80211/tx.c
  				      struct net_device *dev)
  {
  	return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.38.4/net/mac80211/util.c linux-2.6.38.4/net/mac80211/util.c
---- linux-2.6.38.4/net/mac80211/util.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/mac80211/util.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/mac80211/util.c linux-2.6.38.6/net/mac80211/util.c
+--- linux-2.6.38.6/net/mac80211/util.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/mac80211/util.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_
  		local->resuming = true;
  
@@ -64897,9 +65127,9 @@ diff -urNp linux-2.6.38.4/net/mac80211/util.c linux-2.6.38.4/net/mac80211/util.c
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.6/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-2.6.38.6/net/netfilter/ipvs/ip_vs_conn.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/ipvs/ip_vs_conn.c	2011-04-28 19:57:25.000000000 -0400
 @@ -553,7 +553,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
  	/* Increase the refcnt counter of the dest */
  	atomic_inc(&dest->refcnt);
@@ -64927,9 +65157,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.38.4/net/net
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.6/net/netfilter/ipvs/ip_vs_core.c
+--- linux-2.6.38.6/net/netfilter/ipvs/ip_vs_core.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/ipvs/ip_vs_core.c	2011-04-28 19:57:25.000000000 -0400
 @@ -504,7 +504,7 @@ int ip_vs_leave(struct ip_vs_service *sv
  		ret = cp->packet_xmit(skb, cp, pp);
  		/* do not touch skb anymore */
@@ -64948,9 +65178,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_core.c linux-2.6.38.4/net/net
  	if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
  	    cp->protocol == IPPROTO_SCTP) {
  		if ((cp->state == IP_VS_SCTP_S_ESTABLISHED &&
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.6/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-2.6.38.6/net/netfilter/ipvs/ip_vs_ctl.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/ipvs/ip_vs_ctl.c	2011-04-28 19:57:25.000000000 -0400
 @@ -787,7 +787,7 @@ __ip_vs_update_dest(struct ip_vs_service
  		ip_vs_rs_hash(dest);
  		write_unlock_bh(&__ip_vs_rs_lock);
@@ -64996,9 +65226,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.38.4/net/netf
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.38.6/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-2.6.38.6/net/netfilter/ipvs/ip_vs_sync.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/ipvs/ip_vs_sync.c	2011-04-28 19:57:25.000000000 -0400
 @@ -460,7 +460,7 @@ static void ip_vs_process_message(const 
  
  		if (opt)
@@ -65008,9 +65238,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.38.4/net/net
  		cp->state = state;
  		cp->old_state = cp->state;
  		/*
-diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.6/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-2.6.38.6/net/netfilter/ipvs/ip_vs_xmit.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/ipvs/ip_vs_xmit.c	2011-04-28 19:57:25.000000000 -0400
 @@ -1116,7 +1116,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
  		else
  			rc = NF_ACCEPT;
@@ -65029,9 +65259,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.38.4/net/net
  		goto out;
  	}
  
-diff -urNp linux-2.6.38.4/net/netfilter/Kconfig linux-2.6.38.4/net/netfilter/Kconfig
---- linux-2.6.38.4/net/netfilter/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/Kconfig	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/Kconfig linux-2.6.38.6/net/netfilter/Kconfig
+--- linux-2.6.38.6/net/netfilter/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/Kconfig	2011-04-28 19:34:15.000000000 -0400
 @@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -65049,9 +65279,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/Kconfig linux-2.6.38.4/net/netfilter/Kco
  config NETFILTER_XT_MATCH_HASHLIMIT
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.38.4/net/netfilter/Makefile linux-2.6.38.4/net/netfilter/Makefile
---- linux-2.6.38.4/net/netfilter/Makefile	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/Makefile	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/Makefile linux-2.6.38.6/net/netfilter/Makefile
+--- linux-2.6.38.6/net/netfilter/Makefile	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/Makefile	2011-04-28 19:34:15.000000000 -0400
 @@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += 
  obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -65060,9 +65290,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/Makefile linux-2.6.38.4/net/netfilter/Ma
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.6/net/netfilter/nf_conntrack_netlink.c
+--- linux-2.6.38.6/net/netfilter/nf_conntrack_netlink.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/nf_conntrack_netlink.c	2011-04-28 19:34:15.000000000 -0400
 @@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla
  static int
  ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -65072,9 +65302,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/nf_conntrack_netlink.c linux-2.6.38.4/ne
  {
  	struct nlattr *tb[CTA_TUPLE_MAX+1];
  	int err;
-diff -urNp linux-2.6.38.4/net/netfilter/nfnetlink_log.c linux-2.6.38.4/net/netfilter/nfnetlink_log.c
---- linux-2.6.38.4/net/netfilter/nfnetlink_log.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/nfnetlink_log.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/nfnetlink_log.c linux-2.6.38.6/net/netfilter/nfnetlink_log.c
+--- linux-2.6.38.6/net/netfilter/nfnetlink_log.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/nfnetlink_log.c	2011-04-28 19:57:25.000000000 -0400
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -65093,9 +65323,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/nfnetlink_log.c linux-2.6.38.4/net/netfi
  
  	if (data_len) {
  		struct nlattr *nla;
-diff -urNp linux-2.6.38.4/net/netfilter/nfnetlink_queue.c linux-2.6.38.4/net/netfilter/nfnetlink_queue.c
---- linux-2.6.38.4/net/netfilter/nfnetlink_queue.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/nfnetlink_queue.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/nfnetlink_queue.c linux-2.6.38.6/net/netfilter/nfnetlink_queue.c
+--- linux-2.6.38.6/net/netfilter/nfnetlink_queue.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/nfnetlink_queue.c	2011-04-28 19:57:25.000000000 -0400
 @@ -58,7 +58,7 @@ struct nfqnl_instance {
   */
  	spinlock_t	lock;
@@ -65123,9 +65353,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/nfnetlink_queue.c linux-2.6.38.4/net/net
  }
  
  static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-2.6.38.4/net/netfilter/xt_gradm.c linux-2.6.38.4/net/netfilter/xt_gradm.c
---- linux-2.6.38.4/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.38.4/net/netfilter/xt_gradm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/xt_gradm.c linux-2.6.38.6/net/netfilter/xt_gradm.c
+--- linux-2.6.38.6/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.38.6/net/netfilter/xt_gradm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -65178,9 +65408,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/xt_gradm.c linux-2.6.38.4/net/netfilter/
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.38.4/net/netfilter/xt_statistic.c linux-2.6.38.4/net/netfilter/xt_statistic.c
---- linux-2.6.38.4/net/netfilter/xt_statistic.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netfilter/xt_statistic.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netfilter/xt_statistic.c linux-2.6.38.6/net/netfilter/xt_statistic.c
+--- linux-2.6.38.6/net/netfilter/xt_statistic.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netfilter/xt_statistic.c	2011-04-28 19:57:25.000000000 -0400
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -65211,9 +65441,9 @@ diff -urNp linux-2.6.38.4/net/netfilter/xt_statistic.c linux-2.6.38.4/net/netfil
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/net/netlink/af_netlink.c linux-2.6.38.4/net/netlink/af_netlink.c
---- linux-2.6.38.4/net/netlink/af_netlink.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netlink/af_netlink.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netlink/af_netlink.c linux-2.6.38.6/net/netlink/af_netlink.c
+--- linux-2.6.38.6/net/netlink/af_netlink.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netlink/af_netlink.c	2011-04-28 19:57:25.000000000 -0400
 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
  			sk->sk_error_report(sk);
  		}
@@ -65248,9 +65478,9 @@ diff -urNp linux-2.6.38.4/net/netlink/af_netlink.c linux-2.6.38.4/net/netlink/af
  			   sock_i_ino(s)
  			);
  
-diff -urNp linux-2.6.38.4/net/netrom/af_netrom.c linux-2.6.38.4/net/netrom/af_netrom.c
---- linux-2.6.38.4/net/netrom/af_netrom.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/netrom/af_netrom.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/netrom/af_netrom.c linux-2.6.38.6/net/netrom/af_netrom.c
+--- linux-2.6.38.6/net/netrom/af_netrom.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/netrom/af_netrom.c	2011-04-28 19:34:15.000000000 -0400
 @@ -840,6 +840,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
@@ -65267,9 +65497,9 @@ diff -urNp linux-2.6.38.4/net/netrom/af_netrom.c linux-2.6.38.4/net/netrom/af_ne
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-2.6.38.4/net/packet/af_packet.c linux-2.6.38.4/net/packet/af_packet.c
---- linux-2.6.38.4/net/packet/af_packet.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/packet/af_packet.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/packet/af_packet.c linux-2.6.38.6/net/packet/af_packet.c
+--- linux-2.6.38.6/net/packet/af_packet.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/packet/af_packet.c	2011-04-28 19:57:25.000000000 -0400
 @@ -635,14 +635,14 @@ static int packet_rcv(struct sk_buff *sk
  
  	spin_lock(&sk->sk_receive_queue.lock);
@@ -65317,9 +65547,9 @@ diff -urNp linux-2.6.38.4/net/packet/af_packet.c linux-2.6.38.4/net/packet/af_pa
  			   atomic_read(&s->sk_refcnt),
  			   s->sk_type,
  			   ntohs(po->num),
-diff -urNp linux-2.6.38.4/net/phonet/af_phonet.c linux-2.6.38.4/net/phonet/af_phonet.c
---- linux-2.6.38.4/net/phonet/af_phonet.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/phonet/af_phonet.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/phonet/af_phonet.c linux-2.6.38.6/net/phonet/af_phonet.c
+--- linux-2.6.38.6/net/phonet/af_phonet.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/phonet/af_phonet.c	2011-04-28 19:34:15.000000000 -0400
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
@@ -65338,9 +65568,9 @@ diff -urNp linux-2.6.38.4/net/phonet/af_phonet.c linux-2.6.38.4/net/phonet/af_ph
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.38.4/net/phonet/pep.c linux-2.6.38.4/net/phonet/pep.c
---- linux-2.6.38.4/net/phonet/pep.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/phonet/pep.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/phonet/pep.c linux-2.6.38.6/net/phonet/pep.c
+--- linux-2.6.38.6/net/phonet/pep.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/phonet/pep.c	2011-04-28 19:57:25.000000000 -0400
 @@ -592,7 +592,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
  	case PNS_PEP_CTRL_REQ:
@@ -65359,9 +65589,9 @@ diff -urNp linux-2.6.38.4/net/phonet/pep.c linux-2.6.38.4/net/phonet/pep.c
  			err = -ENOBUFS;
  			break;
  		}
-diff -urNp linux-2.6.38.4/net/phonet/socket.c linux-2.6.38.4/net/phonet/socket.c
---- linux-2.6.38.4/net/phonet/socket.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/phonet/socket.c	2011-04-28 20:09:57.000000000 -0400
+diff -urNp linux-2.6.38.6/net/phonet/socket.c linux-2.6.38.6/net/phonet/socket.c
+--- linux-2.6.38.6/net/phonet/socket.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/phonet/socket.c	2011-04-28 20:09:57.000000000 -0400
 @@ -637,8 +637,13 @@ static int pn_sock_seq_show(struct seq_f
  			sk->sk_state,
  			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -65378,9 +65608,9 @@ diff -urNp linux-2.6.38.4/net/phonet/socket.c linux-2.6.38.4/net/phonet/socket.c
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff -urNp linux-2.6.38.4/net/rds/cong.c linux-2.6.38.4/net/rds/cong.c
---- linux-2.6.38.4/net/rds/cong.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rds/cong.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rds/cong.c linux-2.6.38.6/net/rds/cong.c
+--- linux-2.6.38.6/net/rds/cong.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/cong.c	2011-04-28 19:57:25.000000000 -0400
 @@ -78,7 +78,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -65408,9 +65638,99 @@ diff -urNp linux-2.6.38.4/net/rds/cong.c linux-2.6.38.4/net/rds/cong.c
  
  	if (likely(*recent == gen))
  		return 0;
-diff -urNp linux-2.6.38.4/net/rxrpc/af_rxrpc.c linux-2.6.38.4/net/rxrpc/af_rxrpc.c
---- linux-2.6.38.4/net/rxrpc/af_rxrpc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/af_rxrpc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rds/ib_cm.c linux-2.6.38.6/net/rds/ib_cm.c
+--- linux-2.6.38.6/net/rds/ib_cm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/ib_cm.c	2011-05-11 18:35:16.000000000 -0400
+@@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
+ 	/* Clear the ACK state */
+ 	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
+ #ifdef KERNEL_HAS_ATOMIC64
+-	atomic64_set(&ic->i_ack_next, 0);
++	atomic64_set_unchecked(&ic->i_ack_next, 0);
+ #else
+ 	ic->i_ack_next = 0;
+ #endif
+diff -urNp linux-2.6.38.6/net/rds/ib.h linux-2.6.38.6/net/rds/ib.h
+--- linux-2.6.38.6/net/rds/ib.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/ib.h	2011-05-11 18:35:16.000000000 -0400
+@@ -127,7 +127,7 @@ struct rds_ib_connection {
+ 	/* sending acks */
+ 	unsigned long		i_ack_flags;
+ #ifdef KERNEL_HAS_ATOMIC64
+-	atomic64_t		i_ack_next;	/* next ACK to send */
++	atomic64_unchecked_t	i_ack_next;	/* next ACK to send */
+ #else
+ 	spinlock_t		i_ack_lock;	/* protect i_ack_next */
+ 	u64			i_ack_next;	/* next ACK to send */
+diff -urNp linux-2.6.38.6/net/rds/ib_recv.c linux-2.6.38.6/net/rds/ib_recv.c
+--- linux-2.6.38.6/net/rds/ib_recv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/ib_recv.c	2011-05-11 18:35:16.000000000 -0400
+@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
+ static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
+ 				int ack_required)
+ {
+-	atomic64_set(&ic->i_ack_next, seq);
++	atomic64_set_unchecked(&ic->i_ack_next, seq);
+ 	if (ack_required) {
+ 		smp_mb__before_clear_bit();
+ 		set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
+ 	clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+ 	smp_mb__after_clear_bit();
+ 
+-	return atomic64_read(&ic->i_ack_next);
++	return atomic64_read_unchecked(&ic->i_ack_next);
+ }
+ #endif
+ 
+diff -urNp linux-2.6.38.6/net/rds/iw_cm.c linux-2.6.38.6/net/rds/iw_cm.c
+--- linux-2.6.38.6/net/rds/iw_cm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/iw_cm.c	2011-05-11 18:35:16.000000000 -0400
+@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
+ 	/* Clear the ACK state */
+ 	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
+ #ifdef KERNEL_HAS_ATOMIC64
+-	atomic64_set(&ic->i_ack_next, 0);
++	atomic64_set_unchecked(&ic->i_ack_next, 0);
+ #else
+ 	ic->i_ack_next = 0;
+ #endif
+diff -urNp linux-2.6.38.6/net/rds/iw.h linux-2.6.38.6/net/rds/iw.h
+--- linux-2.6.38.6/net/rds/iw.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/iw.h	2011-05-11 18:35:16.000000000 -0400
+@@ -133,7 +133,7 @@ struct rds_iw_connection {
+ 	/* sending acks */
+ 	unsigned long		i_ack_flags;
+ #ifdef KERNEL_HAS_ATOMIC64
+-	atomic64_t		i_ack_next;	/* next ACK to send */
++	atomic64_unchecked_t	i_ack_next;	/* next ACK to send */
+ #else
+ 	spinlock_t		i_ack_lock;	/* protect i_ack_next */
+ 	u64			i_ack_next;	/* next ACK to send */
+diff -urNp linux-2.6.38.6/net/rds/iw_recv.c linux-2.6.38.6/net/rds/iw_recv.c
+--- linux-2.6.38.6/net/rds/iw_recv.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rds/iw_recv.c	2011-05-11 18:35:16.000000000 -0400
+@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
+ static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
+ 				int ack_required)
+ {
+-	atomic64_set(&ic->i_ack_next, seq);
++	atomic64_set_unchecked(&ic->i_ack_next, seq);
+ 	if (ack_required) {
+ 		smp_mb__before_clear_bit();
+ 		set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
+ 	clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
+ 	smp_mb__after_clear_bit();
+ 
+-	return atomic64_read(&ic->i_ack_next);
++	return atomic64_read_unchecked(&ic->i_ack_next);
+ }
+ #endif
+ 
+diff -urNp linux-2.6.38.6/net/rxrpc/af_rxrpc.c linux-2.6.38.6/net/rxrpc/af_rxrpc.c
+--- linux-2.6.38.6/net/rxrpc/af_rxrpc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/af_rxrpc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -65420,9 +65740,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/af_rxrpc.c linux-2.6.38.4/net/rxrpc/af_rxrpc
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-ack.c linux-2.6.38.4/net/rxrpc/ar-ack.c
---- linux-2.6.38.4/net/rxrpc/ar-ack.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-ack.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-ack.c linux-2.6.38.6/net/rxrpc/ar-ack.c
+--- linux-2.6.38.6/net/rxrpc/ar-ack.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-ack.c	2011-04-28 19:57:25.000000000 -0400
 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  	_enter("{%d,%d,%d,%d},",
@@ -65486,9 +65806,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-ack.c linux-2.6.38.4/net/rxrpc/ar-ack.c
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-call.c linux-2.6.38.4/net/rxrpc/ar-call.c
---- linux-2.6.38.4/net/rxrpc/ar-call.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-call.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-call.c linux-2.6.38.6/net/rxrpc/ar-call.c
+--- linux-2.6.38.6/net/rxrpc/ar-call.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-call.c	2011-04-28 19:57:25.000000000 -0400
 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
  	spin_lock_init(&call->lock);
  	rwlock_init(&call->state_lock);
@@ -65498,9 +65818,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-call.c linux-2.6.38.4/net/rxrpc/ar-call.c
  	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
  	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-connection.c linux-2.6.38.4/net/rxrpc/ar-connection.c
---- linux-2.6.38.4/net/rxrpc/ar-connection.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-connection.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-connection.c linux-2.6.38.6/net/rxrpc/ar-connection.c
+--- linux-2.6.38.6/net/rxrpc/ar-connection.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-connection.c	2011-04-28 19:57:25.000000000 -0400
 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
  		rwlock_init(&conn->lock);
  		spin_lock_init(&conn->state_lock);
@@ -65510,9 +65830,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-connection.c linux-2.6.38.4/net/rxrpc/ar-
  		conn->avail_calls = RXRPC_MAXCALLS;
  		conn->size_align = 4;
  		conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-connevent.c linux-2.6.38.4/net/rxrpc/ar-connevent.c
---- linux-2.6.38.4/net/rxrpc/ar-connevent.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-connevent.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-connevent.c linux-2.6.38.6/net/rxrpc/ar-connevent.c
+--- linux-2.6.38.6/net/rxrpc/ar-connevent.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-connevent.c	2011-04-28 19:57:25.000000000 -0400
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
  	len = iov[0].iov_len + iov[1].iov_len;
@@ -65522,9 +65842,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-connevent.c linux-2.6.38.4/net/rxrpc/ar-c
  	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-input.c linux-2.6.38.4/net/rxrpc/ar-input.c
---- linux-2.6.38.4/net/rxrpc/ar-input.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-input.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-input.c linux-2.6.38.6/net/rxrpc/ar-input.c
+--- linux-2.6.38.6/net/rxrpc/ar-input.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-input.c	2011-04-28 19:57:25.000000000 -0400
 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
  	/* track the latest serial number on this connection for ACK packet
  	 * information */
@@ -65537,9 +65857,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-input.c linux-2.6.38.4/net/rxrpc/ar-input
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-internal.h linux-2.6.38.4/net/rxrpc/ar-internal.h
---- linux-2.6.38.4/net/rxrpc/ar-internal.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-internal.h	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-internal.h linux-2.6.38.6/net/rxrpc/ar-internal.h
+--- linux-2.6.38.6/net/rxrpc/ar-internal.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-internal.h	2011-04-28 19:57:25.000000000 -0400
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
  	int			error;		/* error code for local abort */
  	int			debug_id;	/* debug ID for printks */
@@ -65569,9 +65889,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-internal.h linux-2.6.38.4/net/rxrpc/ar-in
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-local.c linux-2.6.38.4/net/rxrpc/ar-local.c
---- linux-2.6.38.4/net/rxrpc/ar-local.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-local.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-local.c linux-2.6.38.6/net/rxrpc/ar-local.c
+--- linux-2.6.38.6/net/rxrpc/ar-local.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-local.c	2011-04-28 19:57:25.000000000 -0400
 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
  		spin_lock_init(&local->lock);
  		rwlock_init(&local->services_lock);
@@ -65581,9 +65901,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-local.c linux-2.6.38.4/net/rxrpc/ar-local
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-output.c linux-2.6.38.4/net/rxrpc/ar-output.c
---- linux-2.6.38.4/net/rxrpc/ar-output.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-output.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-output.c linux-2.6.38.6/net/rxrpc/ar-output.c
+--- linux-2.6.38.6/net/rxrpc/ar-output.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-output.c	2011-04-28 19:57:25.000000000 -0400
 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
  			sp->hdr.cid = call->cid;
  			sp->hdr.callNumber = call->call_id;
@@ -65596,9 +65916,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-output.c linux-2.6.38.4/net/rxrpc/ar-outp
  			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
  			sp->hdr.userStatus = 0;
  			sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-peer.c linux-2.6.38.4/net/rxrpc/ar-peer.c
---- linux-2.6.38.4/net/rxrpc/ar-peer.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-peer.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-peer.c linux-2.6.38.6/net/rxrpc/ar-peer.c
+--- linux-2.6.38.6/net/rxrpc/ar-peer.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-peer.c	2011-04-28 19:57:25.000000000 -0400
 @@ -87,7 +87,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
  		INIT_LIST_HEAD(&peer->error_targets);
  		spin_lock_init(&peer->lock);
@@ -65608,9 +65928,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-peer.c linux-2.6.38.4/net/rxrpc/ar-peer.c
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-proc.c linux-2.6.38.4/net/rxrpc/ar-proc.c
---- linux-2.6.38.4/net/rxrpc/ar-proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-proc.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-proc.c linux-2.6.38.6/net/rxrpc/ar-proc.c
+--- linux-2.6.38.6/net/rxrpc/ar-proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-proc.c	2011-04-28 19:57:25.000000000 -0400
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
  		   atomic_read(&conn->usage),
  		   rxrpc_conn_states[conn->state],
@@ -65622,9 +65942,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-proc.c linux-2.6.38.4/net/rxrpc/ar-proc.c
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/net/rxrpc/ar-transport.c linux-2.6.38.4/net/rxrpc/ar-transport.c
---- linux-2.6.38.4/net/rxrpc/ar-transport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/ar-transport.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/ar-transport.c linux-2.6.38.6/net/rxrpc/ar-transport.c
+--- linux-2.6.38.6/net/rxrpc/ar-transport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/ar-transport.c	2011-04-28 19:57:25.000000000 -0400
 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
  		spin_lock_init(&trans->client_lock);
  		rwlock_init(&trans->conn_lock);
@@ -65634,9 +65954,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/ar-transport.c linux-2.6.38.4/net/rxrpc/ar-t
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff -urNp linux-2.6.38.4/net/rxrpc/rxkad.c linux-2.6.38.4/net/rxrpc/rxkad.c
---- linux-2.6.38.4/net/rxrpc/rxkad.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/rxrpc/rxkad.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/rxrpc/rxkad.c linux-2.6.38.6/net/rxrpc/rxkad.c
+--- linux-2.6.38.6/net/rxrpc/rxkad.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/rxrpc/rxkad.c	2011-04-28 19:57:25.000000000 -0400
 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct 
  
  	len = iov[0].iov_len + iov[1].iov_len;
@@ -65655,9 +65975,9 @@ diff -urNp linux-2.6.38.4/net/rxrpc/rxkad.c linux-2.6.38.4/net/rxrpc/rxkad.c
  	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-2.6.38.4/net/sctp/proc.c linux-2.6.38.4/net/sctp/proc.c
---- linux-2.6.38.4/net/sctp/proc.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sctp/proc.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sctp/proc.c linux-2.6.38.6/net/sctp/proc.c
+--- linux-2.6.38.6/net/sctp/proc.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sctp/proc.c	2011-04-28 19:34:15.000000000 -0400
 @@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_
  	sctp_for_each_hentry(epb, node, &head->chain) {
  		ep = sctp_ep(epb);
@@ -65686,9 +66006,9 @@ diff -urNp linux-2.6.38.4/net/sctp/proc.c linux-2.6.38.4/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-2.6.38.4/net/sctp/socket.c linux-2.6.38.4/net/sctp/socket.c
---- linux-2.6.38.4/net/sctp/socket.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sctp/socket.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sctp/socket.c linux-2.6.38.6/net/sctp/socket.c
+--- linux-2.6.38.6/net/sctp/socket.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sctp/socket.c	2011-04-28 19:34:15.000000000 -0400
 @@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(st
  		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
  		if (space_left < addrlen)
@@ -65698,9 +66018,9 @@ diff -urNp linux-2.6.38.4/net/sctp/socket.c linux-2.6.38.4/net/sctp/socket.c
  			return -EFAULT;
  		to += addrlen;
  		cnt++;
-diff -urNp linux-2.6.38.4/net/socket.c linux-2.6.38.4/net/socket.c
---- linux-2.6.38.4/net/socket.c	2011-04-18 17:27:16.000000000 -0400
-+++ linux-2.6.38.4/net/socket.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/socket.c linux-2.6.38.6/net/socket.c
+--- linux-2.6.38.6/net/socket.c	2011-04-18 17:27:16.000000000 -0400
++++ linux-2.6.38.6/net/socket.c	2011-04-28 19:34:15.000000000 -0400
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -65851,9 +66171,9 @@ diff -urNp linux-2.6.38.4/net/socket.c linux-2.6.38.4/net/socket.c
  	err =
  	    security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
  	if (err)
-diff -urNp linux-2.6.38.4/net/sunrpc/sched.c linux-2.6.38.4/net/sunrpc/sched.c
---- linux-2.6.38.4/net/sunrpc/sched.c	2011-04-18 17:27:14.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/sched.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sunrpc/sched.c linux-2.6.38.6/net/sunrpc/sched.c
+--- linux-2.6.38.6/net/sunrpc/sched.c	2011-04-18 17:27:14.000000000 -0400
++++ linux-2.6.38.6/net/sunrpc/sched.c	2011-04-28 19:34:15.000000000 -0400
 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -65866,9 +66186,9 @@ diff -urNp linux-2.6.38.4/net/sunrpc/sched.c linux-2.6.38.4/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma.c	2011-04-28 19:57:25.000000000 -0400
 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
@@ -65976,9 +66296,9 @@ diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.38.4/net/sunr
  		.mode		= 0644,
  		.proc_handler	= read_reset_stat,
  	},
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-04-28 19:57:25.000000000 -0400
 @@ -499,7 +499,7 @@ next_sge:
  			svc_rdma_put_context(ctxt, 0);
  			goto out;
@@ -66006,9 +66326,9 @@ diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.38.4
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-04-28 19:57:25.000000000 -0400
 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
  	write_wr.wr.rdma.remote_addr = to;
  
@@ -66018,9 +66338,9 @@ diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.38.4/n
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-04-28 19:57:25.000000000 -0400
 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
  		return;
  
@@ -66066,9 +66386,9 @@ diff -urNp linux-2.6.38.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.38.
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff -urNp linux-2.6.38.4/net/sysctl_net.c linux-2.6.38.4/net/sysctl_net.c
---- linux-2.6.38.4/net/sysctl_net.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/sysctl_net.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/sysctl_net.c linux-2.6.38.6/net/sysctl_net.c
+--- linux-2.6.38.6/net/sysctl_net.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/sysctl_net.c	2011-04-28 19:34:15.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
@@ -66078,10 +66398,10 @@ diff -urNp linux-2.6.38.4/net/sysctl_net.c linux-2.6.38.4/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
---- linux-2.6.38.4/net/unix/af_unix.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/unix/af_unix.c	2011-04-28 19:34:15.000000000 -0400
-@@ -765,6 +765,12 @@ static struct sock *unix_find_other(stru
+diff -urNp linux-2.6.38.6/net/unix/af_unix.c linux-2.6.38.6/net/unix/af_unix.c
+--- linux-2.6.38.6/net/unix/af_unix.c	2011-05-10 22:06:29.000000000 -0400
++++ linux-2.6.38.6/net/unix/af_unix.c	2011-05-10 22:09:03.000000000 -0400
+@@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
  			goto put_fail;
@@ -66094,7 +66414,7 @@ diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
  		u = unix_find_socket_byinode(inode);
  		if (!u)
  			goto put_fail;
-@@ -785,6 +791,13 @@ static struct sock *unix_find_other(stru
+@@ -787,6 +793,13 @@ static struct sock *unix_find_other(stru
  		if (u) {
  			struct dentry *dentry;
  			dentry = unix_sk(u)->dentry;
@@ -66108,7 +66428,7 @@ diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
  			if (dentry)
  				touch_atime(unix_sk(u)->mnt, dentry);
  		} else
-@@ -870,11 +883,18 @@ static int unix_bind(struct socket *sock
+@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock
  		err = security_path_mknod(&nd.path, dentry, mode, 0);
  		if (err)
  			goto out_mknod_drop_write;
@@ -66127,7 +66447,7 @@ diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
  		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
  		dput(nd.path.dentry);
  		nd.path.dentry = dentry;
-@@ -892,6 +912,11 @@ out_mknod_drop_write:
+@@ -894,6 +914,11 @@ out_mknod_drop_write:
  			goto out_unlock;
  		}
  
@@ -66139,7 +66459,7 @@ diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
  		list = &unix_socket_table[addr->hash];
  	} else {
  		list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-@@ -2235,7 +2260,11 @@ static int unix_seq_show(struct seq_file
+@@ -2249,7 +2274,11 @@ static int unix_seq_show(struct seq_file
  		unix_state_lock(s);
  
  		seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
@@ -66151,9 +66471,9 @@ diff -urNp linux-2.6.38.4/net/unix/af_unix.c linux-2.6.38.4/net/unix/af_unix.c
  			atomic_read(&s->sk_refcnt),
  			0,
  			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.38.4/net/wireless/wext-core.c linux-2.6.38.4/net/wireless/wext-core.c
---- linux-2.6.38.4/net/wireless/wext-core.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/net/wireless/wext-core.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/net/wireless/wext-core.c linux-2.6.38.6/net/wireless/wext-core.c
+--- linux-2.6.38.6/net/wireless/wext-core.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/net/wireless/wext-core.c	2011-04-28 19:34:15.000000000 -0400
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -66187,9 +66507,9 @@ diff -urNp linux-2.6.38.4/net/wireless/wext-core.c linux-2.6.38.4/net/wireless/w
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-2.6.38.4/net/xfrm/xfrm_policy.c linux-2.6.38.4/net/xfrm/xfrm_policy.c
---- linux-2.6.38.4/net/xfrm/xfrm_policy.c	2011-04-22 19:20:59.000000000 -0400
-+++ linux-2.6.38.4/net/xfrm/xfrm_policy.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/net/xfrm/xfrm_policy.c linux-2.6.38.6/net/xfrm/xfrm_policy.c
+--- linux-2.6.38.6/net/xfrm/xfrm_policy.c	2011-04-22 19:20:59.000000000 -0400
++++ linux-2.6.38.6/net/xfrm/xfrm_policy.c	2011-04-28 19:57:25.000000000 -0400
 @@ -296,7 +296,7 @@ static void xfrm_policy_kill(struct xfrm
  {
  	policy->walk.dead = 1;
@@ -66262,9 +66582,9 @@ diff -urNp linux-2.6.38.4/net/xfrm/xfrm_policy.c linux-2.6.38.4/net/xfrm/xfrm_po
  		}
  	}
  
-diff -urNp linux-2.6.38.4/scripts/basic/fixdep.c linux-2.6.38.4/scripts/basic/fixdep.c
---- linux-2.6.38.4/scripts/basic/fixdep.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/basic/fixdep.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/scripts/basic/fixdep.c linux-2.6.38.6/scripts/basic/fixdep.c
+--- linux-2.6.38.6/scripts/basic/fixdep.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/scripts/basic/fixdep.c	2011-04-28 19:34:15.000000000 -0400
 @@ -235,9 +235,9 @@ static void use_config(const char *m, in
  
  static void parse_config_file(const char *map, size_t len)
@@ -66286,9 +66606,9 @@ diff -urNp linux-2.6.38.4/scripts/basic/fixdep.c linux-2.6.38.4/scripts/basic/fi
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.38.4/scripts/mod/file2alias.c linux-2.6.38.4/scripts/mod/file2alias.c
---- linux-2.6.38.4/scripts/mod/file2alias.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/file2alias.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/scripts/mod/file2alias.c linux-2.6.38.6/scripts/mod/file2alias.c
+--- linux-2.6.38.6/scripts/mod/file2alias.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/scripts/mod/file2alias.c	2011-04-28 19:34:15.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -66343,9 +66663,9 @@ diff -urNp linux-2.6.38.4/scripts/mod/file2alias.c linux-2.6.38.4/scripts/mod/fi
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.38.4/scripts/mod/modpost.c linux-2.6.38.4/scripts/mod/modpost.c
---- linux-2.6.38.4/scripts/mod/modpost.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/modpost.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/scripts/mod/modpost.c linux-2.6.38.6/scripts/mod/modpost.c
+--- linux-2.6.38.6/scripts/mod/modpost.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/scripts/mod/modpost.c	2011-04-28 19:34:15.000000000 -0400
 @@ -896,6 +896,7 @@ enum mismatch {
  	ANY_INIT_TO_ANY_EXIT,
  	ANY_EXIT_TO_ANY_INIT,
@@ -66413,9 +66733,9 @@ diff -urNp linux-2.6.38.4/scripts/mod/modpost.c linux-2.6.38.4/scripts/mod/modpo
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.38.4/scripts/mod/modpost.h linux-2.6.38.4/scripts/mod/modpost.h
---- linux-2.6.38.4/scripts/mod/modpost.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/modpost.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/scripts/mod/modpost.h linux-2.6.38.6/scripts/mod/modpost.h
+--- linux-2.6.38.6/scripts/mod/modpost.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/scripts/mod/modpost.h	2011-04-28 19:34:15.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -66435,9 +66755,9 @@ diff -urNp linux-2.6.38.4/scripts/mod/modpost.h linux-2.6.38.4/scripts/mod/modpo
  
  struct module {
  	struct module *next;
-diff -urNp linux-2.6.38.4/scripts/mod/sumversion.c linux-2.6.38.4/scripts/mod/sumversion.c
---- linux-2.6.38.4/scripts/mod/sumversion.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/mod/sumversion.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/scripts/mod/sumversion.c linux-2.6.38.6/scripts/mod/sumversion.c
+--- linux-2.6.38.6/scripts/mod/sumversion.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/scripts/mod/sumversion.c	2011-04-28 19:34:15.000000000 -0400
 @@ -470,7 +470,7 @@ static void write_version(const char *fi
  		goto out;
  	}
@@ -66447,9 +66767,9 @@ diff -urNp linux-2.6.38.4/scripts/mod/sumversion.c linux-2.6.38.4/scripts/mod/su
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-2.6.38.4/scripts/pnmtologo.c linux-2.6.38.4/scripts/pnmtologo.c
---- linux-2.6.38.4/scripts/pnmtologo.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/scripts/pnmtologo.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/scripts/pnmtologo.c linux-2.6.38.6/scripts/pnmtologo.c
+--- linux-2.6.38.6/scripts/pnmtologo.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/scripts/pnmtologo.c	2011-04-28 19:34:15.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -66476,9 +66796,9 @@ diff -urNp linux-2.6.38.4/scripts/pnmtologo.c linux-2.6.38.4/scripts/pnmtologo.c
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.38.4/security/apparmor/lsm.c linux-2.6.38.4/security/apparmor/lsm.c
---- linux-2.6.38.4/security/apparmor/lsm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/apparmor/lsm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/apparmor/lsm.c linux-2.6.38.6/security/apparmor/lsm.c
+--- linux-2.6.38.6/security/apparmor/lsm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/apparmor/lsm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -619,7 +619,7 @@ static int apparmor_task_setrlimit(struc
  	return error;
  }
@@ -66488,9 +66808,9 @@ diff -urNp linux-2.6.38.4/security/apparmor/lsm.c linux-2.6.38.4/security/apparm
  	.name =				"apparmor",
  
  	.ptrace_access_check =		apparmor_ptrace_access_check,
-diff -urNp linux-2.6.38.4/security/commoncap.c linux-2.6.38.4/security/commoncap.c
---- linux-2.6.38.4/security/commoncap.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/commoncap.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/commoncap.c linux-2.6.38.6/security/commoncap.c
+--- linux-2.6.38.6/security/commoncap.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/commoncap.c	2011-04-28 19:34:15.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <linux/sched.h>
  #include <linux/prctl.h>
@@ -66522,9 +66842,9 @@ diff -urNp linux-2.6.38.4/security/commoncap.c linux-2.6.38.4/security/commoncap
  	if (cred->uid != 0) {
  		if (bprm->cap_effective)
  			return 1;
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima_api.c linux-2.6.38.4/security/integrity/ima/ima_api.c
---- linux-2.6.38.4/security/integrity/ima/ima_api.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima_api.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/integrity/ima/ima_api.c linux-2.6.38.6/security/integrity/ima/ima_api.c
+--- linux-2.6.38.6/security/integrity/ima/ima_api.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/integrity/ima/ima_api.c	2011-04-28 19:34:15.000000000 -0400
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
  	int result;
  
@@ -66534,9 +66854,9 @@ diff -urNp linux-2.6.38.4/security/integrity/ima/ima_api.c linux-2.6.38.4/securi
  
  	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  	if (!entry) {
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima_fs.c linux-2.6.38.4/security/integrity/ima/ima_fs.c
---- linux-2.6.38.4/security/integrity/ima/ima_fs.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima_fs.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/integrity/ima/ima_fs.c linux-2.6.38.6/security/integrity/ima/ima_fs.c
+--- linux-2.6.38.6/security/integrity/ima/ima_fs.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/integrity/ima/ima_fs.c	2011-04-28 19:34:15.000000000 -0400
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -66552,9 +66872,9 @@ diff -urNp linux-2.6.38.4/security/integrity/ima/ima_fs.c linux-2.6.38.4/securit
  	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima.h linux-2.6.38.4/security/integrity/ima/ima.h
---- linux-2.6.38.4/security/integrity/ima/ima.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/integrity/ima/ima.h linux-2.6.38.6/security/integrity/ima/ima.h
+--- linux-2.6.38.6/security/integrity/ima/ima.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/integrity/ima/ima.h	2011-04-28 19:34:15.000000000 -0400
 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -66566,9 +66886,9 @@ diff -urNp linux-2.6.38.4/security/integrity/ima/ima.h linux-2.6.38.4/security/i
  	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.38.4/security/integrity/ima/ima_queue.c linux-2.6.38.4/security/integrity/ima/ima_queue.c
---- linux-2.6.38.4/security/integrity/ima/ima_queue.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/integrity/ima/ima_queue.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/integrity/ima/ima_queue.c linux-2.6.38.6/security/integrity/ima/ima_queue.c
+--- linux-2.6.38.6/security/integrity/ima/ima_queue.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/integrity/ima/ima_queue.c	2011-04-28 19:34:15.000000000 -0400
 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
  	INIT_LIST_HEAD(&qe->later);
  	list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -66578,9 +66898,9 @@ diff -urNp linux-2.6.38.4/security/integrity/ima/ima_queue.c linux-2.6.38.4/secu
  	key = ima_hash_key(entry->digest);
  	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
  	return 0;
-diff -urNp linux-2.6.38.4/security/Kconfig linux-2.6.38.4/security/Kconfig
---- linux-2.6.38.4/security/Kconfig	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/Kconfig	2011-04-30 19:58:48.000000000 -0400
+diff -urNp linux-2.6.38.6/security/Kconfig linux-2.6.38.6/security/Kconfig
+--- linux-2.6.38.6/security/Kconfig	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/Kconfig	2011-04-30 19:58:48.000000000 -0400
 @@ -4,6 +4,548 @@
  
  menu "Security options"
@@ -67139,9 +67459,9 @@ diff -urNp linux-2.6.38.4/security/Kconfig linux-2.6.38.4/security/Kconfig
  	help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.38.4/security/keys/keyring.c linux-2.6.38.4/security/keys/keyring.c
---- linux-2.6.38.4/security/keys/keyring.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/keys/keyring.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/keys/keyring.c linux-2.6.38.6/security/keys/keyring.c
+--- linux-2.6.38.6/security/keys/keyring.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/keys/keyring.c	2011-04-28 19:34:15.000000000 -0400
 @@ -213,15 +213,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
@@ -67161,9 +67481,9 @@ diff -urNp linux-2.6.38.4/security/keys/keyring.c linux-2.6.38.4/security/keys/k
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-2.6.38.4/security/min_addr.c linux-2.6.38.4/security/min_addr.c
---- linux-2.6.38.4/security/min_addr.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/min_addr.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/min_addr.c linux-2.6.38.6/security/min_addr.c
+--- linux-2.6.38.6/security/min_addr.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/min_addr.c	2011-04-28 19:34:15.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -67180,9 +67500,9 @@ diff -urNp linux-2.6.38.4/security/min_addr.c linux-2.6.38.4/security/min_addr.c
  }
  
  /*
-diff -urNp linux-2.6.38.4/security/security.c linux-2.6.38.4/security/security.c
---- linux-2.6.38.4/security/security.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/security.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/security.c linux-2.6.38.6/security/security.c
+--- linux-2.6.38.6/security/security.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/security.c	2011-04-28 19:34:15.000000000 -0400
 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
  /* things that live in capability.c */
  extern void __init security_fixup_ops(struct security_operations *ops);
@@ -67204,9 +67524,9 @@ diff -urNp linux-2.6.38.4/security/security.c linux-2.6.38.4/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-2.6.38.4/security/selinux/hooks.c linux-2.6.38.4/security/selinux/hooks.c
---- linux-2.6.38.4/security/selinux/hooks.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/selinux/hooks.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/selinux/hooks.c linux-2.6.38.6/security/selinux/hooks.c
+--- linux-2.6.38.6/security/selinux/hooks.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/selinux/hooks.c	2011-04-28 19:34:15.000000000 -0400
 @@ -90,7 +90,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -67224,9 +67544,9 @@ diff -urNp linux-2.6.38.4/security/selinux/hooks.c linux-2.6.38.4/security/selin
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
-diff -urNp linux-2.6.38.4/security/smack/smack_lsm.c linux-2.6.38.4/security/smack/smack_lsm.c
---- linux-2.6.38.4/security/smack/smack_lsm.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/smack/smack_lsm.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/smack/smack_lsm.c linux-2.6.38.6/security/smack/smack_lsm.c
+--- linux-2.6.38.6/security/smack/smack_lsm.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/smack/smack_lsm.c	2011-04-28 19:34:15.000000000 -0400
 @@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
@@ -67236,9 +67556,9 @@ diff -urNp linux-2.6.38.4/security/smack/smack_lsm.c linux-2.6.38.4/security/sma
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-2.6.38.4/security/tomoyo/tomoyo.c linux-2.6.38.4/security/tomoyo/tomoyo.c
---- linux-2.6.38.4/security/tomoyo/tomoyo.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/security/tomoyo/tomoyo.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/security/tomoyo/tomoyo.c linux-2.6.38.6/security/tomoyo/tomoyo.c
+--- linux-2.6.38.6/security/tomoyo/tomoyo.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/security/tomoyo/tomoyo.c	2011-04-28 19:34:15.000000000 -0400
 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
@@ -67248,9 +67568,9 @@ diff -urNp linux-2.6.38.4/security/tomoyo/tomoyo.c linux-2.6.38.4/security/tomoy
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.c linux-2.6.38.4/sound/aoa/codecs/onyx.c
---- linux-2.6.38.4/sound/aoa/codecs/onyx.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/aoa/codecs/onyx.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/aoa/codecs/onyx.c linux-2.6.38.6/sound/aoa/codecs/onyx.c
+--- linux-2.6.38.6/sound/aoa/codecs/onyx.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/aoa/codecs/onyx.c	2011-04-28 19:34:15.000000000 -0400
 @@ -54,7 +54,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -67279,9 +67599,9 @@ diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.c linux-2.6.38.4/sound/aoa/codec
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.h linux-2.6.38.4/sound/aoa/codecs/onyx.h
---- linux-2.6.38.4/sound/aoa/codecs/onyx.h	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/aoa/codecs/onyx.h	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/aoa/codecs/onyx.h linux-2.6.38.6/sound/aoa/codecs/onyx.h
+--- linux-2.6.38.6/sound/aoa/codecs/onyx.h	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/aoa/codecs/onyx.h	2011-04-28 19:34:15.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -67290,9 +67610,9 @@ diff -urNp linux-2.6.38.4/sound/aoa/codecs/onyx.h linux-2.6.38.4/sound/aoa/codec
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-2.6.38.4/sound/drivers/mts64.c linux-2.6.38.4/sound/drivers/mts64.c
---- linux-2.6.38.4/sound/drivers/mts64.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/drivers/mts64.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/drivers/mts64.c linux-2.6.38.6/sound/drivers/mts64.c
+--- linux-2.6.38.6/sound/drivers/mts64.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/drivers/mts64.c	2011-04-28 19:34:15.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -67349,9 +67669,9 @@ diff -urNp linux-2.6.38.4/sound/drivers/mts64.c linux-2.6.38.4/sound/drivers/mts
  
  	return 0;
  }
-diff -urNp linux-2.6.38.4/sound/drivers/portman2x4.c linux-2.6.38.4/sound/drivers/portman2x4.c
---- linux-2.6.38.4/sound/drivers/portman2x4.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/drivers/portman2x4.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/drivers/portman2x4.c linux-2.6.38.6/sound/drivers/portman2x4.c
+--- linux-2.6.38.6/sound/drivers/portman2x4.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/drivers/portman2x4.c	2011-04-28 19:34:15.000000000 -0400
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -67369,9 +67689,9 @@ diff -urNp linux-2.6.38.4/sound/drivers/portman2x4.c linux-2.6.38.4/sound/driver
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-2.6.38.4/sound/oss/sb_audio.c linux-2.6.38.4/sound/oss/sb_audio.c
---- linux-2.6.38.4/sound/oss/sb_audio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/oss/sb_audio.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/oss/sb_audio.c linux-2.6.38.6/sound/oss/sb_audio.c
+--- linux-2.6.38.6/sound/oss/sb_audio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/oss/sb_audio.c	2011-04-28 19:34:15.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -67381,9 +67701,9 @@ diff -urNp linux-2.6.38.4/sound/oss/sb_audio.c linux-2.6.38.4/sound/oss/sb_audio
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-2.6.38.4/sound/oss/swarm_cs4297a.c linux-2.6.38.4/sound/oss/swarm_cs4297a.c
---- linux-2.6.38.4/sound/oss/swarm_cs4297a.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/oss/swarm_cs4297a.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/oss/swarm_cs4297a.c linux-2.6.38.6/sound/oss/swarm_cs4297a.c
+--- linux-2.6.38.6/sound/oss/swarm_cs4297a.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/oss/swarm_cs4297a.c	2011-04-28 19:34:15.000000000 -0400
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -67418,9 +67738,9 @@ diff -urNp linux-2.6.38.4/sound/oss/swarm_cs4297a.c linux-2.6.38.4/sound/oss/swa
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-2.6.38.4/sound/pci/intel8x0m.c linux-2.6.38.4/sound/pci/intel8x0m.c
---- linux-2.6.38.4/sound/pci/intel8x0m.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/pci/intel8x0m.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/pci/intel8x0m.c linux-2.6.38.6/sound/pci/intel8x0m.c
+--- linux-2.6.38.6/sound/pci/intel8x0m.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/pci/intel8x0m.c	2011-04-28 19:34:15.000000000 -0400
 @@ -1264,7 +1264,7 @@ static struct shortname_table {
  	{ 0x5455, "ALi M5455" },
  	{ 0x746d, "AMD AMD8111" },
@@ -67430,9 +67750,9 @@ diff -urNp linux-2.6.38.4/sound/pci/intel8x0m.c linux-2.6.38.4/sound/pci/intel8x
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c
---- linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.6/sound/pci/ymfpci/ymfpci_main.c
+--- linux-2.6.38.6/sound/pci/ymfpci/ymfpci_main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/sound/pci/ymfpci/ymfpci_main.c	2011-04-28 19:57:25.000000000 -0400
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
  		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
  			break;
@@ -67473,9 +67793,9 @@ diff -urNp linux-2.6.38.4/sound/pci/ymfpci/ymfpci_main.c linux-2.6.38.4/sound/pc
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff -urNp linux-2.6.38.4/usr/gen_init_cpio.c linux-2.6.38.4/usr/gen_init_cpio.c
---- linux-2.6.38.4/usr/gen_init_cpio.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/usr/gen_init_cpio.c	2011-04-28 19:34:15.000000000 -0400
+diff -urNp linux-2.6.38.6/usr/gen_init_cpio.c linux-2.6.38.6/usr/gen_init_cpio.c
+--- linux-2.6.38.6/usr/gen_init_cpio.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/usr/gen_init_cpio.c	2011-04-28 19:34:15.000000000 -0400
 @@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
@@ -67498,9 +67818,9 @@ diff -urNp linux-2.6.38.4/usr/gen_init_cpio.c linux-2.6.38.4/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-2.6.38.4/virt/kvm/kvm_main.c linux-2.6.38.4/virt/kvm/kvm_main.c
---- linux-2.6.38.4/virt/kvm/kvm_main.c	2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.4/virt/kvm/kvm_main.c	2011-04-28 19:57:25.000000000 -0400
+diff -urNp linux-2.6.38.6/virt/kvm/kvm_main.c linux-2.6.38.6/virt/kvm/kvm_main.c
+--- linux-2.6.38.6/virt/kvm/kvm_main.c	2011-03-14 21:20:32.000000000 -0400
++++ linux-2.6.38.6/virt/kvm/kvm_main.c	2011-04-28 19:57:25.000000000 -0400
 @@ -74,7 +74,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;
@@ -67577,4 +67897,3 @@ diff -urNp linux-2.6.38.4/virt/kvm/kvm_main.c linux-2.6.38.4/virt/kvm/kvm_main.c
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_5;
-Binary files linux-2.6.38.4/vmlinux.gz and linux-2.6.38.4/vmlinux.gz differ
diff --git a/2.6.38/4422_grsec-mute-warnings.patch b/2.6.38/4422_grsec-mute-warnings.patch
index e1915d9..765b7b9 100644
--- a/2.6.38/4422_grsec-mute-warnings.patch
+++ b/2.6.38/4422_grsec-mute-warnings.patch
@@ -31,7 +31,7 @@ Acked-by: Christian Heim <phreak@gentoo.org>
 
 --- a/Makefile	2011-04-27 22:52:14.000000000 -0400
 +++ b/Makefile	2011-04-27 23:01:48.000000000 -0400
-@@ -221,7 +221,7 @@
+@@ -233,7 +233,7 @@
  
  HOSTCC       = gcc
  HOSTCXX      = g++
diff --git a/2.6.38/4435_grsec-kconfig-gentoo.patch b/2.6.38/4435_grsec-kconfig-gentoo.patch
index 1c44210..87bdcd3 100644
--- a/2.6.38/4435_grsec-kconfig-gentoo.patch
+++ b/2.6.38/4435_grsec-kconfig-gentoo.patch
@@ -303,7 +303,7 @@ diff -Naur linux-2.6.38-hardened-r1.orig/security/Kconfig linux-2.6.38-hardened-
  	help
  	  This is the kernel land equivalent of PAGEEXEC and MPROTECT,
  	  that is, enabling this option will make it harder to inject
-@@ -456,8 +457,9 @@
+@@ -477,8 +478,9 @@
  
  config PAX_MEMORY_UDEREF
  	bool "Prevent invalid userland pointer dereference"