aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-04-30 06:50:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-04-30 06:50:55 +0000
commit56350924f1206ad8e2d6c603c8b437395841a8e0 (patch)
treed4a7087e887d24e6b48d40e152359afc0234e0b7 /main/linux-grsec
parentf26af8bcd27eadc735bbdd7ccf437899d730267a (diff)
downloadaports-56350924f1206ad8e2d6c603c8b437395841a8e0.tar.bz2
aports-56350924f1206ad8e2d6c603c8b437395841a8e0.tar.xz
main/linux-grsec: upgrade to 2.1.14-2.6.32.12-201004292005
the 0006 and 0008 patch was applied upstream
Diffstat (limited to 'main/linux-grsec')
-rw-r--r--main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch120
-rw-r--r--main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch36
-rw-r--r--main/linux-grsec/APKBUILD12
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.12-201004292005.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch)7803
4 files changed, 4240 insertions, 3731 deletions
diff --git a/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch b/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
deleted file mode 100644
index 03ea13fa1e..0000000000
--- a/main/linux-grsec/0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From a60cfaf3df9cd0cddbc24695434ed5bfa917d505 Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@redhat.com>
-Date: Mon, 29 Mar 2010 13:16:02 -0700
-Subject: [PATCH 06/18] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
-
-Official patch to fix the r8169 frame length check error.
-
-Based on this initial thread:
-http://marc.info/?l=linux-netdev&m=126202972828626&w=1
-This is the official patch to fix the frame length problems in the r8169
-driver. As noted in the previous thread, while this patch incurs a performance
-hit on the driver, its possible to improve performance dynamically by updating
-the mtu and rx_copybreak values at runtime to return performance to what it was
-for those NICS which are unaffected by the ideosyncracy (if there are any).
-
-Summary:
-
- A while back Eric submitted a patch for r8169 in which the proper
-allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
-much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A
-long time prior to that however, Francois posted
-126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize
-setting due to the fact that the hardware behaved in odd ways when overlong
-frames were received on NIC's supported by this driver. This was mentioned in a
-security conference recently:
-http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
-
-It seems that if we can't enable frame size filtering, then, as Eric correctly
-noticed, we can find ourselves DMA-ing too much data to a buffer, causing
-corruption. As a result is seems that we are forced to allocate a frame which
-is ready to handle a maximally sized receive.
-
-This obviously has performance issues with it, so to mitigate that issue, this
-patch does two things:
-
-1) Raises the copybreak value to the frame allocation size, which should force
-appropriately sized packets to get allocated on rx, rather than a full new 16k
-buffer.
-
-2) This patch only disables frame filtering initially (i.e., during the NIC
-open), changing the MTU results in ring buffer allocation of a size in relation
-to the new mtu (along with a warning indicating that this is dangerous).
-
-Because of item (2), individuals who can't cope with the performance hit (or can
-otherwise filter frames to prevent the bug), or who have hardware they are sure
-is unaffected by this issue, can manually lower the copybreak and reset the mtu
-such that performance is restored easily.
-
-Signed-off-by: Neil Horman <nhorman@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit c0cd884af045338476b8e69a61fceb3f34ff22f1)
----
- drivers/net/r8169.c | 29 ++++++++++++++++++++++++-----
- 1 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index 24599b5..1484528 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -186,7 +186,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = {
-
- MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
-
--static int rx_copybreak = 200;
-+/*
-+ * we set our copybreak very high so that we don't have
-+ * to allocate 16k frames all the time (see note in
-+ * rtl8169_open()
-+ */
-+static int rx_copybreak = 16383;
- static int use_dac;
- static struct {
- u32 msg_enable;
-@@ -3245,9 +3250,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
- }
-
- static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
-- struct net_device *dev)
-+ unsigned int mtu)
- {
-- unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
-+ unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
-+
-+ if (max_frame != 16383)
-+ printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
-+ "May lead to frame reception errors!\n");
-
- tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
- }
-@@ -3259,7 +3268,17 @@ static int rtl8169_open(struct net_device *dev)
- int retval = -ENOMEM;
-
-
-- rtl8169_set_rxbufsize(tp, dev);
-+ /*
-+ * Note that we use a magic value here, its wierd I know
-+ * its done because, some subset of rtl8169 hardware suffers from
-+ * a problem in which frames received that are longer than
-+ * the size set in RxMaxSize register return garbage sizes
-+ * when received. To avoid this we need to turn off filtering,
-+ * which is done by setting a value of 16383 in the RxMaxSize register
-+ * and allocating 16k frames to handle the largest possible rx value
-+ * thats what the magic math below does.
-+ */
-+ rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN);
-
- /*
- * Rx and Tx desscriptors needs 256 bytes alignment.
-@@ -3912,7 +3931,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
-
- rtl8169_down(dev);
-
-- rtl8169_set_rxbufsize(tp, dev);
-+ rtl8169_set_rxbufsize(tp, dev->mtu);
-
- ret = rtl8169_init_ring(dev);
- if (ret < 0)
---
-1.7.0.2
-
diff --git a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch b/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
deleted file mode 100644
index dff3fd2112..0000000000
--- a/main/linux-grsec/0008-r8169-clean-up-my-printk-uglyness.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d1c9ac562923fa0b1738fceb4c7bafac3ab936ba Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@tuxdriver.com>
-Date: Thu, 1 Apr 2010 07:30:07 +0000
-Subject: [PATCH 08/18] r8169: clean up my printk uglyness
-
-Fix formatting on r8169 printk
-
-Brandon Philips noted that I had a spacing issue in my printk for the
-last r8169 patch that made it quite ugly. Fix that up and add the PFX
-macro to it as well so it looks like the other r8169 printks
-
-Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e)
----
- drivers/net/r8169.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index bed1d47..790555e 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
- unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
-
- if (max_frame != 16383)
-- printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
-- "May lead to frame reception errors!\n");
-+ printk(KERN_WARNING PFX "WARNING! Changing of MTU on this "
-+ "NIC may lead to frame reception errors!\n");
-
- tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
- }
---
-1.7.0.2
-
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 759d6716e3..f5983aa38b 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
_flavor=grsec
pkgname=linux-${_flavor}
-pkgver=2.6.32.11
+pkgver=2.6.32.12
_kernver=2.6.32
pkgrel=2
pkgdesc="Linux kernel with grsecurity"
@@ -14,15 +14,13 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- grsecurity-2.1.14-2.6.32.11-201004071936.patch
+ grsecurity-2.1.14-2.6.32.12-201004292005.patch
0001-grsec-revert-conflicting-flow-cache-changes.patch
0002-gre-fix-hard-header-destination-address-checking.patch
0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
0004-arp-flush-arp-cache-on-device-change.patch
0005-r8169-fix-broken-register-writes.patch
- 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
0007-r8169-Fix-rtl8169_rx_interrupt.patch
- 0008-r8169-clean-up-my-printk-uglyness.patch
0009-ipsec-Fix-bogus-bundle-flowi.patch
0010-xfrm-Remove-xfrm_state_genid.patch
0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
@@ -138,16 +136,14 @@ firmware() {
}
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-855c248334a71ef5ca3d8cb89d51334f patch-2.6.32.11.bz2
-6eabb0c08a988a97a823b5462d1c5018 grsecurity-2.1.14-2.6.32.11-201004071936.patch
+9d097d34648a1734b1a7f97c5d000f03 patch-2.6.32.12.bz2
+6c360e4ba40b91137f6ab8b5996e9b1f grsecurity-2.1.14-2.6.32.12-201004292005.patch
1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
afa06334c81f21c20571286a83d3d928 0005-r8169-fix-broken-register-writes.patch
-c538c0f735d79fd71b47dde02bf1f790 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
5f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch
-f878c802700e3babd03be3505119c5c2 0008-r8169-clean-up-my-printk-uglyness.patch
cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch
3af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch
9f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.12-201004292005.patch
index 62c446bc3e..e491c2581d 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.11-201004071936.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.12-201004292005.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alpha/include/asm/elf.h
---- linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/alpha/include/asm/elf.h linux-2.6.32.12/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.12/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -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.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/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.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/alpha/include/asm/pgtable.h linux-2.6.32.12/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -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.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/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.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha/kernel/module.c
---- linux-2.6.32.11/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/alpha/kernel/module.c linux-2.6.32.12/arch/alpha/kernel/module.c
+--- linux-2.6.32.12/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -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.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/alpha/kernel/osf_sys.c linux-2.6.32.12/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400
@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alph
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/fault.c
---- linux-2.6.32.11/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/alpha/mm/fault.c linux-2.6.32.12/arch/alpha/mm/fault.c
+--- linux-2.6.32.12/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/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.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/include/asm/elf.h
---- linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/include/asm/elf.h linux-2.6.32.12/arch/arm/include/asm/elf.h
+--- linux-2.6.32.12/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -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. */
@@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/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.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/include/asm/kmap_types.h linux-2.6.32.12/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/kmap_types.h linux-2.6.32.11/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/include/asm/uaccess.h linux-2.6.32.12/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.12/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -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)
@@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/a
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kernel/kgdb.c
---- linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/kernel/kgdb.c linux-2.6.32.12/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.12/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kerne
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach-at91/pm.c
---- linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-at91/pm.c linux-2.6.32.12/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.12/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-omap1/pm.c linux-2.6.32.12/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.12/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mac
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/m
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-pxa/pm.c linux-2.6.32.12/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.12/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.11/arch/a
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mach-sa1100/pm.c linux-2.6.32.12/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/ma
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault.c
---- linux-2.6.32.11/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mm/fault.c linux-2.6.32.12/arch/arm/mm/fault.c
+--- linux-2.6.32.12/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c
---- linux-2.6.32.11/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/mm/mmap.c linux-2.6.32.12/arch/arm/mm/mmap.c
+--- linux-2.6.32.12/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c
mm->cached_hole_size = 0;
goto full_search;
}
-diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/arm/plat-s3c/pm.c linux-2.6.32.12/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.12/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr32/include/asm/elf.h
---- linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/avr32/include/asm/elf.h linux-2.6.32.12/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.12/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -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. */
@@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/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.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h linux-2.6.32.11/a
};
#undef D
-diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr3
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/fault.c
---- linux-2.6.32.11/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/avr32/mm/fault.c linux-2.6.32.12/arch/avr32/mm/fault.c
+--- linux-2.6.32.12/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/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.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/blackfin/kernel/kgdb.c linux-2.6.32.12/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -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 */
}
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blac
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/blackfin/mach-common/pm.c linux-2.6.32.12/arch/blackfin/mach-common/pm.c
+--- linux-2.6.32.12/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/b
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/frv/include/asm/kmap_types.h linux-2.6.32.12/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.11/arch/frv/include/asm/kmap_types.h linux-2.6.32.11/arc
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.11/arch
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400
@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -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))
@@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia
/* Ugly but avoids duplication */
#include "../../../fs/binfmt_elf.c"
-diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/ia32/ia32priv.h linux-2.6.32.12/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/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.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.11/a
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64/include/asm/elf.h
---- linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/include/asm/elf.h linux-2.6.32.12/arch/ia64/include/asm/elf.h
+--- linux-2.6.32.12/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/include/asm/machvec.h linux-2.6.32.12/arch/ia64/include/asm/machvec.h
+--- linux-2.6.32.12/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/include/asm/pgtable.h linux-2.6.32.12/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
@@ -143,6 +143,17 @@
#define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
#define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/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.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/include/asm/uaccess.h linux-2.6.32.12/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/i
{
return dma_ops;
}
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/kernel/module.c
---- linux-2.6.32.11/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/module.c linux-2.6.32.12/arch/ia64/kernel/module.c
+--- linux-2.6.32.12/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/k
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/pci-dma.c linux-2.6.32.12/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/
static int __init pci_iommu_init(void)
{
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/i
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64
goto full_search;
}
return -ENOMEM;
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64/kernel/topology.c
---- linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/topology.c linux-2.6.32.12/arch/ia64/kernel/topology.c
+--- linux-2.6.32.12/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64
.show = cache_show
};
-diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/i
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fault.c
---- linux-2.6.32.11/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/mm/fault.c linux-2.6.32.12/arch/ia64/mm/fault.c
+--- linux-2.6.32.12/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fau
survive:
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init.c
---- linux-2.6.32.11/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/mm/init.c linux-2.6.32.12/arch/ia64/mm/init.c
+--- linux-2.6.32.12/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -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;
@@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/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.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.11/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.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/lib/usercopy.c
---- linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/m32r/lib/usercopy.c linux-2.6.32.12/arch/m32r/lib/usercopy.c
+--- linux-2.6.32.12/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/li
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch
.valid = suspend_valid_only_mem,
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
-diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips/include/asm/elf.h
---- linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/include/asm/elf.h linux-2.6.32.12/arch/mips/include/asm/elf.h
+--- linux-2.6.32.12/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips
+#endif
+
#endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mips/include/asm/page.h
---- linux-2.6.32.11/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/include/asm/page.h linux-2.6.32.12/arch/mips/include/asm/page.h
+--- linux-2.6.32.12/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -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;
@@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mip
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/mips/include/asm/system.h
---- linux-2.6.32.11/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/include/asm/system.h linux-2.6.32.12/arch/mips/include/asm/system.h
+--- linux-2.6.32.12/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/m
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -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)
@@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -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)
@@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/kernel/kgdb.c
---- linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/kernel/kgdb.c linux-2.6.32.12/arch/mips/kernel/kgdb.c
+--- linux-2.6.32.12/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/ker
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/kernel/process.c
---- linux-2.6.32.11/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/kernel/process.c linux-2.6.32.12/arch/mips/kernel/process.c
+--- linux-2.6.32.12/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/kernel/syscall.c
---- linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/kernel/syscall.c linux-2.6.32.12/arch/mips/kernel/syscall.c
+--- linux-2.6.32.12/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400
@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
else
-diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fault.c
---- linux-2.6.32.11/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/mips/mm/fault.c linux-2.6.32.12/arch/mips/mm/fault.c
+--- linux-2.6.32.12/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/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.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/parisc/include/asm/elf.h
---- linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/parisc/include/asm/elf.h linux-2.6.32.12/arch/parisc/include/asm/elf.h
+--- linux-2.6.32.12/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/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.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/parisc/include/asm/pgtable.h linux-2.6.32.12/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/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.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/parisc/kernel/module.c
---- linux-2.6.32.11/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/parisc/kernel/module.c linux-2.6.32.12/arch/parisc/kernel/module.c
+--- linux-2.6.32.12/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/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.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400
@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
@@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/parisc/kernel/traps.c
---- linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/parisc/kernel/traps.c linux-2.6.32.12/arch/parisc/kernel/traps.c
+--- linux-2.6.32.12/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/paris
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm/fault.c
---- linux-2.6.32.11/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
+diff -urNp linux-2.6.32.12/arch/parisc/mm/fault.c linux-2.6.32.12/arch/parisc/mm/fault.c
+--- linux-2.6.32.12/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arch/powerpc/include/asm/device.h
---- linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/device.h linux-2.6.32.12/arch/powerpc/include/asm/device.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/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.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/elf.h linux-2.6.32.12/arch/powerpc/include/asm/elf.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -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. */
@@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/p
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/iommu.h linux-2.6.32.12/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -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);
@@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.11
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/page_64.h linux-2.6.32.12/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -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.
@@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page_64.h linux-2.6.32.11/ar
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/powerpc/include/asm/page.h
---- linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/page.h linux-2.6.32.12/arch/powerpc/include/asm/page.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -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.
@@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/pci.h linux-2.6.32.12/arch/powerpc/include/asm/pci.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/p
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.11
#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.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/reg.h linux-2.6.32.12/arch/powerpc/include/asm/reg.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/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.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/ar
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400
@@ -327,52 +327,6 @@ do { \
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
@@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/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.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c
+--- linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/
.show = cache_index_show,
};
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerpc/kernel/dma.c
---- linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma.c linux-2.6.32.12/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.12/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400
@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/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.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/
{
struct iommu_table *tbl = get_iommu_table_base(dev);
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/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.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/po
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/kgdb.c linux-2.6.32.12/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/power
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/module_32.c linux-2.6.32.12/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/powerpc/kernel/module.c
---- linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/module.c linux-2.6.32.12/arch/powerpc/kernel/module.c
+--- linux-2.6.32.12/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/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.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/pci-common.c linux-2.6.32.12/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/powerpc/kernel/process.c
---- linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/process.c linux-2.6.32.12/arch/powerpc/kernel/process.c
+--- linux-2.6.32.12/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400
@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
sp -= get_random_int() & ~PAGE_MASK;
return sp & ~0xf;
@@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/po
-
- return ret;
-}
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/signal_32.c linux-2.6.32.12/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/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.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/signal_64.c linux-2.6.32.12/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/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.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c
+--- linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/
}
return error;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/vdso.c linux-2.6.32.12/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/power
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerpc/kernel/vio.c
---- linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/kernel/vio.c linux-2.6.32.12/arch/powerpc/kernel/vio.c
+--- linux-2.6.32.12/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerp
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/p
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/mm/fault.c
---- linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/mm/fault.c linux-2.6.32.12/arch/powerpc/mm/fault.c
+--- linux-2.6.32.12/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/mm/mmap_64.c linux-2.6.32.12/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerp
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/mm/slice.c
---- linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/mm/slice.c linux-2.6.32.12/arch/powerpc/mm/slice.c
+--- linux-2.6.32.12/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400
@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
@@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/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.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.11/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.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.11/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.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11
.valid = mpc83xx_suspend_valid,
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -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);
@@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/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.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.11/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.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig
+--- linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390/include/asm/elf.h
---- linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/s390/include/asm/elf.h linux-2.6.32.12/arch/s390/include/asm/elf.h
+--- linux-2.6.32.12/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -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)
@@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/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.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s390/include/asm/setup.h
---- linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/s390/include/asm/setup.h linux-2.6.32.12/arch/s390/include/asm/setup.h
+--- linux-2.6.32.12/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s3
#else
#define s390_noexec (0)
#endif
-diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/s390/include/asm/uaccess.h linux-2.6.32.12/arch/s390/include/asm/uaccess.h
+--- linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else
-diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig
---- linux-2.6.32.11/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400
+diff -urNp linux-2.6.32.12/arch/s390/Kconfig linux-2.6.32.12/arch/s390/Kconfig
+--- linux-2.6.32.12/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400
@@ -194,28 +194,26 @@ config AUDIT_ARCH
config S390_SWITCH_AMODE
@@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig
comment "Code generation options"
-diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/kernel/module.c
---- linux-2.6.32.11/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/s390/kernel/module.c linux-2.6.32.12/arch/s390/kernel/module.c
+--- linux-2.6.32.12/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/k
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/kernel/setup.c
---- linux-2.6.32.11/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/s390/kernel/setup.c linux-2.6.32.12/arch/s390/kernel/setup.c
+--- linux-2.6.32.12/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/ke
static void setup_addressing_mode(void)
{
if (s390_noexec) {
-diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap.c
---- linux-2.6.32.11/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/s390/mm/mmap.c linux-2.6.32.12/arch/s390/mm/mmap.c
+--- linux-2.6.32.12/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/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.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.11/arch/s
.enter = hp6x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c
+--- linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.11/arch/sh/k
.show = sq_sysfs_show,
.store = sq_sysfs_store,
};
-diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch
.enter = sh_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/kgdb.c
---- linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sh/kernel/kgdb.c linux-2.6.32.12/arch/sh/kernel/kgdb.c
+--- linux-2.6.32.12/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400
@@ -14,18 +14,38 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/ar
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -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)
@@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.11/
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.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/elf_32.h linux-2.6.32.12/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_32.h linux-2.6.32.11/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.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/elf_64.h linux-2.6.32.12/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/elf_64.h linux-2.6.32.11/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.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.11/a
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arc
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.11/
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -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)
@@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.11/a
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.11/a
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/kernel/iommu.c
---- linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/iommu.c linux-2.6.32.12/arch/sparc/kernel/iommu.c
+--- linux-2.6.32.12/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc/kernel/ioport.c
---- linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/ioport.c linux-2.6.32.12/arch/sparc/kernel/ioport.c
+--- linux-2.6.32.12/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/spar
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/spar
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc/kernel/Makefile
---- linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/Makefile linux-2.6.32.12/arch/sparc/kernel/Makefile
+--- linux-2.6.32.12/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400
@@ -3,7 +3,7 @@
#
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/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.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.11/arch
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -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.
@@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.11/arch
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/kernel/traps_64.c linux-2.6.32.12/arch/sparc/kernel/traps_64.c
+--- linux-2.6.32.12/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400
@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
lvl -= 0x100;
@@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/spa
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/lib/atomic_64.S linux-2.6.32.12/arch/sparc/lib/atomic_64.S
+--- linux-2.6.32.12/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, 2f
-diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib/ksyms.c
---- linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/lib/ksyms.c linux-2.6.32.12/arch/sparc/lib/ksyms.c
+--- linux-2.6.32.12/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400
@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib
EXPORT_SYMBOL(atomic_sub_ret);
EXPORT_SYMBOL(atomic64_add);
EXPORT_SYMBOL(atomic64_add_ret);
-diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/lib/rwsem_64.S linux-2.6.32.12/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefile
---- linux-2.6.32.11/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/Makefile linux-2.6.32.12/arch/sparc/Makefile
+--- linux-2.6.32.12/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefi
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/mm/fault_32.c
---- linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/mm/fault_32.c linux-2.6.32.12/arch/sparc/mm/fault_32.c
+--- linux-2.6.32.12/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/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.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/mm/fault_64.c
---- linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/mm/fault_64.c linux-2.6.32.12/arch/sparc/mm/fault_64.c
+--- linux-2.6.32.12/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/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.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm/init_32.c
---- linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/mm/init_32.c linux-2.6.32.12/arch/sparc/mm/init_32.c
+--- linux-2.6.32.12/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/Makefile
---- linux-2.6.32.11/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/mm/Makefile linux-2.6.32.12/arch/sparc/mm/Makefile
+--- linux-2.6.32.12/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400
@@ -2,7 +2,7 @@
#
@@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/srmmu.c
---- linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/sparc/mm/srmmu.c linux-2.6.32.12/arch/sparc/mm/srmmu.c
+--- linux-2.6.32.12/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -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));
@@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/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.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/um/include/asm/kmap_types.h linux-2.6.32.12/arch/um/include/asm/kmap_types.h
+--- linux-2.6.32.12/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.11/arch/um/include/asm/kmap_types.h linux-2.6.32.11/arch
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/include/asm/page.h
---- linux-2.6.32.11/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/um/include/asm/page.h linux-2.6.32.12/arch/um/include/asm/page.h
+--- linux-2.6.32.12/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/in
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/um/sys-i386/syscalls.c linux-2.6.32.12/arch/um/sys-i386/syscalls.c
+--- linux-2.6.32.12/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/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.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/bitops.h
---- linux-2.6.32.11/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/bitops.h linux-2.6.32.12/arch/x86/boot/bitops.h
+--- linux-2.6.32.12/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/boot.h
---- linux-2.6.32.11/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/boot.h linux-2.6.32.12/arch/x86/boot/boot.h
+--- linux-2.6.32.12/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/bo
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/head_32.S linux-2.6.32.12/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_32.S linux-2.6.32.11/ar
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/head_64.S linux-2.6.32.12/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/head_64.S linux-2.6.32.11/ar
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/misc.c linux-2.6.32.12/arch/x86/boot/compressed/misc.c
+--- linux-2.6.32.12/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/ar
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/relocs.c linux-2.6.32.12/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arc
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boot/cpucheck.c
---- linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/cpucheck.c linux-2.6.32.12/arch/x86/boot/cpucheck.c
+--- linux-2.6.32.12/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boo
err = check_flags();
}
-diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/header.S
---- linux-2.6.32.11/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/header.S linux-2.6.32.12/arch/x86/boot/header.S
+--- linux-2.6.32.12/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -5316,9 +5316,33 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/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.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/boot/video-vesa.c
---- linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/boot/memory.c linux-2.6.32.12/arch/x86/boot/memory.c
+--- linux-2.6.32.12/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/memory.c 2010-04-29 17:46:37.065247062 -0400
+@@ -19,7 +19,7 @@
+
+ static int detect_memory_e820(void)
+ {
+- int count = 0;
++ unsigned int count = 0;
+ 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.12/arch/x86/boot/video.c linux-2.6.32.12/arch/x86/boot/video.c
+--- linux-2.6.32.12/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/video.c 2010-04-29 17:46:37.069058404 -0400
+@@ -90,7 +90,7 @@ static void store_mode_params(void)
+ static unsigned int get_entry(void)
+ {
+ char entry_buf[4];
+- int i, len = 0;
++ unsigned int i, len = 0;
+ int key;
+ unsigned int v;
+
+diff -urNp linux-2.6.32.12/arch/x86/boot/video-vesa.c linux-2.6.32.12/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.12/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5327,9 +5351,9 @@ diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/b
}
/*
-diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/ia32/ia32entry.S linux-2.6.32.12/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.12/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -5424,9 +5448,9 @@ diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/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.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/ia32/ia32_signal.c linux-2.6.32.12/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -5445,9 +5469,9 @@ diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/
};
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/arch/x86/include/asm/alternative.h
---- linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/alternative.h linux-2.6.32.12/arch/x86/include/asm/alternative.h
+--- linux-2.6.32.12/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -5457,9 +5481,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/ar
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/include/asm/apm.h
---- linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/apm.h linux-2.6.32.12/arch/x86/include/asm/apm.h
+--- linux-2.6.32.12/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -5478,9 +5502,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/i
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/atomic_32.h linux-2.6.32.12/arch/x86/include/asm/atomic_32.h
+--- linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -5811,9 +5835,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/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.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/atomic_64.h linux-2.6.32.12/arch/x86/include/asm/atomic_64.h
+--- linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -6391,9 +6415,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch
}
/**
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/include/asm/boot.h
---- linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/boot.h linux-2.6.32.12/arch/x86/include/asm/boot.h
+--- linux-2.6.32.12/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -6411,9 +6435,30 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/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.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86/include/asm/cache.h
---- linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/cacheflush.h linux-2.6.32.12/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 2010-04-29 17:46:37.069058404 -0400
+@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
+ static inline unsigned long get_page_memtype(struct page *pg)
+ {
+ if (!PageUncached(pg) && !PageWC(pg))
+- return -1;
++ return ~0UL;
+ else if (!PageUncached(pg) && PageWC(pg))
+ return _PAGE_CACHE_WC;
+ else if (PageUncached(pg) && !PageWC(pg))
+@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru
+ SetPageWC(pg);
+ break;
+ default:
+- case -1:
++ case ~0UL:
+ ClearPageUncached(pg);
+ ClearPageWC(pg);
+ break;
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/cache.h linux-2.6.32.12/arch/x86/include/asm/cache.h
+--- linux-2.6.32.12/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -6422,9 +6467,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86
#ifdef CONFIG_X86_VSMP
/* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/checksum_32.h linux-2.6.32.12/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -6458,9 +6503,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/checksum_32.h linux-2.6.32.11/ar
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/include/asm/desc.h
---- linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/desc.h linux-2.6.32.12/arch/x86/include/asm/desc.h
+--- linux-2.6.32.12/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/desc.h 2010-04-29 17:46:36.819981711 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -6554,7 +6599,66 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/
}
#define _LDT_empty(info) \
-@@ -392,4 +402,16 @@ static inline void set_system_intr_gate_
+@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct
+ desc->limit = (limit >> 16) & 0xf;
+ }
+
+-static inline void _set_gate(int gate, unsigned type, void *addr,
++static inline void _set_gate(int gate, unsigned type, const void *addr,
+ unsigned dpl, unsigned ist, unsigned seg)
+ {
+ gate_desc s;
+@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, u
+ * Pentium F0 0F bugfix can have resulted in the mapped
+ * IDT being write-protected.
+ */
+-static inline void set_intr_gate(unsigned int n, void *addr)
++static inline void set_intr_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
+@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsig
+ /*
+ * This routine sets up an interrupt gate at directory privilege level 3.
+ */
+-static inline void set_system_intr_gate(unsigned int n, void *addr)
++static inline void set_system_intr_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
+ }
+
+-static inline void set_system_trap_gate(unsigned int n, void *addr)
++static inline void set_system_trap_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
+ }
+
+-static inline void set_trap_gate(unsigned int n, void *addr)
++static inline void set_trap_gate(unsigned int n, const void *addr)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
+@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigne
+ static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
++ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
+ }
+
+-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
++static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
+ {
+ BUG_ON((unsigned)n > 0xFF);
+ _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
+ }
+
+-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
++static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
+ {
+ BUG_ON((unsigned)n > 0xFF);
_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
}
@@ -6571,9 +6675,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x86/include/asm/device.h
---- linux-2.6.32.11/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/device.h linux-2.6.32.12/arch/x86/include/asm/device.h
+--- linux-2.6.32.12/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -6583,9 +6687,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x8
#endif
#ifdef CONFIG_DMAR
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -6625,9 +6729,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h linux-2.6.32.11/ar
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/include/asm/e820.h
---- linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/e820.h linux-2.6.32.12/arch/x86/include/asm/e820.h
+--- linux-2.6.32.12/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -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)
@@ -6637,9 +6741,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/include/asm/elf.h
---- linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/elf.h linux-2.6.32.12/arch/x86/include/asm/elf.h
+--- linux-2.6.32.12/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -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. */
@@ -6693,9 +6797,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/i
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86/include/asm/futex.h
---- linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/futex.h linux-2.6.32.12/arch/x86/include/asm/futex.h
+--- linux-2.6.32.12/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
@@ -6832,9 +6936,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86
: "memory"
);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/include/asm/i387.h
---- linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/i387.h linux-2.6.32.12/arch/x86/include/asm/i387.h
+--- linux-2.6.32.12/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -6875,9 +6979,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86/include/asm/io_64.h
---- linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/io_64.h linux-2.6.32.12/arch/x86/include/asm/io_64.h
+--- linux-2.6.32.12/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -6896,9 +7000,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/io_64.h linux-2.6.32.11/arch/x86
#include <asm-generic/iomap.h>
void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86/include/asm/iommu.h
---- linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/iommu.h linux-2.6.32.12/arch/x86/include/asm/iommu.h
+--- linux-2.6.32.12/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400
@@ -3,7 +3,7 @@
extern void pci_iommu_shutdown(void);
@@ -6908,9 +7012,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86
extern int force_iommu, no_iommu;
extern int iommu_detected;
extern int iommu_pass_through;
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/irqflags.h linux-2.6.32.11/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.11/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/irqflags.h 2010-04-07 19:33:06.601891934 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/irqflags.h linux-2.6.32.12/arch/x86/include/asm/irqflags.h
+--- linux-2.6.32.12/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/irqflags.h 2010-04-07 19:33:06.601891934 -0400
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -6923,10 +7027,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/irqflags.h linux-2.6.32.11/arch/
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/kvm_host.h linux-2.6.32.11/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-04-04 20:46:41.500459645 -0400
-@@ -531,7 +531,7 @@ struct kvm_x86_ops {
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/kvm_host.h linux-2.6.32.12/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:57.941485514 -0400
+@@ -532,7 +532,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
@@ -6935,9 +7039,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/kvm_host.h linux-2.6.32.11/arch/
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/local.h linux-2.6.32.11/arch/x86/include/asm/local.h
---- linux-2.6.32.11/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/local.h linux-2.6.32.12/arch/x86/include/asm/local.h
+--- linux-2.6.32.12/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400
@@ -18,26 +18,90 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -7162,9 +7266,23 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/local.h linux-2.6.32.11/arch/x86
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch/x86/include/asm/microcode.h
---- linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 2010-04-29 17:46:37.069058404 -0400
+@@ -81,8 +81,8 @@ static inline unsigned char current_lock
+ #else
+ #define lock_cmos_prefix(reg) do {} while (0)
+ #define lock_cmos_suffix(reg) do {} while (0)
+-#define lock_cmos(reg)
+-#define unlock_cmos()
++#define lock_cmos(reg) do {} while (0)
++#define unlock_cmos() do {} while (0)
+ #define do_i_have_lock_cmos() 0
+ #define current_lock_cmos_reg() 0
+ #endif
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/microcode.h linux-2.6.32.12/arch/x86/include/asm/microcode.h
+--- linux-2.6.32.12/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -7205,9 +7323,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch
{
return NULL;
}
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/mman.h linux-2.6.32.11/arch/x86/include/asm/mman.h
---- linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/mman.h linux-2.6.32.12/arch/x86/include/asm/mman.h
+--- linux-2.6.32.12/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -7223,9 +7341,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mman.h linux-2.6.32.11/arch/x86/
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-04-06 22:21:53.692294722 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/mmu_context.h linux-2.6.32.12/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 2010-04-29 17:46:36.829235058 -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)
@@ -7248,7 +7366,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar
#ifdef CONFIG_SMP
if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -34,37 +49,96 @@ static inline void switch_mm(struct mm_s
+@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s
struct task_struct *tsk)
{
unsigned cpu = smp_processor_id();
@@ -7284,6 +7402,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar
*/
if (unlikely(prev->context.ldt != next->context.ldt))
load_LDT_nolock(&next->context);
+- }
+
+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
+ if (!nx_enabled) {
@@ -7298,18 +7417,15 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar
+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
+ prev->context.user_cs_limit != next->context.user_cs_limit))
+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
-+#ifdef CONFIG_SMP
+ #ifdef CONFIG_SMP
+ else if (unlikely(tlbstate != TLBSTATE_OK))
+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
+#endif
+#endif
+
- }
- #ifdef CONFIG_SMP
++ }
else {
- percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
- BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
-
++
+#ifdef CONFIG_PAX_PER_CPU_PGD
+ pax_open_kernel();
+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
@@ -7318,8 +7434,11 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar
+ load_cr3(get_cpu_pgd(cpu));
+#endif
+
- if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next))) {
- /* We were in lazy tlb mode and leave_mm disabled
++#ifdef CONFIG_SMP
+ percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
+ BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
+
+@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s
* tlb flush IPI delivery. We must reload CR3
* to make sure to use no freed page tables.
*/
@@ -7343,11 +7462,15 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar
+#endif
+
}
- }
+- }
#endif
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu.h linux-2.6.32.11/arch/x86/include/asm/mmu.h
---- linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400
++ }
+ }
+
+ #define activate_mm(prev, next) \
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/mmu.h linux-2.6.32.12/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.12/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -7374,9 +7497,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu.h linux-2.6.32.11/arch/x86/i
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/module.h linux-2.6.32.11/arch/x86/include/asm/module.h
---- linux-2.6.32.11/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/module.h linux-2.6.32.12/arch/x86/include/asm/module.h
+--- linux-2.6.32.12/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
@@ -7410,9 +7533,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/module.h linux-2.6.32.11/arch/x8
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_32_types.h linux-2.6.32.11/arch/x86/include/asm/page_32_types.h
---- linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/page_32_types.h linux-2.6.32.12/arch/x86/include/asm/page_32_types.h
+--- linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400
@@ -15,6 +15,10 @@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7424,9 +7547,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_32_types.h linux-2.6.32.11/
#ifdef CONFIG_4KSTACKS
#define THREAD_ORDER 0
#else
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_64_types.h linux-2.6.32.11/arch/x86/include/asm/page_64_types.h
---- linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/page_64_types.h linux-2.6.32.12/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400
@@ -39,6 +39,9 @@
#define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
#define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -7437,9 +7560,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/page_64_types.h linux-2.6.32.11/
/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
#define __PHYSICAL_MASK_SHIFT 46
#define __VIRTUAL_MASK_SHIFT 47
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-04-07 16:58:23.343008831 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/paravirt.h linux-2.6.32.12/arch/x86/include/asm/paravirt.h
+--- linux-2.6.32.12/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/paravirt.h 2010-04-07 16:58:23.343008831 -0400
@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -7493,9 +7616,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -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,
@@ -7509,9 +7632,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h linux-2.6.32.11
};
struct raw_spinlock;
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pci_x86.h linux-2.6.32.11/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pci_x86.h linux-2.6.32.12/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -7534,9 +7657,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pci_x86.h linux-2.6.32.11/arch/x
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgalloc.h linux-2.6.32.12/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -7551,9 +7674,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -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)
@@ -7564,9 +7687,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.11
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400
@@ -26,8 +26,6 @@
struct mm_struct;
struct vm_area_struct;
@@ -7608,9 +7731,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h linux-2.6.32.11/arc
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -7640,9 +7763,9 @@ diff -urNp linux-2.6.32.11/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.11/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7660,9 +7783,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.11
}
/*
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -7708,9 +7831,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h linux-2.6.32.11/arc
}
/*
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable.h linux-2.6.32.11/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable.h linux-2.6.32.12/arch/x86/include/asm/pgtable.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400
@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
@@ -7875,9 +7998,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable.h linux-2.6.32.11/arch/x
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -7962,9 +8085,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h linux-2.6.32.11/
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/processor.h linux-2.6.32.11/arch/x86/include/asm/processor.h
---- linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/processor.h linux-2.6.32.12/arch/x86/include/asm/processor.h
+--- linux-2.6.32.12/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400
@@ -272,7 +272,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -8049,9 +8172,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/processor.h linux-2.6.32.11/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.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/ptrace.h linux-2.6.32.12/arch/x86/include/asm/ptrace.h
+--- linux-2.6.32.12/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
}
@@ -8088,9 +8211,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x8
#endif
}
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/reboot.h linux-2.6.32.11/arch/x86/include/asm/reboot.h
---- linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/reboot.h linux-2.6.32.12/arch/x86/include/asm/reboot.h
+--- linux-2.6.32.12/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8100,13 +8223,13 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/reboot.h linux-2.6.32.11/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.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-04-04 20:46:41.505526780 -0400
-@@ -106,10 +106,26 @@ static inline void __down_read(struct rw
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/rwsem.h linux-2.6.32.12/arch/x86/include/asm/rwsem.h
+--- linux-2.6.32.12/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/rwsem.h 2010-04-29 20:01:51.893191958 -0400
+@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
- LOCK_PREFIX " incl (%%eax)\n\t"
+ LOCK_PREFIX _ASM_INC "(%1)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
+#ifdef CONFIG_X86_32
@@ -8117,7 +8240,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ LOCK_PREFIX "decl (%%eax)\n"
++ LOCK_PREFIX _ASM_DEC "(%1)\n\t"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
@@ -8132,14 +8255,14 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
"# ending down_read\n\t"
: "+m" (sem->count)
: "a" (sem)
-@@ -124,13 +140,29 @@ static inline int __down_read_trylock(st
- __s32 result, tmp;
+@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st
+ rwsem_count_t result, tmp;
asm volatile("# beginning __down_read_trylock\n\t"
- " movl %0,%1\n\t"
+ " mov %0,%1\n\t"
- "1:\n\t"
+ "2:\n\t"
- " movl %1,%2\n\t"
- " addl %3,%2\n\t"
+ " mov %1,%2\n\t"
+ " add %3,%2\n\t"
- " jle 2f\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
@@ -8151,14 +8274,14 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ "subl %3,%2\n"
++ "sub %3,%2\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
+ " jle 3f\n\t"
- LOCK_PREFIX " cmpxchgl %2,%0\n\t"
+ LOCK_PREFIX " cmpxchg %2,%0\n\t"
- " jnz 1b\n\t"
- "2:\n\t"
+ " jnz 2b\n\t"
@@ -8166,10 +8289,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
"# ending __down_read_trylock\n\t"
: "+m" (sem->count), "=&a" (result), "=&r" (tmp)
: "i" (RWSEM_ACTIVE_READ_BIAS)
-@@ -148,12 +180,28 @@ static inline void __down_write_nested(s
+@@ -160,12 +192,28 @@ static inline void __down_write_nested(s
tmp = RWSEM_ACTIVE_WRITE_BIAS;
asm volatile("# beginning down_write\n\t"
- LOCK_PREFIX " xadd %%edx,(%%eax)\n\t"
+ LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
+#ifdef CONFIG_X86_32
@@ -8180,14 +8303,14 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ "movl %%edx,(%%eax)\n"
++ "mov %1,(%2)\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
/* subtract 0x0000ffff, returns the old value */
- " testl %%edx,%%edx\n\t"
+ " test %1,%1\n\t"
/* was the count 0 before? */
- " jz 1f\n"
+ " jz 2f\n"
@@ -8197,10 +8320,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
"# ending down_write"
: "+m" (sem->count), "=d" (tmp)
: "a" (sem), "1" (tmp)
-@@ -186,10 +234,26 @@ static inline void __up_read(struct rw_s
- __s32 tmp = -RWSEM_ACTIVE_READ_BIAS;
+@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s
+ rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
asm volatile("# beginning __up_read\n\t"
- LOCK_PREFIX " xadd %%edx,(%%eax)\n\t"
+ LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
+#ifdef CONFIG_X86_32
@@ -8211,7 +8334,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ "movl %%edx,(%%eax)\n"
++ "mov %1,(%2)\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
@@ -8226,10 +8349,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
"# ending __up_read\n"
: "+m" (sem->count), "=d" (tmp)
: "a" (sem), "1" (tmp)
-@@ -204,11 +268,27 @@ static inline void __up_write(struct rw_
+@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_
+ rwsem_count_t tmp;
asm volatile("# beginning __up_write\n\t"
- " movl %2,%%edx\n\t"
- LOCK_PREFIX " xaddl %%edx,(%%eax)\n\t"
+ LOCK_PREFIX " xadd %1,(%2)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
+#ifdef CONFIG_X86_32
@@ -8240,7 +8363,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ "movl %%edx,(%%eax)\n"
++ "mov %1,(%2)\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
@@ -8254,12 +8377,12 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
- "1:\n\t"
+ "2:\n\t"
"# ending __up_write\n"
- : "+m" (sem->count)
- : "a" (sem), "i" (-RWSEM_ACTIVE_WRITE_BIAS)
-@@ -222,10 +302,26 @@ static inline void __downgrade_write(str
+ : "+m" (sem->count), "=d" (tmp)
+ : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
+@@ -234,13 +314,29 @@ static inline void __downgrade_write(str
{
asm volatile("# beginning __downgrade_write\n\t"
- LOCK_PREFIX " addl %2,(%%eax)\n\t"
+ LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
+
+#ifdef CONFIG_PAX_REFCOUNT
+#ifdef CONFIG_X86_32
@@ -8270,13 +8393,16 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ LOCK_PREFIX "subl %2,(%%eax)\n"
++ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
- /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
+ /*
+ * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
+ * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
+ */
- " jns 1f\n\t"
+ " jns 2f\n\t"
" call call_rwsem_downgrade_wake\n"
@@ -8284,13 +8410,13 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+ "2:\n\t"
"# ending __downgrade_write\n"
: "+m" (sem->count)
- : "a" (sem), "i" (-RWSEM_WAITING_BIAS)
-@@ -237,7 +333,23 @@ static inline void __downgrade_write(str
- */
- static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem)
+ : "a" (sem), "er" (-RWSEM_WAITING_BIAS)
+@@ -253,7 +349,23 @@ static inline void __downgrade_write(str
+ static inline void rwsem_atomic_add(rwsem_count_t delta,
+ struct rw_semaphore *sem)
{
-- asm volatile(LOCK_PREFIX "addl %1,%0"
-+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
+- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
++ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
+
+#ifdef CONFIG_PAX_REFCOUNT
+#ifdef CONFIG_X86_32
@@ -8301,18 +8427,18 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ LOCK_PREFIX "subl %1,%0\n"
++ LOCK_PREFIX _ASM_SUB "%1,%0\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
+#endif
+
: "+m" (sem->count)
- : "ir" (delta));
+ : "er" (delta));
}
-@@ -249,7 +361,23 @@ static inline int rwsem_atomic_update(in
+@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic
{
- int tmp = delta;
+ rwsem_count_t tmp = delta;
- asm volatile(LOCK_PREFIX "xadd %0,%1"
+ asm volatile(LOCK_PREFIX "xadd %0,%1\n"
@@ -8326,7 +8452,7 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
+#endif
+ ".pushsection .fixup,\"ax\"\n"
+ "1:\n"
-+ "movl %0,%1\n"
++ "mov %0,%1\n"
+ "jmp 0b\n"
+ ".popsection\n"
+ _ASM_EXTABLE(0b, 1b)
@@ -8335,9 +8461,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/segment.h linux-2.6.32.11/arch/x86/include/asm/segment.h
---- linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/segment.h linux-2.6.32.12/arch/x86/include/asm/segment.h
+--- linux-2.6.32.12/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -8406,9 +8532,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/segment.h linux-2.6.32.11/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.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/spinlock.h linux-2.6.32.12/arch/x86/include/asm/spinlock.h
+--- linux-2.6.32.12/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400
@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
@@ -8512,9 +8638,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/system.h linux-2.6.32.11/arch/x86/include/asm/system.h
---- linux-2.6.32.11/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/system.h linux-2.6.32.12/arch/x86/include/asm/system.h
+--- linux-2.6.32.12/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400
@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -8533,9 +8659,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/system.h linux-2.6.32.11/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.11/arch/x86/include/asm/uaccess_32.h linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -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)
@@ -8665,9 +8791,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h linux-2.6.32.11/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.11/arch/x86/include/asm/uaccess_64.h linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400
@@ -9,6 +9,9 @@
#include <linux/prefetch.h>
#include <linux/lockdep.h>
@@ -8859,9 +8985,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h linux-2.6.32.11/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.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess.h linux-2.6.32.12/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.12/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400
@@ -8,8 +8,11 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -9082,9 +9208,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x
#ifdef CONFIG_X86_32
# include "uaccess_32.h"
#else
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/vgtod.h linux-2.6.32.11/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/vgtod.h linux-2.6.32.12/arch/x86/include/asm/vgtod.h
+--- linux-2.6.32.12/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -9093,9 +9219,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/vgtod.h linux-2.6.32.11/arch/x86
cycle_t (*vread)(void);
cycle_t cycle_last;
cycle_t mask;
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/vmi.h linux-2.6.32.11/arch/x86/include/asm/vmi.h
---- linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/vmi.h linux-2.6.32.12/arch/x86/include/asm/vmi.h
+--- linux-2.6.32.12/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -9104,9 +9230,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/vmi.h linux-2.6.32.11/arch/x86/i
} __attribute__((packed));
struct pnp_header {
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/vsyscall.h linux-2.6.32.11/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/vsyscall.h linux-2.6.32.12/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -9137,9 +9263,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/vsyscall.h linux-2.6.32.11/arch/
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86/include/asm/xsave.h
---- linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/include/asm/xsave.h linux-2.6.32.12/arch/x86/include/asm/xsave.h
+--- linux-2.6.32.12/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -9165,9 +9291,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig
---- linux-2.6.32.11/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
+--- linux-2.6.32.12/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400
@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
hex
default 0xB0000000 if VMSPLIT_3G_OPT
@@ -9214,9 +9340,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig
---help---
Map the 32-bit VDSO to the predictable old-style address too.
---help---
-diff -urNp linux-2.6.32.11/arch/x86/Kconfig.cpu linux-2.6.32.11/arch/x86/Kconfig.cpu
---- linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/Kconfig.cpu linux-2.6.32.12/arch/x86/Kconfig.cpu
+--- linux-2.6.32.12/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400
++++ linux-2.6.32.12/arch/x86/Kconfig.cpu 2010-04-29 17:49:57.921493895 -0400
@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -9244,9 +9370,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig.cpu linux-2.6.32.11/arch/x86/Kconfig
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.32.11/arch/x86/Kconfig.debug linux-2.6.32.11/arch/x86/Kconfig.debug
---- linux-2.6.32.11/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/Kconfig.debug linux-2.6.32.12/arch/x86/Kconfig.debug
+--- linux-2.6.32.12/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400
@@ -99,7 +99,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -9256,9 +9382,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Kconfig.debug linux-2.6.32.11/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.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/kernel/acpi/boot.c
---- linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/boot.c linux-2.6.32.12/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400
++++ linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400
@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -9268,9 +9394,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/
};
/*
-diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
@@ -9280,9 +9406,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1
wrmsr
1:
-diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -9327,9 +9453,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c linux-2.6.32.11/arch/x86
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -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
@@ -9346,9 +9472,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.11/arch
bogus_magic:
jmp bogus_magic
-diff -urNp linux-2.6.32.11/arch/x86/kernel/alternative.c linux-2.6.32.11/arch/x86/kernel/alternative.c
---- linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/alternative.c linux-2.6.32.12/arch/x86/kernel/alternative.c
+--- linux-2.6.32.12/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9421,9 +9547,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/alternative.c linux-2.6.32.11/arch/x8
+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
return addr;
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/amd_iommu.c linux-2.6.32.12/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400
++++ linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:57.953503497 -0400
@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
}
}
@@ -9433,9 +9559,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400
@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
@@ -9472,9 +9598,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c linux-2.6.32.11/arch/x
{
spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/apm_32.c linux-2.6.32.11/arch/x86/kernel/apm_32.c
---- linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/apm_32.c linux-2.6.32.12/arch/x86/kernel/apm_32.c
+--- linux-2.6.32.12/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -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.
@@ -9576,9 +9702,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/apm_32.c linux-2.6.32.11/arch/x86/ker
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400
@@ -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);
@@ -9591,9 +9717,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.11/arch
#endif
#ifdef CONFIG_XEN
-diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -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);
@@ -9621,9 +9747,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.11/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.11/arch/x86/kernel/cpu/common.c linux-2.6.32.11/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/common.c linux-2.6.32.12/arch/x86/kernel/cpu/common.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9732,9 +9858,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/common.c linux-2.6.32.11/arch/x86
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400
@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -9744,9 +9870,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
};
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400
@@ -225,7 +225,7 @@ static struct cpu_model models[] =
{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -9756,9 +9882,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
};
#undef _BANIAS
#undef BANIAS
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel.c linux-2.6.32.11/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel.c linux-2.6.32.12/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400
@@ -140,7 +140,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.
@@ -9768,10 +9894,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel.c linux-2.6.32.11/arch/x86/
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-04 20:46:41.513555986 -0400
-@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-29 17:49:37.537108997 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-29 17:49:57.985196208 -0400
+@@ -916,7 +916,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -9780,9 +9906,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.11
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/Makefile linux-2.6.32.12/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400
@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_common.o = -pg
endif
@@ -9794,9 +9920,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/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.11/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400
@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -9806,9 +9932,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.11/
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400
@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -9861,9 +9987,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.11/arch
};
/*
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
return 0;
}
@@ -9873,9 +9999,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.11/arch/x
.vendor = X86_VENDOR_AMD,
.set = amd_set_mtrr,
.get = amd_get_mtrr,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
return 0;
}
@@ -9885,9 +10011,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.11/ar
.vendor = X86_VENDOR_CENTAUR,
.set = centaur_set_mcr,
.get = centaur_get_mcr,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
post_set();
}
@@ -9897,9 +10023,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.11/arch
.vendor = X86_VENDOR_CYRIX,
.set_all = cyrix_set_all,
.set = cyrix_set_arr,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400
@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
{ MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
{ MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -9918,9 +10044,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.11/ar
.use_intel_if = 1,
.set_all = generic_set_all,
.get = generic_get_mtrr,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -9939,9 +10065,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.11/arch/
{
if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -9992,9 +10118,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.11/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.11/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -10028,10 +10154,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-04-04 20:46:41.517551870 -0400
-@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs
+diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400
++++ linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:57.989487280 -0400
+@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs
break;
callchain_store(entry, frame.return_address);
@@ -10040,10 +10166,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.11/arch
}
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/crash.c linux-2.6.32.11/arch/x86/kernel/crash.c
---- linux-2.6.32.11/arch/x86/kernel/crash.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/crash.c 2010-04-04 20:46:41.517551870 -0400
-@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
+diff -urNp linux-2.6.32.12/arch/x86/kernel/crash.c linux-2.6.32.12/arch/x86/kernel/crash.c
+--- linux-2.6.32.12/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400
++++ linux-2.6.32.12/arch/x86/kernel/crash.c 2010-04-29 17:49:57.989487280 -0400
+@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
#ifdef CONFIG_X86_32
@@ -10052,9 +10178,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/crash.c linux-2.6.32.11/arch/x86/kern
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/doublefault_32.c linux-2.6.32.11/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/doublefault_32.c linux-2.6.32.12/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -10086,9 +10212,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/doublefault_32.c linux-2.6.32.11/arch
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400
@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
* When in-kernel, we also print out the stack and code at the
* time of the fault..
@@ -10133,9 +10259,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c linux-2.6.32.11/arch/x
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack.c linux-2.6.32.12/arch/x86/kernel/dumpstack.c
+--- linux-2.6.32.12/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400
@@ -180,7 +180,7 @@ void dump_stack(void)
#endif
@@ -10163,9 +10289,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-2.6.32.11/arch/x86/kernel/e820.c linux-2.6.32.11/arch/x86/kernel/e820.c
---- linux-2.6.32.11/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/e820.c linux-2.6.32.12/arch/x86/kernel/e820.c
+--- linux-2.6.32.12/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400
@@ -733,7 +733,7 @@ struct early_res {
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10175,9 +10301,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/e820.c linux-2.6.32.11/arch/x86/kerne
};
static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_32.c linux-2.6.32.11/arch/x86/kernel/efi_32.c
---- linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_32.c linux-2.6.32.12/arch/x86/kernel/efi_32.c
+--- linux-2.6.32.12/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400
@@ -38,70 +38,38 @@
*/
@@ -10258,9 +10384,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_32.c linux-2.6.32.11/arch/x86/ker
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400
@@ -6,6 +6,7 @@
*/
@@ -10359,9 +10485,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S linux-2.6.32.11/arch/x8
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_32.S linux-2.6.32.11/arch/x86/kernel/entry_32.S
---- linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_32.S linux-2.6.32.12/arch/x86/kernel/entry_32.S
+--- linux-2.6.32.12/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400
@@ -191,7 +191,67 @@
#endif /* CONFIG_X86_32_LAZY_GS */
@@ -10675,9 +10801,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_32.S linux-2.6.32.11/arch/x86/k
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/kernel/entry_64.S
---- linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-04-07 16:58:23.343008831 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/kernel/entry_64.S
+--- linux-2.6.32.12/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/entry_64.S 2010-04-07 16:58:23.343008831 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -11074,9 +11200,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/k
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.32.11/arch/x86/kernel/ftrace.c linux-2.6.32.11/arch/x86/kernel/ftrace.c
---- linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/ftrace.c linux-2.6.32.12/arch/x86/kernel/ftrace.c
+--- linux-2.6.32.12/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400
@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11142,9 +11268,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ftrace.c linux-2.6.32.11/arch/x86/ker
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.32.11/arch/x86/kernel/head32.c linux-2.6.32.11/arch/x86/kernel/head32.c
---- linux-2.6.32.11/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/head32.c linux-2.6.32.12/arch/x86/kernel/head32.c
+--- linux-2.6.32.12/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400
@@ -16,6 +16,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -11162,9 +11288,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head32.c linux-2.6.32.11/arch/x86/ker
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.32.11/arch/x86/kernel/head_32.S linux-2.6.32.11/arch/x86/kernel/head_32.S
---- linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/head_32.S linux-2.6.32.12/arch/x86/kernel/head_32.S
+--- linux-2.6.32.12/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400
@@ -19,10 +19,17 @@
#include <asm/setup.h>
#include <asm/processor-flags.h>
@@ -11606,9 +11732,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head_32.S linux-2.6.32.11/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.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/kernel/head64.c
---- linux-2.6.32.11/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/head64.c linux-2.6.32.12/arch/x86/kernel/head64.c
+--- linux-2.6.32.12/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400
@@ -29,7 +29,13 @@
static void __init zap_identity_mappings(void)
{
@@ -11623,9 +11749,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/ker
__flush_tlb_all();
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/head_64.S linux-2.6.32.11/arch/x86/kernel/head_64.S
---- linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/head_64.S linux-2.6.32.12/arch/x86/kernel/head_64.S
+--- linux-2.6.32.12/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -11896,9 +12022,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head_64.S linux-2.6.32.11/arch/x86/ke
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -11920,9 +12046,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.11/arch/
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-2.6.32.11/arch/x86/kernel/init_task.c linux-2.6.32.11/arch/x86/kernel/init_task.c
---- linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/init_task.c linux-2.6.32.12/arch/x86/kernel/init_task.c
+--- linux-2.6.32.12/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400
@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
* section. Since TSS's are completely CPU-local, we want them
* on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -11931,9 +12057,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/init_task.c linux-2.6.32.11/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.11/arch/x86/kernel/ioport.c linux-2.6.32.11/arch/x86/kernel/ioport.c
---- linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/ioport.c linux-2.6.32.12/arch/x86/kernel/ioport.c
+--- linux-2.6.32.12/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -11978,9 +12104,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ioport.c linux-2.6.32.11/arch/x86/ker
}
regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/irq_32.c linux-2.6.32.11/arch/x86/kernel/irq_32.c
---- linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/irq_32.c linux-2.6.32.12/arch/x86/kernel/irq_32.c
+--- linux-2.6.32.12/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -11999,9 +12125,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/irq_32.c linux-2.6.32.11/arch/x86/ker
call_on_stack(__do_softirq, isp);
/*
-diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kernel/kgdb.c
---- linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/kgdb.c linux-2.6.32.12/arch/x86/kernel/kgdb.c
+--- linux-2.6.32.12/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400
@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
return instruction_pointer(regs);
}
@@ -12011,9 +12137,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kerne
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/kernel/kprobes.c
---- linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/kernel/kprobes.c
+--- linux-2.6.32.12/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400
@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
char op;
s32 raddr;
@@ -12096,9 +12222,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/ke
return ret;
switch (val) {
-diff -urNp linux-2.6.32.11/arch/x86/kernel/ldt.c linux-2.6.32.11/arch/x86/kernel/ldt.c
---- linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/ldt.c linux-2.6.32.12/arch/x86/kernel/ldt.c
+--- linux-2.6.32.12/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -12163,9 +12289,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ldt.c linux-2.6.32.11/arch/x86/kernel
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400
@@ -26,7 +26,7 @@
#include <asm/system.h>
#include <asm/cacheflush.h>
@@ -12193,9 +12319,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.11/ar
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c
---- linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c
+--- linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400
@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag
}
/* clear the unused entries */
@@ -12210,9 +12336,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.11/ar
addr += PGDIR_SIZE;
}
out:
-diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_amd.c linux-2.6.32.12/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400
@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -12231,9 +12357,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/
{
return &microcode_amd_ops;
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_core.c linux-2.6.32.11/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_core.c linux-2.6.32.12/arch/x86/kernel/microcode_core.c
+--- linux-2.6.32.12/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -12243,9 +12369,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_core.c linux-2.6.32.11/arch
/*
* Synchronization.
-diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_intel.c linux-2.6.32.11/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_intel.c linux-2.6.32.12/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400
@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12280,9 +12406,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_intel.c linux-2.6.32.11/arc
{
return &microcode_intel_ops;
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/module.c linux-2.6.32.11/arch/x86/kernel/module.c
---- linux-2.6.32.11/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/module.c linux-2.6.32.12/arch/x86/kernel/module.c
+--- linux-2.6.32.12/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400
@@ -34,7 +34,7 @@
#define DEBUGP(fmt...)
#endif
@@ -12423,37 +12549,36 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/module.c linux-2.6.32.11/arch/x86/ker
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt.c linux-2.6.32.11/arch/x86/kernel/paravirt.c
---- linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-04-04 20:46:41.521777445 -0400
-@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu
-
- /* Neat trick to map patch type back to the call within the
+diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt.c linux-2.6.32.12/arch/x86/kernel/paravirt.c
+--- linux-2.6.32.12/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/paravirt.c 2010-04-29 17:46:36.865234674 -0400
+@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
--static void *get_call_destination(u8 type)
-+static const void *get_call_destination(u8 type)
+ static void *get_call_destination(u8 type)
{
- struct paravirt_patch_template tmpl = {
+ const struct paravirt_patch_template tmpl = {
.pv_init_ops = pv_init_ops,
.pv_time_ops = pv_time_ops,
.pv_cpu_ops = pv_cpu_ops,
-@@ -133,13 +133,13 @@ static void *get_call_destination(u8 typ
- .pv_lock_ops = pv_lock_ops,
- #endif
- };
-- return *((void **)&tmpl + type);
-+ return *((const void **)&tmpl + type);
- }
-
- unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
- unsigned long addr, unsigned len)
- {
-- void *opfunc = get_call_destination(type);
-+ const void *opfunc = get_call_destination(type);
- unsigned ret;
-
+@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type,
if (opfunc == NULL)
+ /* If there's no function, patch it with a ud2a (BUG) */
+ ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
+- else if (opfunc == _paravirt_nop)
++ else if (opfunc == (void *)_paravirt_nop)
+ /* If the operation is a nop, then nop the callsite */
+ ret = paravirt_patch_nop();
+
+ /* identity functions just return their single argument */
+- else if (opfunc == _paravirt_ident_32)
++ else if (opfunc == (void *)_paravirt_ident_32)
+ ret = paravirt_patch_ident_32(insnbuf, len);
+- else if (opfunc == _paravirt_ident_64)
++ else if (opfunc == (void *)_paravirt_ident_64)
+ ret = paravirt_patch_ident_64(insnbuf, len);
+
+ else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn
if (insn_len > len || start == NULL)
insn_len = len;
@@ -12530,9 +12655,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt.c linux-2.6.32.11/arch/x86/k
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400
@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
__raw_spin_lock(lock);
}
@@ -12542,9 +12667,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400
@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -12554,9 +12679,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.11/arch
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-dma.c linux-2.6.32.11/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-dma.c linux-2.6.32.12/arch/x86/kernel/pci-dma.c
+--- linux-2.6.32.12/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400
@@ -14,7 +14,7 @@
static int forbid_dac __read_mostly;
@@ -12575,10 +12700,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-dma.c linux-2.6.32.11/arch/x86/ke
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-04-04 20:46:41.521777445 -0400
-@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag
+diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 2010-04-29 17:49:37.537108997 -0400
++++ linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 2010-04-29 17:49:57.989487280 -0400
+@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -12587,9 +12712,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c linux-2.6.32.11/arch/x8
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-nommu.c linux-2.6.32.12/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -12599,9 +12724,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -12611,9 +12736,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/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.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86/kernel/process_32.c
---- linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/process_32.c linux-2.6.32.12/arch/x86/kernel/process_32.c
+--- linux-2.6.32.12/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -12708,9 +12833,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86/kernel/process_64.c
---- linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/process_64.c linux-2.6.32.12/arch/x86/kernel/process_64.c
+--- linux-2.6.32.12/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400
++++ linux-2.6.32.12/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400
@@ -91,7 +91,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -12753,9 +12878,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/kernel/process.c
---- linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/process.c linux-2.6.32.12/arch/x86/kernel/process.c
+--- linux-2.6.32.12/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400
++++ linux-2.6.32.12/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400
@@ -73,7 +73,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
@@ -12793,9 +12918,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/ke
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-
-diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/kernel/ptrace.c
---- linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/ptrace.c linux-2.6.32.12/arch/x86/kernel/ptrace.c
+--- linux-2.6.32.12/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -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)
{
@@ -12864,9 +12989,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/ker
/* Send us the fake SIGTRAP */
force_sig_info(SIGTRAP, &info, tsk);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/kernel/reboot.c
---- linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/reboot.c linux-2.6.32.12/arch/x86/kernel/reboot.c
+--- linux-2.6.32.12/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -12943,9 +13068,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/ker
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/setup.c linux-2.6.32.11/arch/x86/kernel/setup.c
---- linux-2.6.32.11/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/setup.c linux-2.6.32.12/arch/x86/kernel/setup.c
+--- linux-2.6.32.12/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400
@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
@@ -12966,9 +13091,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/setup.c linux-2.6.32.11/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.11/arch/x86/kernel/setup_percpu.c linux-2.6.32.11/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/setup_percpu.c linux-2.6.32.12/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400
@@ -25,19 +25,17 @@
# define DBG(x...)
#endif
@@ -13031,9 +13156,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/setup_percpu.c linux-2.6.32.11/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.11/arch/x86/kernel/signal.c linux-2.6.32.11/arch/x86/kernel/signal.c
---- linux-2.6.32.11/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/signal.c linux-2.6.32.12/arch/x86/kernel/signal.c
+--- linux-2.6.32.12/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -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.
@@ -13105,9 +13230,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/signal.c linux-2.6.32.11/arch/x86/ker
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.32.11/arch/x86/kernel/smpboot.c linux-2.6.32.11/arch/x86/kernel/smpboot.c
---- linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/smpboot.c linux-2.6.32.12/arch/x86/kernel/smpboot.c
+--- linux-2.6.32.12/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400
++++ linux-2.6.32.12/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400
@@ -729,7 +729,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13133,9 +13258,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/smpboot.c linux-2.6.32.11/arch/x86/ke
#ifdef CONFIG_X86_32
/* init low mem mapping */
clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-diff -urNp linux-2.6.32.11/arch/x86/kernel/step.c linux-2.6.32.11/arch/x86/kernel/step.c
---- linux-2.6.32.11/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/step.c linux-2.6.32.12/arch/x86/kernel/step.c
+--- linux-2.6.32.12/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -13168,17 +13293,17 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/step.c linux-2.6.32.11/arch/x86/kerne
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -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.11/arch/x86/kernel/sys_i386_32.c linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400
@@ -24,6 +24,21 @@
#include <asm/syscalls.h>
@@ -13425,9 +13550,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c linux-2.6.32.11/arch/x8
}
case 1: /* iBCS2 emulator entry point */
if (!segment_eq(get_fs(), get_ds()))
-diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -13509,9 +13634,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c linux-2.6.32.11/arch/x86
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.32.11/arch/x86/kernel/time.c linux-2.6.32.11/arch/x86/kernel/time.c
---- linux-2.6.32.11/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/time.c linux-2.6.32.12/arch/x86/kernel/time.c
+--- linux-2.6.32.12/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -13550,9 +13675,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/time.c linux-2.6.32.11/arch/x86/kerne
}
return pc;
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/tls.c linux-2.6.32.11/arch/x86/kernel/tls.c
---- linux-2.6.32.11/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/tls.c linux-2.6.32.12/arch/x86/kernel/tls.c
+--- linux-2.6.32.12/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -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;
@@ -13565,9 +13690,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/tls.c linux-2.6.32.11/arch/x86/kernel
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-2.6.32.11/arch/x86/kernel/trampoline_32.S linux-2.6.32.11/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/trampoline_32.S linux-2.6.32.12/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -13590,9 +13715,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/trampoline_32.S linux-2.6.32.11/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.11/arch/x86/kernel/traps.c linux-2.6.32.11/arch/x86/kernel/traps.c
---- linux-2.6.32.11/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/traps.c linux-2.6.32.12/arch/x86/kernel/traps.c
+--- linux-2.6.32.12/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -13742,9 +13867,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/traps.c linux-2.6.32.11/arch/x86/kern
handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
return;
}
-diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel/tsc.c
---- linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/tsc.c linux-2.6.32.12/arch/x86/kernel/tsc.c
+--- linux-2.6.32.12/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400
@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
@@ -13754,9 +13879,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel
};
static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.32.11/arch/x86/kernel/vm86_32.c linux-2.6.32.11/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/vm86_32.c linux-2.6.32.12/arch/x86/kernel/vm86_32.c
+--- linux-2.6.32.12/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -13821,9 +13946,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vm86_32.c linux-2.6.32.11/arch/x86/ke
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.32.11/arch/x86/kernel/vmi_32.c linux-2.6.32.11/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/vmi_32.c linux-2.6.32.12/arch/x86/kernel/vmi_32.c
+--- linux-2.6.32.12/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -13983,9 +14108,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vmi_32.c linux-2.6.32.11/arch/x86/ker
return;
local_irq_save(flags);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400
@@ -26,6 +26,22 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -14273,9 +14398,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.11/arch/x8
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400
@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14309,9 +14434,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c linux-2.6.32.11/arch/x8
};
#endif
-diff -urNp linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic);
@@ -14321,9 +14446,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.11/arch
EXPORT_SYMBOL(__copy_from_user_inatomic);
EXPORT_SYMBOL(copy_page);
-diff -urNp linux-2.6.32.11/arch/x86/kernel/xsave.c linux-2.6.32.11/arch/x86/kernel/xsave.c
---- linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kernel/xsave.c linux-2.6.32.12/arch/x86/kernel/xsave.c
+--- linux-2.6.32.12/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -1;
@@ -14351,10 +14476,21 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/xsave.c linux-2.6.32.11/arch/x86/kern
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/emulate.c
---- linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-04-04 20:46:41.529538490 -0400
-@@ -404,6 +404,7 @@ static u32 group2_table[] = {
+diff -urNp linux-2.6.32.12/arch/x86/kvm/emulate.c linux-2.6.32.12/arch/x86/kvm/emulate.c
+--- linux-2.6.32.12/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400
++++ linux-2.6.32.12/arch/x86/kvm/emulate.c 2010-04-29 17:49:57.993228946 -0400
+@@ -81,8 +81,8 @@
+ #define Src2CL (1<<29)
+ #define Src2ImmByte (2<<29)
+ #define Src2One (3<<29)
+-#define Src2Imm16 (4<<29)
+-#define Src2Mask (7<<29)
++#define Src2Imm16 (4U<<29)
++#define Src2Mask (7U<<29)
+
+ enum {
+ Group1_80, Group1_81, Group1_82, Group1_83,
+@@ -411,6 +411,7 @@ static u32 group2_table[] = {
#define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
do { \
@@ -14362,7 +14498,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/e
__asm__ __volatile__ ( \
_PRE_EFLAGS("0", "4", "2") \
_op _suffix " %"_x"3,%1; " \
-@@ -417,8 +418,6 @@ static u32 group2_table[] = {
+@@ -424,8 +425,6 @@ static u32 group2_table[] = {
/* Raw emulation: instruction has two explicit operands. */
#define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \
@@ -14371,7 +14507,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/e
switch ((_dst).bytes) { \
case 2: \
____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
-@@ -434,7 +433,6 @@ static u32 group2_table[] = {
+@@ -441,7 +440,6 @@ static u32 group2_table[] = {
#define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \
@@ -14379,10 +14515,22 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/e
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
-diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c
---- linux-2.6.32.11/arch/x86/kvm/svm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kvm/svm.c 2010-04-04 20:46:41.529538490 -0400
-@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k
+diff -urNp linux-2.6.32.12/arch/x86/kvm/lapic.c linux-2.6.32.12/arch/x86/kvm/lapic.c
+--- linux-2.6.32.12/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/kvm/lapic.c 2010-04-29 17:46:37.073091406 -0400
+@@ -52,7 +52,7 @@
+ #define APIC_BUS_CYCLE_NS 1
+
+ /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
+-#define apic_debug(fmt, arg...)
++#define apic_debug(fmt, arg...) do {} while (0)
+
+ #define APIC_LVT_NUM 6
+ /* 14 is the version for Xeon and Pentium 8.4.8*/
+diff -urNp linux-2.6.32.12/arch/x86/kvm/svm.c linux-2.6.32.12/arch/x86/kvm/svm.c
+--- linux-2.6.32.12/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400
++++ linux-2.6.32.12/arch/x86/kvm/svm.c 2010-04-29 17:49:58.005400983 -0400
+@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k
static void reload_tss(struct kvm_vcpu *vcpu)
{
int cpu = raw_smp_processor_id();
@@ -14396,7 +14544,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c
load_TR_desc();
}
-@@ -2839,7 +2842,7 @@ static bool svm_gb_page_enable(void)
+@@ -2845,7 +2848,7 @@ static bool svm_gb_page_enable(void)
return true;
}
@@ -14405,10 +14553,10 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/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.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
---- linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-04-04 20:46:41.529538490 -0400
-@@ -566,7 +566,11 @@ static void reload_tss(void)
+diff -urNp linux-2.6.32.12/arch/x86/kvm/vmx.c linux-2.6.32.12/arch/x86/kvm/vmx.c
+--- linux-2.6.32.12/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400
++++ linux-2.6.32.12/arch/x86/kvm/vmx.c 2010-04-29 17:49:58.025065700 -0400
+@@ -568,7 +568,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
descs = (void *)gdt.base;
@@ -14420,7 +14568,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
load_TR_desc();
}
-@@ -1388,8 +1392,11 @@ static __init int hardware_setup(void)
+@@ -1395,8 +1399,11 @@ static __init int hardware_setup(void)
if (!cpu_has_vmx_flexpriority())
flexpriority_enabled = 0;
@@ -14434,7 +14582,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
if (enable_ept && !cpu_has_vmx_ept_2m_page())
kvm_disable_largepages();
-@@ -2339,7 +2346,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -2347,7 +2354,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */
asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
@@ -14443,7 +14591,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
-@@ -3682,6 +3689,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3703,6 +3710,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
"jmp .Lkvm_vmx_return \n\t"
".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
".Lkvm_vmx_return: "
@@ -14456,7 +14604,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
/* Save guest registers, load host registers, keep flags */
"xchg %0, (%%"R"sp) \n\t"
"mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -3728,6 +3741,11 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3749,6 +3762,11 @@ static void vmx_vcpu_run(struct kvm_vcpu
[r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
#endif
[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
@@ -14468,7 +14616,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
: "cc", "memory"
, R"bx", R"di", R"si"
#ifdef CONFIG_X86_64
-@@ -3746,7 +3764,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
+@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
if (vmx->rmode.irq.pending)
fixup_rmode_irq(vmx);
@@ -14477,7 +14625,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c
vmx->launched = 1;
vmx_complete_interrupts(vmx);
-@@ -3921,7 +3939,7 @@ static bool vmx_gb_page_enable(void)
+@@ -3942,7 +3960,7 @@ static bool vmx_gb_page_enable(void)
return false;
}
@@ -14486,9 +14634,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/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.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c
---- linux-2.6.32.11/arch/x86/kvm/x86.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/kvm/x86.c 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/kvm/x86.c linux-2.6.32.12/arch/x86/kvm/x86.c
+--- linux-2.6.32.12/arch/x86/kvm/x86.c 2010-04-29 17:49:37.601044544 -0400
++++ linux-2.6.32.12/arch/x86/kvm/x86.c 2010-04-29 17:49:58.041485405 -0400
@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
@@ -14568,7 +14716,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c
{ NULL }
};
-@@ -1658,7 +1658,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
+@@ -1635,7 +1635,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
struct kvm_interrupt *irq)
{
@@ -14577,7 +14725,7 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c
return -EINVAL;
if (irqchip_in_kernel(vcpu->kvm))
return -ENXIO;
-@@ -3170,10 +3170,10 @@ static struct notifier_block kvmclock_cp
+@@ -3205,10 +3205,10 @@ static struct notifier_block kvmclock_cp
.notifier_call = kvmclock_cpufreq_notifier
};
@@ -14590,9 +14738,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/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.11/arch/x86/lib/checksum_32.S linux-2.6.32.11/arch/x86/lib/checksum_32.S
---- linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/checksum_32.S linux-2.6.32.12/arch/x86/lib/checksum_32.S
+--- linux-2.6.32.12/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -14838,9 +14986,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/checksum_32.S linux-2.6.32.11/arch/x86/l
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.32.11/arch/x86/lib/clear_page_64.S linux-2.6.32.11/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/clear_page_64.S linux-2.6.32.12/arch/x86/lib/clear_page_64.S
+--- linux-2.6.32.12/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -14850,9 +14998,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/clear_page_64.S linux-2.6.32.11/arch/x86
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.11/arch/x86/lib/copy_page_64.S linux-2.6.32.11/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/copy_page_64.S linux-2.6.32.12/arch/x86/lib/copy_page_64.S
+--- linux-2.6.32.12/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -14862,9 +15010,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/copy_page_64.S linux-2.6.32.11/arch/x86/
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_64.S linux-2.6.32.11/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/copy_user_64.S linux-2.6.32.12/arch/x86/lib/copy_user_64.S
+--- linux-2.6.32.12/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -14939,9 +15087,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_64.S linux-2.6.32.11/arch/x86/
movl %edx,%ecx
xorl %eax,%eax
rep
-diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -14966,9 +15114,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.11/a
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
-diff -urNp linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -14987,9 +15135,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.11/arch/
return csum_partial_copy_generic(src, (void __force *)dst,
len, isum, NULL, errp);
}
-diff -urNp linux-2.6.32.11/arch/x86/lib/getuser.S linux-2.6.32.11/arch/x86/lib/getuser.S
---- linux-2.6.32.11/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/getuser.S linux-2.6.32.12/arch/x86/lib/getuser.S
+--- linux-2.6.32.12/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400
@@ -33,14 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15126,9 +15274,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/getuser.S linux-2.6.32.11/arch/x86/lib/g
xor %edx,%edx
mov $(-EFAULT),%_ASM_AX
ret
-diff -urNp linux-2.6.32.11/arch/x86/lib/memcpy_64.S linux-2.6.32.11/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/memcpy_64.S linux-2.6.32.12/arch/x86/lib/memcpy_64.S
+--- linux-2.6.32.12/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400
@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
* It is also a lot simpler. Use this when possible:
*/
@@ -15138,9 +15286,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/memcpy_64.S linux-2.6.32.11/arch/x86/lib
1: .byte 0xeb /* jmp <disp8> */
.byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.11/arch/x86/lib/memset_64.S linux-2.6.32.11/arch/x86/lib/memset_64.S
---- linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/memset_64.S linux-2.6.32.12/arch/x86/lib/memset_64.S
+--- linux-2.6.32.12/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400
@@ -118,7 +118,7 @@ ENDPROC(__memset)
#include <asm/cpufeature.h>
@@ -15150,9 +15298,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/memset_64.S linux-2.6.32.11/arch/x86/lib
1: .byte 0xeb /* jmp <disp8> */
.byte (memset_c - memset) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.32.11/arch/x86/lib/mmx_32.c linux-2.6.32.11/arch/x86/lib/mmx_32.c
---- linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/mmx_32.c linux-2.6.32.12/arch/x86/lib/mmx_32.c
+--- linux-2.6.32.12/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -15468,9 +15616,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/mmx_32.c linux-2.6.32.11/arch/x86/lib/mm
from += 64;
to += 64;
-diff -urNp linux-2.6.32.11/arch/x86/lib/putuser.S linux-2.6.32.11/arch/x86/lib/putuser.S
---- linux-2.6.32.11/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/putuser.S linux-2.6.32.12/arch/x86/lib/putuser.S
+--- linux-2.6.32.12/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -15640,9 +15788,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/putuser.S linux-2.6.32.11/arch/x86/lib/p
movl $-EFAULT,%eax
EXIT
END(bad_put_user)
-diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_32.c linux-2.6.32.11/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_32.c linux-2.6.32.12/arch/x86/lib/usercopy_32.c
+--- linux-2.6.32.12/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400
@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
* Copy a null terminated string from userspace.
*/
@@ -16611,9 +16759,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_32.c linux-2.6.32.11/arch/x86/l
+#endif
+
+EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_64.c linux-2.6.32.11/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_64.c linux-2.6.32.12/arch/x86/lib/usercopy_64.c
+--- linux-2.6.32.12/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -16650,9 +16798,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_64.c linux-2.6.32.11/arch/x86/l
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.11/arch/x86/Makefile linux-2.6.32.11/arch/x86/Makefile
---- linux-2.6.32.11/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/Makefile linux-2.6.32.12/arch/x86/Makefile
+--- linux-2.6.32.12/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400
@@ -189,3 +189,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
@@ -16666,9 +16814,9 @@ diff -urNp linux-2.6.32.11/arch/x86/Makefile linux-2.6.32.11/arch/x86/Makefile
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.32.11/arch/x86/mm/extable.c linux-2.6.32.11/arch/x86/mm/extable.c
---- linux-2.6.32.11/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/extable.c linux-2.6.32.12/arch/x86/mm/extable.c
+--- linux-2.6.32.12/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -16742,9 +16890,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/extable.c linux-2.6.32.11/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.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault.c
---- linux-2.6.32.11/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/fault.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault.c
+--- linux-2.6.32.12/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/fault.c 2010-04-29 17:46:36.897235141 -0400
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -17081,7 +17229,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
if (write) {
/* write, present and write, not present: */
if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -947,17 +1175,29 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -947,17 +1175,31 @@ do_page_fault(struct pt_regs *regs, unsi
{
struct vm_area_struct *vma;
struct task_struct *tsk;
@@ -17094,14 +17242,16 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
+ unsigned long address = read_cr2();
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+ if (!user_mode(regs)) {
++ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
++ if (!search_exception_tables(regs->ip)) {
++ bad_area_nosemaphore(regs, error_code, address);
++ return;
++ }
+ if (address < PAX_USER_SHADOW_BASE) {
-+ if (search_exception_tables(regs->ip)) {
-+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
-+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
-+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
-+ }
-+ } else if (address < 2 * PAX_USER_SHADOW_BASE)
++ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
++ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
++ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
++ } else
+ address -= PAX_USER_SHADOW_BASE;
+ }
+#endif
@@ -17115,7 +17265,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
/*
* Detect and handle instructions that would cause a page fault for
* both a tracked kernel page and a userspace page.
-@@ -1017,7 +1257,7 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1017,7 +1259,7 @@ do_page_fault(struct pt_regs *regs, unsi
* User-mode registers count as a user access even for any
* potential system fault or CPU buglet:
*/
@@ -17124,7 +17274,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
local_irq_enable();
error_code |= PF_USER;
} else {
-@@ -1071,6 +1311,11 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1071,6 +1313,11 @@ do_page_fault(struct pt_regs *regs, unsi
might_sleep();
}
@@ -17136,7 +17286,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
vma = find_vma(mm, address);
if (unlikely(!vma)) {
bad_area(regs, error_code, address);
-@@ -1082,18 +1327,24 @@ do_page_fault(struct pt_regs *regs, unsi
+@@ -1082,18 +1329,24 @@ do_page_fault(struct pt_regs *regs, unsi
bad_area(regs, error_code, address);
return;
}
@@ -17172,7 +17322,7 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
if (unlikely(expand_stack(vma, address))) {
bad_area(regs, error_code, address);
return;
-@@ -1137,3 +1388,199 @@ good_area:
+@@ -1137,3 +1390,199 @@ good_area:
up_read(&mm->mmap_sem);
}
@@ -17372,9 +17522,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.32.11/arch/x86/mm/gup.c linux-2.6.32.11/arch/x86/mm/gup.c
---- linux-2.6.32.11/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/gup.c linux-2.6.32.12/arch/x86/mm/gup.c
+--- linux-2.6.32.12/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -17384,9 +17534,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/gup.c linux-2.6.32.11/arch/x86/mm/gup.c
(void __user *)start, len)))
return 0;
-diff -urNp linux-2.6.32.11/arch/x86/mm/highmem_32.c linux-2.6.32.11/arch/x86/mm/highmem_32.c
---- linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/highmem_32.c linux-2.6.32.12/arch/x86/mm/highmem_32.c
+--- linux-2.6.32.12/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -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);
@@ -17398,9 +17548,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/highmem_32.c linux-2.6.32.11/arch/x86/mm/
return (void *)vaddr;
}
-diff -urNp linux-2.6.32.11/arch/x86/mm/hugetlbpage.c linux-2.6.32.11/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/hugetlbpage.c linux-2.6.32.12/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400
@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -17535,9 +17685,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/hugetlbpage.c linux-2.6.32.11/arch/x86/mm
(!vma || addr + len <= vma->vm_start))
return addr;
}
-diff -urNp linux-2.6.32.11/arch/x86/mm/init_32.c linux-2.6.32.11/arch/x86/mm/init_32.c
---- linux-2.6.32.11/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/init_32.c linux-2.6.32.12/arch/x86/mm/init_32.c
+--- linux-2.6.32.12/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -17841,9 +17991,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/init_32.c linux-2.6.32.11/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.11/arch/x86/mm/init_64.c linux-2.6.32.11/arch/x86/mm/init_64.c
---- linux-2.6.32.11/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/init_64.c linux-2.6.32.12/arch/x86/mm/init_64.c
+--- linux-2.6.32.12/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400
@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -17904,9 +18054,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/init_64.c linux-2.6.32.11/arch/x86/mm/ini
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.32.11/arch/x86/mm/init.c linux-2.6.32.11/arch/x86/mm/init.c
---- linux-2.6.32.11/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/init.c linux-2.6.32.12/arch/x86/mm/init.c
+--- linux-2.6.32.12/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -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.
@@ -18023,9 +18173,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/init.c linux-2.6.32.11/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.11/arch/x86/mm/iomap_32.c linux-2.6.32.11/arch/x86/mm/iomap_32.c
---- linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/iomap_32.c linux-2.6.32.12/arch/x86/mm/iomap_32.c
+--- linux-2.6.32.12/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
debug_kmap_atomic(type);
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18038,9 +18188,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/iomap_32.c linux-2.6.32.11/arch/x86/mm/io
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.32.11/arch/x86/mm/ioremap.c linux-2.6.32.11/arch/x86/mm/ioremap.c
---- linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/ioremap.c linux-2.6.32.12/arch/x86/mm/ioremap.c
+--- linux-2.6.32.12/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -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.
@@ -18087,9 +18237,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/ioremap.c linux-2.6.32.11/arch/x86/mm/ior
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -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.
@@ -18102,9 +18252,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.11/arc
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.32.11/arch/x86/mm/mmap.c linux-2.6.32.11/arch/x86/mm/mmap.c
---- linux-2.6.32.11/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/mmap.c linux-2.6.32.12/arch/x86/mm/mmap.c
+--- linux-2.6.32.12/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -18186,9 +18336,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/mmap.c linux-2.6.32.11/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.11/arch/x86/mm/numa_32.c linux-2.6.32.11/arch/x86/mm/numa_32.c
---- linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/numa_32.c linux-2.6.32.12/arch/x86/mm/numa_32.c
+--- linux-2.6.32.12/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -18197,9 +18347,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/numa_32.c linux-2.6.32.11/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.11/arch/x86/mm/pageattr.c linux-2.6.32.11/arch/x86/mm/pageattr.c
---- linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr.c linux-2.6.32.12/arch/x86/mm/pageattr.c
+--- linux-2.6.32.12/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400
@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
* Does not cover __inittext since that is gone later on. On
* 64bit we do not enforce !NX on the low mapping
@@ -18231,9 +18381,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr.c linux-2.6.32.11/arch/x86/mm/pa
#ifdef CONFIG_X86_32
if (!SHARED_KERNEL_PMD) {
struct page *page;
-diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr-test.c linux-2.6.32.11/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr-test.c linux-2.6.32.12/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.12/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -18243,9 +18393,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr-test.c linux-2.6.32.11/arch/x86/
}
struct split_state {
-diff -urNp linux-2.6.32.11/arch/x86/mm/pat.c linux-2.6.32.11/arch/x86/mm/pat.c
---- linux-2.6.32.11/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/pat.c linux-2.6.32.12/arch/x86/mm/pat.c
+--- linux-2.6.32.12/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
conflict:
@@ -18282,9 +18432,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pat.c linux-2.6.32.11/arch/x86/mm/pat.c
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable_32.c linux-2.6.32.11/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable_32.c linux-2.6.32.12/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.12/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400
@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -18299,9 +18449,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable_32.c linux-2.6.32.11/arch/x86/mm/
/*
* It's enough to flush this one mapping.
-diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable.c linux-2.6.32.11/arch/x86/mm/pgtable.c
---- linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable.c linux-2.6.32.12/arch/x86/mm/pgtable.c
+--- linux-2.6.32.12/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400
@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather *
#if PAGETABLE_LEVELS > 3
void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
@@ -18571,9 +18721,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable.c linux-2.6.32.11/arch/x86/mm/pgt
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.32.11/arch/x86/mm/setup_nx.c linux-2.6.32.11/arch/x86/mm/setup_nx.c
---- linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/setup_nx.c linux-2.6.32.12/arch/x86/mm/setup_nx.c
+--- linux-2.6.32.12/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400
@@ -4,11 +4,10 @@
#include <asm/pgtable.h>
@@ -18639,9 +18789,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/setup_nx.c linux-2.6.32.11/arch/x86/mm/se
__supported_pte_mask &= ~_PAGE_NX;
}
#endif
-diff -urNp linux-2.6.32.11/arch/x86/mm/tlb.c linux-2.6.32.11/arch/x86/mm/tlb.c
---- linux-2.6.32.11/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/arch/x86/mm/tlb.c linux-2.6.32.12/arch/x86/mm/tlb.c
+--- linux-2.6.32.12/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400
@@ -12,7 +12,7 @@
#include <asm/uv/uv.h>
@@ -18663,9 +18813,9 @@ diff -urNp linux-2.6.32.11/arch/x86/mm/tlb.c linux-2.6.32.11/arch/x86/mm/tlb.c
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/oprofile/backtrace.c linux-2.6.32.12/arch/x86/oprofile/backtrace.c
+--- linux-2.6.32.12/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -18684,9 +18834,9 @@ diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/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.11/arch/x86/oprofile/op_model_p4.c linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -18696,9 +18846,9 @@ diff -urNp linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c linux-2.6.32.11/arch/
{
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.32.11/arch/x86/pci/common.c linux-2.6.32.11/arch/x86/pci/common.c
---- linux-2.6.32.11/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/common.c linux-2.6.32.12/arch/x86/pci/common.c
+--- linux-2.6.32.12/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400
@@ -31,8 +31,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -18719,9 +18869,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/common.c linux-2.6.32.11/arch/x86/pci/co
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.32.11/arch/x86/pci/direct.c linux-2.6.32.11/arch/x86/pci/direct.c
---- linux-2.6.32.11/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/direct.c linux-2.6.32.12/arch/x86/pci/direct.c
+--- linux-2.6.32.12/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -18749,9 +18899,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/direct.c linux-2.6.32.11/arch/x86/pci/di
{
u32 x = 0;
int year, devfn;
-diff -urNp linux-2.6.32.11/arch/x86/pci/fixup.c linux-2.6.32.11/arch/x86/pci/fixup.c
---- linux-2.6.32.11/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/fixup.c linux-2.6.32.12/arch/x86/pci/fixup.c
+--- linux-2.6.32.12/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -18770,9 +18920,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/fixup.c linux-2.6.32.11/arch/x86/pci/fix
};
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c
---- linux-2.6.32.11/arch/x86/pci/irq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/irq.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/irq.c linux-2.6.32.12/arch/x86/pci/irq.c
+--- linux-2.6.32.12/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400
++++ linux-2.6.32.12/arch/x86/pci/irq.c 2010-04-29 17:49:58.053442872 -0400
@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
static struct pci_device_id __initdata pirq_440gx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -18782,7 +18932,7 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c
};
/* 440GX has a proprietary PIRQ router -- don't use it */
-@@ -1107,7 +1107,7 @@ static struct dmi_system_id __initdata p
+@@ -1109,7 +1109,7 @@ static struct dmi_system_id __initdata p
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
},
},
@@ -18791,9 +18941,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c
};
int __init pcibios_irq_init(void)
-diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_32.c linux-2.6.32.11/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_32.c linux-2.6.32.12/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -18803,9 +18953,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_32.c linux-2.6.32.11/arch/x86/p
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_64.c linux-2.6.32.11/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_64.c linux-2.6.32.12/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -18815,9 +18965,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_64.c linux-2.6.32.11/arch/x86/p
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.32.11/arch/x86/pci/numaq_32.c linux-2.6.32.11/arch/x86/pci/numaq_32.c
---- linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/numaq_32.c linux-2.6.32.12/arch/x86/pci/numaq_32.c
+--- linux-2.6.32.12/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -18827,9 +18977,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/numaq_32.c linux-2.6.32.11/arch/x86/pci/
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
-diff -urNp linux-2.6.32.11/arch/x86/pci/olpc.c linux-2.6.32.11/arch/x86/pci/olpc.c
---- linux-2.6.32.11/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/olpc.c linux-2.6.32.12/arch/x86/pci/olpc.c
+--- linux-2.6.32.12/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -18839,9 +18989,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/olpc.c linux-2.6.32.11/arch/x86/pci/olpc
.read = pci_olpc_read,
.write = pci_olpc_write,
};
-diff -urNp linux-2.6.32.11/arch/x86/pci/pcbios.c linux-2.6.32.11/arch/x86/pci/pcbios.c
---- linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/pci/pcbios.c linux-2.6.32.12/arch/x86/pci/pcbios.c
+--- linux-2.6.32.12/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400
@@ -56,50 +56,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -19164,9 +19314,9 @@ diff -urNp linux-2.6.32.11/arch/x86/pci/pcbios.c linux-2.6.32.11/arch/x86/pci/pc
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.32.11/arch/x86/power/cpu.c linux-2.6.32.11/arch/x86/power/cpu.c
---- linux-2.6.32.11/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/power/cpu.c linux-2.6.32.12/arch/x86/power/cpu.c
+--- linux-2.6.32.12/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400
@@ -126,7 +126,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -19186,9 +19336,9 @@ diff -urNp linux-2.6.32.11/arch/x86/power/cpu.c linux-2.6.32.11/arch/x86/power/c
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.32.11/arch/x86/vdso/Makefile linux-2.6.32.11/arch/x86/vdso/Makefile
---- linux-2.6.32.11/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400
+diff -urNp linux-2.6.32.12/arch/x86/vdso/Makefile linux-2.6.32.12/arch/x86/vdso/Makefile
+--- linux-2.6.32.12/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19198,9 +19348,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/Makefile linux-2.6.32.11/arch/x86/vdso/
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -19299,9 +19449,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c linux-2.6.32.11/arch/x
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -19402,9 +19552,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c linux-2.6.32.11/arch/x86
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso.lds.S linux-2.6.32.11/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso.lds.S linux-2.6.32.12/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -19415,9 +19565,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso.lds.S linux-2.6.32.11/arch/x86/vds
+VEXTERN(fallback_time)
+VEXTERN(getcpu)
+#undef VEXTERN
-diff -urNp linux-2.6.32.11/arch/x86/vdso/vextern.h linux-2.6.32.11/arch/x86/vdso/vextern.h
---- linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/vdso/vextern.h linux-2.6.32.12/arch/x86/vdso/vextern.h
+--- linux-2.6.32.12/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -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. */
@@ -19425,9 +19575,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vextern.h linux-2.6.32.11/arch/x86/vdso
-VEXTERN(jiffies)
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.32.11/arch/x86/vdso/vma.c linux-2.6.32.11/arch/x86/vdso/vma.c
---- linux-2.6.32.11/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/vdso/vma.c linux-2.6.32.12/arch/x86/vdso/vma.c
+--- linux-2.6.32.12/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400
@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -19474,9 +19624,9 @@ diff -urNp linux-2.6.32.11/arch/x86/vdso/vma.c linux-2.6.32.11/arch/x86/vdso/vma
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen/enlighten.c
---- linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/xen/enlighten.c linux-2.6.32.12/arch/x86/xen/enlighten.c
+--- linux-2.6.32.12/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -19509,9 +19659,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen
xen_smp_init();
pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.32.11/arch/x86/xen/mmu.c linux-2.6.32.11/arch/x86/xen/mmu.c
---- linux-2.6.32.11/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/xen/mmu.c linux-2.6.32.12/arch/x86/xen/mmu.c
+--- linux-2.6.32.12/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400
@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -19532,9 +19682,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/mmu.c linux-2.6.32.11/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.11/arch/x86/xen/smp.c linux-2.6.32.11/arch/x86/xen/smp.c
---- linux-2.6.32.11/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/xen/smp.c linux-2.6.32.12/arch/x86/xen/smp.c
+--- linux-2.6.32.12/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400
@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -19558,9 +19708,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/smp.c linux-2.6.32.11/arch/x86/xen/smp.c
ctxt->user_regs.ss = __KERNEL_DS;
#ifdef CONFIG_X86_32
ctxt->user_regs.fs = __KERNEL_PERCPU;
-diff -urNp linux-2.6.32.11/arch/x86/xen/xen-ops.h linux-2.6.32.11/arch/x86/xen/xen-ops.h
---- linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/arch/x86/xen/xen-ops.h linux-2.6.32.12/arch/x86/xen/xen-ops.h
+--- linux-2.6.32.12/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -19570,9 +19720,9 @@ diff -urNp linux-2.6.32.11/arch/x86/xen/xen-ops.h linux-2.6.32.11/arch/x86/xen/x
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integrity.c
---- linux-2.6.32.11/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/block/blk-integrity.c linux-2.6.32.12/block/blk-integrity.c
+--- linux-2.6.32.12/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
NULL,
};
@@ -19582,9 +19732,9 @@ diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integ
.show = &integrity_attr_show,
.store = &integrity_attr_store,
};
-diff -urNp linux-2.6.32.11/block/blk-iopoll.c linux-2.6.32.11/block/blk-iopoll.c
---- linux-2.6.32.11/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/block/blk-iopoll.c linux-2.6.32.12/block/blk-iopoll.c
+--- linux-2.6.32.12/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -19594,9 +19744,9 @@ diff -urNp linux-2.6.32.11/block/blk-iopoll.c linux-2.6.32.11/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.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c
---- linux-2.6.32.11/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/block/blk-map.c linux-2.6.32.12/block/blk-map.c
+--- linux-2.6.32.12/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -19615,9 +19765,9 @@ diff -urNp linux-2.6.32.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.32.11/block/blk-softirq.c linux-2.6.32.11/block/blk-softirq.c
---- linux-2.6.32.11/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/block/blk-softirq.c linux-2.6.32.12/block/blk-softirq.c
+--- linux-2.6.32.12/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -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.
@@ -19627,9 +19777,9 @@ diff -urNp linux-2.6.32.11/block/blk-softirq.c linux-2.6.32.11/block/blk-softirq
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c
---- linux-2.6.32.11/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/block/blk-sysfs.c linux-2.6.32.12/block/blk-sysfs.c
+--- linux-2.6.32.12/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
kmem_cache_free(blk_requestq_cachep, q);
}
@@ -19639,9 +19789,9 @@ diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c
.show = queue_attr_show,
.store = queue_attr_store,
};
-diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c
---- linux-2.6.32.11/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/block/elevator.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/block/elevator.c linux-2.6.32.12/block/elevator.c
+--- linux-2.6.32.12/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/block/elevator.c 2010-04-04 20:46:41.541133870 -0400
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
return error;
}
@@ -19651,9 +19801,9 @@ diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c
.show = elv_attr_show,
.store = elv_attr_store,
};
-diff -urNp linux-2.6.32.11/crypto/lrw.c linux-2.6.32.11/crypto/lrw.c
---- linux-2.6.32.11/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/crypto/lrw.c linux-2.6.32.12/crypto/lrw.c
+--- linux-2.6.32.12/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400
@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
struct priv *ctx = crypto_tfm_ctx(parent);
struct crypto_cipher *child = ctx->child;
@@ -19663,9 +19813,9 @@ diff -urNp linux-2.6.32.11/crypto/lrw.c linux-2.6.32.11/crypto/lrw.c
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/dontdiff
---- linux-2.6.32.11/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400
+diff -urNp linux-2.6.32.12/Documentation/dontdiff linux-2.6.32.12/Documentation/dontdiff
+--- linux-2.6.32.12/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400
@@ -3,6 +3,7 @@
*.bin
*.cpio
@@ -19773,9 +19923,9 @@ diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/
zImage*
zconf.hash.c
+zoffset.h
-diff -urNp linux-2.6.32.11/Documentation/kernel-parameters.txt linux-2.6.32.11/Documentation/kernel-parameters.txt
---- linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/Documentation/kernel-parameters.txt linux-2.6.32.12/Documentation/kernel-parameters.txt
+--- linux-2.6.32.12/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400
@@ -1833,6 +1833,12 @@ 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.
@@ -19789,9 +19939,9 @@ diff -urNp linux-2.6.32.11/Documentation/kernel-parameters.txt linux-2.6.32.11/D
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/battery.c
---- linux-2.6.32.11/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/battery.c linux-2.6.32.12/drivers/acpi/battery.c
+--- linux-2.6.32.12/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -19801,9 +19951,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/b
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.32.11/drivers/acpi/blacklist.c linux-2.6.32.11/drivers/acpi/blacklist.c
---- linux-2.6.32.11/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/blacklist.c linux-2.6.32.12/drivers/acpi/blacklist.c
+--- linux-2.6.32.12/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400
@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
"Incorrect _ADR", 1},
@@ -19813,9 +19963,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/blacklist.c linux-2.6.32.11/drivers/acpi
};
#if CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.32.11/drivers/acpi/dock.c linux-2.6.32.11/drivers/acpi/dock.c
---- linux-2.6.32.11/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/dock.c linux-2.6.32.12/drivers/acpi/dock.c
+--- linux-2.6.32.12/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -19834,9 +19984,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/dock.c linux-2.6.32.11/drivers/acpi/dock
void *context)
{
struct dock_dependent_device *dd;
-diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c
---- linux-2.6.32.11/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/osl.c linux-2.6.32.12/drivers/acpi/osl.c
+--- linux-2.6.32.12/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -19855,9 +20005,59 @@ diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c
switch (width) {
case 8:
-diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers/acpi/processor_core.c
---- linux-2.6.32.11/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/power_meter.c linux-2.6.32.12/drivers/acpi/power_meter.c
+--- linux-2.6.32.12/drivers/acpi/power_meter.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/power_meter.c 2010-04-29 17:46:37.081234462 -0400
+@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
+ return res;
+
+ temp /= 1000;
+- if (temp < 0)
+- return -EINVAL;
+
+ mutex_lock(&resource->lock);
+ resource->trip[attr->index - 7] = temp;
+diff -urNp linux-2.6.32.12/drivers/acpi/proc.c linux-2.6.32.12/drivers/acpi/proc.c
+--- linux-2.6.32.12/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/proc.c 2010-04-29 17:46:37.081234462 -0400
+@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
+ size_t count, loff_t * ppos)
+ {
+ struct list_head *node, *next;
+- char strbuf[5];
+- char str[5] = "";
+- unsigned int len = count;
++ char strbuf[5] = {0};
+ struct acpi_device *found_dev = NULL;
+
+- if (len > 4)
+- len = 4;
+- if (len < 0)
+- return -EFAULT;
++ if (count > 4)
++ count = 4;
+
+- if (copy_from_user(strbuf, buffer, len))
++ if (copy_from_user(strbuf, buffer, count))
+ return -EFAULT;
+- strbuf[len] = '\0';
+- sscanf(strbuf, "%s", str);
++ strbuf[count] = '\0';
+
+ mutex_lock(&acpi_device_lock);
+ list_for_each_safe(node, next, &acpi_wakeup_device_list) {
+@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f
+ if (!dev->wakeup.flags.valid)
+ continue;
+
+- if (!strncmp(dev->pnp.bus_id, str, 4)) {
++ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
+ dev->wakeup.state.enabled =
+ dev->wakeup.state.enabled ? 0 : 1;
+ found_dev = dev;
+diff -urNp linux-2.6.32.12/drivers/acpi/processor_core.c linux-2.6.32.12/drivers/acpi/processor_core.c
+--- linux-2.6.32.12/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400
@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
@@ -19867,9 +20067,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers
/*
* Buggy BIOS check
-diff -urNp linux-2.6.32.11/drivers/acpi/processor_idle.c linux-2.6.32.11/drivers/acpi/processor_idle.c
---- linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/processor_idle.c linux-2.6.32.12/drivers/acpi/processor_idle.c
+--- linux-2.6.32.12/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400
@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -19879,9 +20079,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/processor_idle.c linux-2.6.32.11/drivers
};
-diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sleep.c
---- linux-2.6.32.11/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sleep.c
+--- linux-2.6.32.12/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400
@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -19918,9 +20118,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/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.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/video.c
---- linux-2.6.32.11/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/acpi/video.c linux-2.6.32.12/drivers/acpi/video.c
+--- linux-2.6.32.12/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -19930,9 +20130,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/vid
.get_brightness = acpi_video_get_brightness,
.update_status = acpi_video_set_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c
---- linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:41:49.920655481 -0400
-+++ linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/ahci.c linux-2.6.32.12/drivers/ata/ahci.c
+--- linux-2.6.32.12/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400
++++ linux-2.6.32.12/drivers/ata/ahci.c 2010-04-29 17:49:58.057498948 -0400
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
@@ -19963,7 +20163,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c
.inherits = &ahci_ops,
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
-@@ -681,7 +681,7 @@ static const struct pci_device_id ahci_p
+@@ -687,7 +687,7 @@ static const struct pci_device_id ahci_p
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -19972,9 +20172,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c
};
-diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata/ata_generic.c
---- linux-2.6.32.11/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/ata_generic.c linux-2.6.32.12/drivers/ata/ata_generic.c
+--- linux-2.6.32.12/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400
@@ -95,7 +95,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -19984,19 +20184,19 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
-diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/ata_piix.c
---- linux-2.6.32.11/drivers/ata/ata_piix.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/ata_piix.c 2010-04-04 20:46:41.544756868 -0400
-@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p
- { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- /* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+diff -urNp linux-2.6.32.12/drivers/ata/ata_piix.c linux-2.6.32.12/drivers/ata/ata_piix.c
+--- linux-2.6.32.12/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400
++++ linux-2.6.32.12/drivers/ata/ata_piix.c 2010-04-29 18:01:47.141162449 -0400
+@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p
+ { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ /* SATA Controller IDE (CPT) */
+ { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
- { } /* terminate list */
+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
};
static struct pci_driver piix_pci_driver = {
-@@ -309,7 +309,7 @@ static struct scsi_host_template piix_sh
+@@ -317,7 +317,7 @@ static struct scsi_host_template piix_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20005,7 +20205,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
.inherits = &ata_bmdma32_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = piix_set_piomode,
-@@ -317,22 +317,22 @@ static struct ata_port_operations piix_p
+@@ -325,22 +325,22 @@ static struct ata_port_operations piix_p
.prereset = piix_pata_prereset,
};
@@ -20032,7 +20232,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
.inherits = &piix_sata_ops,
.hardreset = sata_std_hardreset,
.scr_read = piix_sidpr_scr_read,
-@@ -608,7 +608,7 @@ static const struct ich_laptop ich_lapto
+@@ -616,7 +616,7 @@ static const struct ich_laptop ich_lapto
{ 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */
{ 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */
/* end marker */
@@ -20041,7 +20241,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
};
/**
-@@ -1086,7 +1086,7 @@ static int piix_broken_suspend(void)
+@@ -1094,7 +1094,7 @@ static int piix_broken_suspend(void)
},
},
@@ -20050,9 +20250,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata/libata-acpi.c
---- linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/libata-acpi.c linux-2.6.32.12/drivers/ata/libata-acpi.c
+--- linux-2.6.32.12/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -20068,9 +20268,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata
.handler = ata_acpi_ap_notify_dock,
.uevent = ata_acpi_ap_uevent,
};
-diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata/libata-core.c
---- linux-2.6.32.11/drivers/ata/libata-core.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/libata-core.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/libata-core.c linux-2.6.32.12/drivers/ata/libata-core.c
+--- linux-2.6.32.12/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400
++++ linux-2.6.32.12/drivers/ata/libata-core.c 2010-04-29 17:49:58.081481928 -0400
@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
{ ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
{ ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -20089,7 +20289,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
};
#define ENOUGH(v, unit) (((v)-1)/(unit)+1)
-@@ -4385,7 +4385,7 @@ static const struct ata_blacklist_entry
+@@ -4388,7 +4388,7 @@ static const struct ata_blacklist_entry
{ "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER },
/* End Marker */
@@ -20098,7 +20298,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
};
static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
-@@ -5961,7 +5961,7 @@ static void ata_host_stop(struct device
+@@ -5964,7 +5964,7 @@ static void ata_host_stop(struct device
* LOCKING:
* None.
*/
@@ -20107,7 +20307,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
{
static DEFINE_SPINLOCK(lock);
const struct ata_port_operations *cur;
-@@ -5973,6 +5973,7 @@ static void ata_finalize_port_ops(struct
+@@ -5976,6 +5976,7 @@ static void ata_finalize_port_ops(struct
return;
spin_lock(&lock);
@@ -20115,7 +20315,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
for (cur = ops->inherits; cur; cur = cur->inherits) {
void **inherit = (void **)cur;
-@@ -5986,8 +5987,9 @@ static void ata_finalize_port_ops(struct
+@@ -5989,8 +5990,9 @@ static void ata_finalize_port_ops(struct
if (IS_ERR(*pp))
*pp = NULL;
@@ -20126,7 +20326,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
spin_unlock(&lock);
}
-@@ -6084,7 +6086,7 @@ int ata_host_start(struct ata_host *host
+@@ -6087,7 +6089,7 @@ int ata_host_start(struct ata_host *host
*/
/* KILLME - the only user left is ipr */
void ata_host_init(struct ata_host *host, struct device *dev,
@@ -20135,7 +20335,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
{
spin_lock_init(&host->lock);
host->dev = dev;
-@@ -6747,7 +6749,7 @@ static void ata_dummy_error_handler(stru
+@@ -6750,7 +6752,7 @@ static void ata_dummy_error_handler(stru
/* truly dummy */
}
@@ -20144,9 +20344,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/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.11/drivers/ata/libata-eh.c linux-2.6.32.11/drivers/ata/libata-eh.c
---- linux-2.6.32.11/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/libata-eh.c linux-2.6.32.12/drivers/ata/libata-eh.c
+--- linux-2.6.32.12/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400
@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
@@ -20156,9 +20356,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-eh.c linux-2.6.32.11/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.11/drivers/ata/libata-pmp.c linux-2.6.32.11/drivers/ata/libata-pmp.c
---- linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/libata-pmp.c linux-2.6.32.12/drivers/ata/libata-pmp.c
+--- linux-2.6.32.12/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -20168,9 +20368,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-pmp.c linux-2.6.32.11/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.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/pata_acpi.c
---- linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_acpi.c linux-2.6.32.12/drivers/ata/pata_acpi.c
+--- linux-2.6.32.12/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20180,9 +20380,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/drivers/ata/pata_ali.c
---- linux-2.6.32.11/drivers/ata/pata_ali.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_ali.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_ali.c linux-2.6.32.12/drivers/ata/pata_ali.c
+--- linux-2.6.32.12/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400
++++ linux-2.6.32.12/drivers/ata/pata_ali.c 2010-04-29 17:49:58.081481928 -0400
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -20228,9 +20428,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/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.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pata_amd.c
---- linux-2.6.32.11/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_amd.c linux-2.6.32.12/drivers/ata/pata_amd.c
+--- linux-2.6.32.12/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -20280,9 +20480,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pa
.inherits = &nv_base_port_ops,
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/pata_artop.c
---- linux-2.6.32.11/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_artop.c linux-2.6.32.12/drivers/ata/pata_artop.c
+--- linux-2.6.32.12/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20301,9 +20501,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/drivers/ata/pata_at32.c
---- linux-2.6.32.11/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_at32.c linux-2.6.32.12/drivers/ata/pata_at32.c
+--- linux-2.6.32.12/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -20313,9 +20513,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/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.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/pata_at91.c
---- linux-2.6.32.11/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_at91.c linux-2.6.32.12/drivers/ata/pata_at91.c
+--- linux-2.6.32.12/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -20325,9 +20525,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/p
.inherits = &ata_sff_port_ops,
.sff_data_xfer = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata/pata_atiixp.c
---- linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_atiixp.c linux-2.6.32.12/drivers/ata/pata_atiixp.c
+--- linux-2.6.32.12/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -20337,9 +20537,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/ata/pata_atp867x.c
---- linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_atp867x.c linux-2.6.32.12/drivers/ata/pata_atp867x.c
+--- linux-2.6.32.12/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20349,9 +20549,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/pata_bf54x.c
---- linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_bf54x.c linux-2.6.32.12/drivers/ata/pata_bf54x.c
+--- linux-2.6.32.12/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -20361,9 +20561,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/
.inherits = &ata_sff_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/drivers/ata/pata_cmd640.c
---- linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd640.c linux-2.6.32.12/drivers/ata/pata_cmd640.c
+--- linux-2.6.32.12/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20373,9 +20573,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/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.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd64x.c linux-2.6.32.12/drivers/ata/pata_cmd64x.c
+--- linux-2.6.32.12/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400
@@ -275,18 +275,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -20398,9 +20598,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata
.inherits = &cmd64x_base_ops,
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/drivers/ata/pata_cs5520.c
---- linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5520.c linux-2.6.32.12/drivers/ata/pata_cs5520.c
+--- linux-2.6.32.12/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -20410,9 +20610,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/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.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata/pata_cs5530.c
---- linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5530.c linux-2.6.32.12/drivers/ata/pata_cs5530.c
+--- linux-2.6.32.12/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -20422,9 +20622,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata/pata_cs5535.c
---- linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5535.c linux-2.6.32.12/drivers/ata/pata_cs5535.c
+--- linux-2.6.32.12/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20434,9 +20634,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata/pata_cs5536.c
---- linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5536.c linux-2.6.32.12/drivers/ata/pata_cs5536.c
+--- linux-2.6.32.12/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20446,9 +20646,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/ata/pata_cypress.c
---- linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_cypress.c linux-2.6.32.12/drivers/ata/pata_cypress.c
+--- linux-2.6.32.12/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20458,9 +20658,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/pata_efar.c
---- linux-2.6.32.11/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_efar.c linux-2.6.32.12/drivers/ata/pata_efar.c
+--- linux-2.6.32.12/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20470,9 +20670,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata/pata_hpt366.c
---- linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt366.c linux-2.6.32.12/drivers/ata/pata_hpt366.c
+--- linux-2.6.32.12/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -20482,9 +20682,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt37x.c linux-2.6.32.12/drivers/ata/pata_hpt37x.c
+--- linux-2.6.32.12/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -20521,9 +20721,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata
.inherits = &hpt372_port_ops,
.prereset = hpt374_fn1_pre_reset,
};
-diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -20533,9 +20733,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x3.c linux-2.6.32.12/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20545,9 +20745,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/drivers/ata/pata_icside.c
---- linux-2.6.32.11/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_icside.c linux-2.6.32.12/drivers/ata/pata_icside.c
+--- linux-2.6.32.12/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
}
}
@@ -20557,9 +20757,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/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.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/drivers/ata/pata_isapnp.c
---- linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_isapnp.c linux-2.6.32.12/drivers/ata/pata_isapnp.c
+--- linux-2.6.32.12/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -20575,9 +20775,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/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.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata/pata_it8213.c
---- linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_it8213.c linux-2.6.32.12/drivers/ata/pata_it8213.c
+--- linux-2.6.32.12/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
};
@@ -20587,9 +20787,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata/pata_it821x.c
---- linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_it821x.c linux-2.6.32.12/drivers/ata/pata_it821x.c
+--- linux-2.6.32.12/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20617,9 +20817,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -20629,9 +20829,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/ata/pata_jmicron.c
---- linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_jmicron.c linux-2.6.32.12/drivers/ata/pata_jmicron.c
+--- linux-2.6.32.12/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20641,9 +20841,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.prereset = jmicron_pre_reset,
};
-diff -urNp linux-2.6.32.11/drivers/ata/pata_legacy.c linux-2.6.32.11/drivers/ata/pata_legacy.c
---- linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_legacy.c linux-2.6.32.12/drivers/ata/pata_legacy.c
+--- linux-2.6.32.12/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400
@@ -106,7 +106,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -20755,9 +20955,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_legacy.c linux-2.6.32.11/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.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/ata/pata_marvell.c
---- linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_marvell.c linux-2.6.32.12/drivers/ata/pata_marvell.c
+--- linux-2.6.32.12/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20767,9 +20967,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_mpc52xx.c linux-2.6.32.12/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -20779,9 +20979,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/at
.inherits = &ata_sff_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/pata_mpiix.c
---- linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_mpiix.c linux-2.6.32.12/drivers/ata/pata_mpiix.c
+--- linux-2.6.32.12/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -20791,9 +20991,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/
.inherits = &ata_sff_port_ops,
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/ata/pata_netcell.c
---- linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_netcell.c linux-2.6.32.12/drivers/ata/pata_netcell.c
+--- linux-2.6.32.12/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20803,9 +21003,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/ata/pata_ninja32.c
---- linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_ninja32.c linux-2.6.32.12/drivers/ata/pata_ninja32.c
+--- linux-2.6.32.12/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20815,9 +21015,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/ata/pata_ns87410.c
---- linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87410.c linux-2.6.32.12/drivers/ata/pata_ns87410.c
+--- linux-2.6.32.12/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -20827,9 +21027,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/at
.inherits = &ata_sff_port_ops,
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87415.c linux-2.6.32.11/drivers/ata/pata_ns87415.c
---- linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87415.c linux-2.6.32.12/drivers/ata/pata_ns87415.c
+--- linux-2.6.32.12/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -20848,9 +21048,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87415.c linux-2.6.32.11/drivers/at
.inherits = &ns87415_pata_ops,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_octeon_cf.c linux-2.6.32.12/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -20859,9 +21059,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/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.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_oldpiix.c linux-2.6.32.12/drivers/ata/pata_oldpiix.c
+--- linux-2.6.32.12/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20871,9 +21071,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/pata_opti.c
---- linux-2.6.32.11/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_opti.c linux-2.6.32.12/drivers/ata/pata_opti.c
+--- linux-2.6.32.12/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -20883,9 +21083,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/ata/pata_optidma.c
---- linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_optidma.c linux-2.6.32.12/drivers/ata/pata_optidma.c
+--- linux-2.6.32.12/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20904,9 +21104,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/at
.inherits = &optidma_port_ops,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/drivers/ata/pata_palmld.c
---- linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_palmld.c linux-2.6.32.12/drivers/ata/pata_palmld.c
+--- linux-2.6.32.12/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -20916,9 +21116,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/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.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_pcmcia.c linux-2.6.32.12/drivers/ata/pata_pcmcia.c
+--- linux-2.6.32.12/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -20945,9 +21145,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
-diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc2027x.c linux-2.6.32.12/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20965,9 +21165,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/a
.inherits = &pdc2027x_pata100_ops,
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400
@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20986,9 +21186,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drive
.inherits = &pdc2024x_port_ops,
.check_atapi_dma = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/drivers/ata/pata_platform.c
---- linux-2.6.32.11/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_platform.c linux-2.6.32.12/drivers/ata/pata_platform.c
+--- linux-2.6.32.12/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -20998,9 +21198,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/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.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pata_qdi.c
---- linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_qdi.c linux-2.6.32.12/drivers/ata/pata_qdi.c
+--- linux-2.6.32.12/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -21019,9 +21219,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pa
.inherits = &qdi6500_port_ops,
.set_piomode = qdi6580_set_piomode,
};
-diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/ata/pata_radisys.c
---- linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_radisys.c linux-2.6.32.12/drivers/ata/pata_radisys.c
+--- linux-2.6.32.12/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21031,9 +21231,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_rb532_cf.c linux-2.6.32.12/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -21043,9 +21243,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/a
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer32,
};
-diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/drivers/ata/pata_rdc.c
---- linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_rdc.c linux-2.6.32.12/drivers/ata/pata_rdc.c
+--- linux-2.6.32.12/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -21055,9 +21255,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/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.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata/pata_rz1000.c
---- linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_rz1000.c linux-2.6.32.12/drivers/ata/pata_rz1000.c
+--- linux-2.6.32.12/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21067,9 +21267,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/drivers/ata/pata_sc1200.c
---- linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_sc1200.c linux-2.6.32.12/drivers/ata/pata_sc1200.c
+--- linux-2.6.32.12/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21079,9 +21279,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/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.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pata_scc.c
---- linux-2.6.32.11/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_scc.c linux-2.6.32.12/drivers/ata/pata_scc.c
+--- linux-2.6.32.12/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21091,9 +21291,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.set_piomode = scc_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pata_sch.c
---- linux-2.6.32.11/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_sch.c linux-2.6.32.12/drivers/ata/pata_sch.c
+--- linux-2.6.32.12/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21103,9 +21303,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/drivers/ata/pata_serverworks.c
---- linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_serverworks.c linux-2.6.32.12/drivers/ata/pata_serverworks.c
+--- linux-2.6.32.12/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21124,9 +21324,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/driver
.inherits = &serverworks_osb4_port_ops,
.mode_filter = serverworks_csb_filter,
};
-diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata/pata_sil680.c
---- linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_sil680.c linux-2.6.32.12/drivers/ata/pata_sil680.c
+--- linux-2.6.32.12/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21136,9 +21336,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata
.inherits = &ata_bmdma32_port_ops,
.cable_detect = sil680_cable_detect,
.set_piomode = sil680_set_piomode,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/drivers/ata/pata_sis.c
---- linux-2.6.32.11/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_sis.c linux-2.6.32.12/drivers/ata/pata_sis.c
+--- linux-2.6.32.12/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21194,9 +21394,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/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.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_sl82c105.c linux-2.6.32.12/drivers/ata/pata_sl82c105.c
+--- linux-2.6.32.12/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21206,9 +21406,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/a
.inherits = &ata_bmdma_port_ops,
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/ata/pata_triflex.c
---- linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_triflex.c linux-2.6.32.12/drivers/ata/pata_triflex.c
+--- linux-2.6.32.12/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21218,9 +21418,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/at
.inherits = &ata_bmdma_port_ops,
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
-diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pata_via.c
---- linux-2.6.32.11/drivers/ata/pata_via.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_via.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_via.c linux-2.6.32.12/drivers/ata/pata_via.c
+--- linux-2.6.32.12/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400
++++ linux-2.6.32.12/drivers/ata/pata_via.c 2010-04-29 17:49:58.093238510 -0400
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21239,9 +21439,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pa
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/ata/pata_winbond.c
---- linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pata_winbond.c linux-2.6.32.12/drivers/ata/pata_winbond.c
+--- linux-2.6.32.12/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -21251,9 +21451,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/at
.inherits = &ata_sff_port_ops,
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pdc_adma.c
---- linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/pdc_adma.c linux-2.6.32.12/drivers/ata/pdc_adma.c
+--- linux-2.6.32.12/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -21263,9 +21463,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pd
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sata_fsl.c
---- linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_fsl.c linux-2.6.32.12/drivers/ata/sata_fsl.c
+--- linux-2.6.32.12/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21275,9 +21475,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sa
.inherits = &sata_pmp_port_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/ata/sata_inic162x.c
---- linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_inic162x.c linux-2.6.32.12/drivers/ata/sata_inic162x.c
+--- linux-2.6.32.12/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -21287,9 +21487,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/a
.inherits = &sata_port_ops,
.check_atapi_dma = inic_check_atapi_dma,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sata_mv.c
---- linux-2.6.32.11/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_mv.c linux-2.6.32.12/drivers/ata/sata_mv.c
+--- linux-2.6.32.12/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -21317,9 +21517,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sat
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_nv.c linux-2.6.32.11/drivers/ata/sata_nv.c
---- linux-2.6.32.11/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_nv.c linux-2.6.32.12/drivers/ata/sata_nv.c
+--- linux-2.6.32.12/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -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.
@@ -21362,9 +21562,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_nv.c linux-2.6.32.11/drivers/ata/sat
.inherits = &nv_generic_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/ata/sata_promise.c
---- linux-2.6.32.11/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_promise.c linux-2.6.32.12/drivers/ata/sata_promise.c
+--- linux-2.6.32.12/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400
@@ -195,7 +195,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -21391,9 +21591,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/at
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/sata_qstor.c
---- linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_qstor.c linux-2.6.32.12/drivers/ata/sata_qstor.c
+--- linux-2.6.32.12/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -21403,9 +21603,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/sata_sil24.c
---- linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_sil24.c linux-2.6.32.12/drivers/ata/sata_sil24.c
+--- linux-2.6.32.12/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400
@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21415,9 +21615,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/
.inherits = &sata_pmp_port_ops,
.qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sata_sil.c
---- linux-2.6.32.11/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_sil.c linux-2.6.32.12/drivers/ata/sata_sil.c
+--- linux-2.6.32.12/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -21427,9 +21627,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sa
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sata_sis.c
---- linux-2.6.32.11/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_sis.c linux-2.6.32.12/drivers/ata/sata_sis.c
+--- linux-2.6.32.12/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21439,9 +21639,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/drivers/ata/sata_svw.c
---- linux-2.6.32.11/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_svw.c linux-2.6.32.12/drivers/ata/sata_svw.c
+--- linux-2.6.32.12/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -21451,9 +21651,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/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.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sata_sx4.c
---- linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_sx4.c linux-2.6.32.12/drivers/ata/sata_sx4.c
+--- linux-2.6.32.12/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
};
@@ -21463,9 +21663,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sa
.inherits = &ata_sff_port_ops,
.check_atapi_dma = pdc_check_atapi_dma,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sata_uli.c
---- linux-2.6.32.11/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_uli.c linux-2.6.32.12/drivers/ata/sata_uli.c
+--- linux-2.6.32.12/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21475,9 +21675,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sa
.inherits = &ata_bmdma_port_ops,
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sata_via.c
---- linux-2.6.32.11/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_via.c linux-2.6.32.12/drivers/ata/sata_via.c
+--- linux-2.6.32.12/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400
@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21515,9 +21715,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sa
.inherits = &svia_base_ops,
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
-diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/drivers/ata/sata_vsc.c
---- linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/ata/sata_vsc.c linux-2.6.32.12/drivers/ata/sata_vsc.c
+--- linux-2.6.32.12/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
};
@@ -21527,9 +21727,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/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.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adummy.c
---- linux-2.6.32.11/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/adummy.c linux-2.6.32.12/drivers/atm/adummy.c
+--- linux-2.6.32.12/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -21539,9 +21739,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adum
return 0;
}
-diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/ambassador.c
---- linux-2.6.32.11/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/ambassador.c linux-2.6.32.12/drivers/atm/ambassador.c
+--- linux-2.6.32.12/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -21578,9 +21778,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.32.11/drivers/atm/atmtcp.c linux-2.6.32.11/drivers/atm/atmtcp.c
---- linux-2.6.32.11/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/atmtcp.c linux-2.6.32.12/drivers/atm/atmtcp.c
+--- linux-2.6.32.12/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -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);
@@ -21630,9 +21830,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/atmtcp.c linux-2.6.32.11/drivers/atm/atmt
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-2.6.32.11/drivers/atm/eni.c linux-2.6.32.11/drivers/atm/eni.c
---- linux-2.6.32.11/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/eni.c linux-2.6.32.12/drivers/atm/eni.c
+--- linux-2.6.32.12/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -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);
@@ -21678,9 +21878,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/eni.c linux-2.6.32.11/drivers/atm/eni.c
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/drivers/atm/firestream.c
---- linux-2.6.32.11/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/firestream.c linux-2.6.32.12/drivers/atm/firestream.c
+--- linux-2.6.32.12/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
}
}
@@ -21714,9 +21914,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/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.11/drivers/atm/fore200e.c linux-2.6.32.11/drivers/atm/fore200e.c
---- linux-2.6.32.11/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/fore200e.c linux-2.6.32.12/drivers/atm/fore200e.c
+--- linux-2.6.32.12/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -21773,9 +21973,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/fore200e.c linux-2.6.32.11/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.11/drivers/atm/he.c linux-2.6.32.11/drivers/atm/he.c
---- linux-2.6.32.11/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/he.c linux-2.6.32.12/drivers/atm/he.c
+--- linux-2.6.32.12/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -21857,9 +22057,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/he.c linux-2.6.32.11/drivers/atm/he.c
return 0;
}
-diff -urNp linux-2.6.32.11/drivers/atm/horizon.c linux-2.6.32.11/drivers/atm/horizon.c
---- linux-2.6.32.11/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/horizon.c linux-2.6.32.12/drivers/atm/horizon.c
+--- linux-2.6.32.12/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -21878,9 +22078,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/horizon.c linux-2.6.32.11/drivers/atm/hor
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.32.11/drivers/atm/idt77252.c linux-2.6.32.11/drivers/atm/idt77252.c
---- linux-2.6.32.11/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/idt77252.c linux-2.6.32.12/drivers/atm/idt77252.c
+--- linux-2.6.32.12/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -22035,9 +22235,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/idt77252.c linux-2.6.32.11/drivers/atm/id
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.32.11/drivers/atm/iphase.c linux-2.6.32.11/drivers/atm/iphase.c
---- linux-2.6.32.11/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/iphase.c linux-2.6.32.12/drivers/atm/iphase.c
+--- linux-2.6.32.12/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -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))
@@ -22134,9 +22334,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/iphase.c linux-2.6.32.11/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.11/drivers/atm/lanai.c linux-2.6.32.11/drivers/atm/lanai.c
---- linux-2.6.32.11/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/lanai.c linux-2.6.32.12/drivers/atm/lanai.c
+--- linux-2.6.32.12/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -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);
@@ -22191,9 +22391,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/lanai.c linux-2.6.32.11/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.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nicstar.c
---- linux-2.6.32.11/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/nicstar.c linux-2.6.32.12/drivers/atm/nicstar.c
+--- linux-2.6.32.12/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -22396,9 +22596,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nic
}
}
-diff -urNp linux-2.6.32.11/drivers/atm/solos-pci.c linux-2.6.32.11/drivers/atm/solos-pci.c
---- linux-2.6.32.11/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/solos-pci.c linux-2.6.32.12/drivers/atm/solos-pci.c
+--- linux-2.6.32.12/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -22417,9 +22617,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/solos-pci.c linux-2.6.32.11/drivers/atm/s
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c
---- linux-2.6.32.11/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/suni.c linux-2.6.32.12/drivers/atm/suni.c
+--- linux-2.6.32.12/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -22431,9 +22631,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.32.11/drivers/atm/uPD98402.c linux-2.6.32.11/drivers/atm/uPD98402.c
---- linux-2.6.32.11/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/uPD98402.c linux-2.6.32.12/drivers/atm/uPD98402.c
+--- linux-2.6.32.12/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -22478,9 +22678,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/uPD98402.c linux-2.6.32.11/drivers/atm/uP
return 0;
}
-diff -urNp linux-2.6.32.11/drivers/atm/zatm.c linux-2.6.32.11/drivers/atm/zatm.c
---- linux-2.6.32.11/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/atm/zatm.c linux-2.6.32.12/drivers/atm/zatm.c
+--- linux-2.6.32.12/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -22508,9 +22708,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/zatm.c linux-2.6.32.11/drivers/atm/zatm.c
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c
---- linux-2.6.32.11/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/base/bus.c linux-2.6.32.12/drivers/base/bus.c
+--- linux-2.6.32.12/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
return ret;
}
@@ -22538,9 +22738,9 @@ diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c
.filter = bus_uevent_filter,
};
-diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/class.c
---- linux-2.6.32.11/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/base/class.c linux-2.6.32.12/drivers/base/class.c
+--- linux-2.6.32.12/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400
@@ -63,7 +63,7 @@ static void class_release(struct kobject
kfree(cp);
}
@@ -22550,9 +22750,9 @@ diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/cla
.show = class_attr_show,
.store = class_attr_store,
};
-diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core.c
---- linux-2.6.32.11/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/base/core.c linux-2.6.32.12/drivers/base/core.c
+--- linux-2.6.32.12/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
return ret;
}
@@ -22571,9 +22771,9 @@ diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core
.filter = dev_uevent_filter,
.name = dev_uevent_name,
.uevent = dev_uevent,
-diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/memory.c
---- linux-2.6.32.11/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/base/memory.c linux-2.6.32.12/drivers/base/memory.c
+--- linux-2.6.32.12/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
return retval;
}
@@ -22583,9 +22783,9 @@ diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/me
.name = memory_uevent_name,
.uevent = memory_uevent,
};
-diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c
---- linux-2.6.32.11/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/base/sys.c linux-2.6.32.12/drivers/base/sys.c
+--- linux-2.6.32.12/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
return -EIO;
}
@@ -22604,9 +22804,9 @@ diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c
.show = sysdev_class_show,
.store = sysdev_class_store,
};
-diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block/pktcdvd.c
---- linux-2.6.32.11/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/block/pktcdvd.c linux-2.6.32.12/drivers/block/pktcdvd.c
+--- linux-2.6.32.12/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
return len;
}
@@ -22616,9 +22816,9 @@ diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block
.show = kobj_pkt_show,
.store = kobj_pkt_store
};
-diff -urNp linux-2.6.32.11/drivers/char/agp/frontend.c linux-2.6.32.11/drivers/char/agp/frontend.c
---- linux-2.6.32.11/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/agp/frontend.c linux-2.6.32.12/drivers/char/agp/frontend.c
+--- linux-2.6.32.12/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400
@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -22628,10 +22828,10 @@ diff -urNp linux-2.6.32.11/drivers/char/agp/frontend.c linux-2.6.32.11/drivers/c
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.32.11/drivers/char/agp/intel-agp.c linux-2.6.32.11/drivers/char/agp/intel-agp.c
---- linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-04-04 20:46:41.569782507 -0400
-@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc
+diff -urNp linux-2.6.32.12/drivers/char/agp/intel-agp.c linux-2.6.32.12/drivers/char/agp/intel-agp.c
+--- linux-2.6.32.12/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400
++++ linux-2.6.32.12/drivers/char/agp/intel-agp.c 2010-04-29 17:49:58.121109354 -0400
+@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB),
@@ -22640,9 +22840,27 @@ diff -urNp linux-2.6.32.11/drivers/char/agp/intel-agp.c linux-2.6.32.11/drivers/
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet.c
---- linux-2.6.32.11/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hpet.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hpet.c linux-2.6.32.12/drivers/char/hpet.c
+--- linux-2.6.32.12/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hpet.c 2010-04-29 17:46:36.909235393 -0400
+@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
+ return 0;
+ }
+
+-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
++static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
+
+ static int
+ hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+@@ -550,7 +550,7 @@ static inline unsigned long hpet_time_di
+ }
+
+ static int
+-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
++hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
+ {
+ struct hpet_timer __iomem *timer;
+ struct hpet __iomem *hpet;
@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
},
};
@@ -22652,9 +22870,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/hvc_beat.c
---- linux-2.6.32.11/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_beat.c linux-2.6.32.12/drivers/char/hvc_beat.c
+--- linux-2.6.32.12/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
return cnt;
}
@@ -22664,9 +22882,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/
.get_chars = hvc_beat_get_chars,
.put_chars = hvc_beat_put_chars,
};
-diff -urNp linux-2.6.32.11/drivers/char/hvc_console.c linux-2.6.32.11/drivers/char/hvc_console.c
---- linux-2.6.32.11/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_console.c linux-2.6.32.12/drivers/char/hvc_console.c
+--- linux-2.6.32.12/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -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.
@@ -22694,9 +22912,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_console.c linux-2.6.32.11/drivers/ch
{
struct hvc_struct *hp;
int i;
-diff -urNp linux-2.6.32.11/drivers/char/hvc_console.h linux-2.6.32.11/drivers/char/hvc_console.h
---- linux-2.6.32.11/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_console.h linux-2.6.32.12/drivers/char/hvc_console.h
+--- linux-2.6.32.12/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400
@@ -55,7 +55,7 @@ struct hvc_struct {
int outbuf_size;
int n_outbuf;
@@ -22720,9 +22938,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_console.h linux-2.6.32.11/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.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/char/hvc_iseries.c
---- linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_iseries.c linux-2.6.32.12/drivers/char/hvc_iseries.c
+--- linux-2.6.32.12/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400
@@ -197,7 +197,7 @@ done:
return sent;
}
@@ -22732,9 +22950,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/ch
.get_chars = get_chars,
.put_chars = put_chars,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/drivers/char/hvc_iucv.c
---- linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_iucv.c linux-2.6.32.12/drivers/char/hvc_iucv.c
+--- linux-2.6.32.12/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400
@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
@@ -22744,9 +22962,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/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.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/hvc_rtas.c
---- linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_rtas.c linux-2.6.32.12/drivers/char/hvc_rtas.c
+--- linux-2.6.32.12/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
return i;
}
@@ -22756,9 +22974,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/
.get_chars = hvc_rtas_read_console,
.put_chars = hvc_rtas_write_console,
};
-diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs.c
---- linux-2.6.32.11/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvcs.c linux-2.6.32.12/drivers/char/hvcs.c
+--- linux-2.6.32.12/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400
@@ -269,7 +269,7 @@ struct hvcs_struct {
unsigned int index;
@@ -22853,9 +23071,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/hvc_udbg.c
---- linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_udbg.c linux-2.6.32.12/drivers/char/hvc_udbg.c
+--- linux-2.6.32.12/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400
@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
return i;
}
@@ -22865,9 +23083,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/
.get_chars = hvc_udbg_get,
.put_chars = hvc_udbg_put,
};
-diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/hvc_vio.c
---- linux-2.6.32.11/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_vio.c linux-2.6.32.12/drivers/char/hvc_vio.c
+--- linux-2.6.32.12/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400
@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
return got;
}
@@ -22877,9 +23095,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/h
.get_chars = filtered_get_chars,
.put_chars = hvc_put_chars,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/hvc_xen.c
---- linux-2.6.32.11/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/hvc_xen.c linux-2.6.32.12/drivers/char/hvc_xen.c
+--- linux-2.6.32.12/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400
@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
return recv;
}
@@ -22889,9 +23107,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/h
.get_chars = read_console,
.put_chars = write_console,
.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -22922,9 +23140,9 @@ diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.11/d
intf->proc_dir = NULL;
-diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -22955,9 +23173,9 @@ diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.11/driv
new_smi->interrupt_disabled = 0;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.32.11/drivers/char/keyboard.c linux-2.6.32.11/drivers/char/keyboard.c
---- linux-2.6.32.11/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/keyboard.c linux-2.6.32.12/drivers/char/keyboard.c
+--- linux-2.6.32.12/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -22984,9 +23202,9 @@ diff -urNp linux-2.6.32.11/drivers/char/keyboard.c linux-2.6.32.11/drivers/char/
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.32.11/drivers/char/mem.c linux-2.6.32.11/drivers/char/mem.c
---- linux-2.6.32.11/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/mem.c linux-2.6.32.12/drivers/char/mem.c
+--- linux-2.6.32.12/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -23077,9 +23295,9 @@ diff -urNp linux-2.6.32.11/drivers/char/mem.c linux-2.6.32.11/drivers/char/mem.c
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.32.11/drivers/char/nvram.c linux-2.6.32.11/drivers/char/nvram.c
---- linux-2.6.32.11/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/nvram.c linux-2.6.32.12/drivers/char/nvram.c
+--- linux-2.6.32.12/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400
@@ -429,7 +429,10 @@ static const struct file_operations nvra
static struct miscdevice nvram_dev = {
NVRAM_MINOR,
@@ -23092,9 +23310,9 @@ diff -urNp linux-2.6.32.11/drivers/char/nvram.c linux-2.6.32.11/drivers/char/nvr
};
static int __init nvram_init(void)
-diff -urNp linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400
@@ -51,7 +51,7 @@ struct ipw_tty {
int tty_type;
struct ipw_network *network;
@@ -23209,9 +23427,9 @@ diff -urNp linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.11/
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/drivers/char/pty.c
---- linux-2.6.32.11/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/pty.c linux-2.6.32.12/drivers/char/pty.c
+--- linux-2.6.32.12/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400
@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
@@ -23242,9 +23460,9 @@ diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/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.11/drivers/char/random.c linux-2.6.32.11/drivers/char/random.c
---- linux-2.6.32.11/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/random.c linux-2.6.32.12/drivers/char/random.c
+--- linux-2.6.32.12/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -23286,9 +23504,9 @@ diff -urNp linux-2.6.32.11/drivers/char/random.c linux-2.6.32.11/drivers/char/ra
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.32.11/drivers/char/sonypi.c linux-2.6.32.11/drivers/char/sonypi.c
---- linux-2.6.32.11/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/sonypi.c linux-2.6.32.12/drivers/char/sonypi.c
+--- linux-2.6.32.12/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400
@@ -491,7 +491,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
@@ -23319,9 +23537,9 @@ diff -urNp linux-2.6.32.11/drivers/char/sonypi.c linux-2.6.32.11/drivers/char/so
mutex_unlock(&sonypi_device.lock);
unlock_kernel();
return 0;
-diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400
+diff -urNp linux-2.6.32.12/drivers/char/tpm/tpm_bios.c linux-2.6.32.12/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -23362,9 +23580,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/c
memcpy(log->bios_event_log, virt, len);
-diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tty_io.c
---- linux-2.6.32.11/drivers/char/tty_io.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/tty_io.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/char/tty_io.c linux-2.6.32.12/drivers/char/tty_io.c
+--- linux-2.6.32.12/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400
++++ linux-2.6.32.12/drivers/char/tty_io.c 2010-04-29 17:49:58.141506968 -0400
@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -23423,7 +23641,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
ssize_t redirected_tty_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
-@@ -1865,7 +1858,7 @@ static int tty_open(struct inode *inode,
+@@ -1867,7 +1860,7 @@ static int tty_open(struct inode *inode,
* Takes bkl. See tty_release_dev
*/
@@ -23432,7 +23650,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
{
lock_kernel();
tty_release_dev(filp);
-@@ -1873,6 +1866,8 @@ static int tty_release(struct inode *ino
+@@ -1875,6 +1868,8 @@ static int tty_release(struct inode *ino
return 0;
}
@@ -23441,7 +23659,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
/**
* tty_poll - check tty status
* @filp: file being polled
-@@ -1885,7 +1880,7 @@ static int tty_release(struct inode *ino
+@@ -1887,7 +1882,7 @@ static int tty_release(struct inode *ino
* may be re-entered freely by other callers.
*/
@@ -23450,7 +23668,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
{
struct tty_struct *tty;
struct tty_ldisc *ld;
-@@ -1902,7 +1897,9 @@ static unsigned int tty_poll(struct file
+@@ -1904,7 +1899,9 @@ static unsigned int tty_poll(struct file
return ret;
}
@@ -23461,7 +23679,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
{
struct tty_struct *tty;
unsigned long flags;
-@@ -1946,6 +1943,8 @@ out:
+@@ -1948,6 +1945,8 @@ out:
return retval;
}
@@ -23470,7 +23688,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
/**
* tiocsti - fake input character
* @tty: tty to fake input into
-@@ -2580,8 +2579,10 @@ long tty_ioctl(struct file *file, unsign
+@@ -2582,8 +2581,10 @@ long tty_ioctl(struct file *file, unsign
return retval;
}
@@ -23482,7 +23700,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
unsigned long arg)
{
struct inode *inode = file->f_dentry->d_inode;
-@@ -2605,6 +2606,8 @@ static long tty_compat_ioctl(struct file
+@@ -2607,6 +2608,8 @@ static long tty_compat_ioctl(struct file
return retval;
}
@@ -23491,7 +23709,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
#endif
/*
-@@ -3048,11 +3051,6 @@ struct tty_struct *get_current_tty(void)
+@@ -3050,11 +3053,6 @@ struct tty_struct *get_current_tty(void)
}
EXPORT_SYMBOL_GPL(get_current_tty);
@@ -23503,9 +23721,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/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.11/drivers/char/tty_ldisc.c linux-2.6.32.11/drivers/char/tty_ldisc.c
---- linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/char/tty_ldisc.c linux-2.6.32.12/drivers/char/tty_ldisc.c
+--- linux-2.6.32.12/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400
@@ -73,7 +73,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;
@@ -23551,9 +23769,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_ldisc.c linux-2.6.32.11/drivers/char
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers/char/virtio_console.c
---- linux-2.6.32.11/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/char/virtio_console.c linux-2.6.32.12/drivers/char/virtio_console.c
+--- linux-2.6.32.12/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400
@@ -44,6 +44,7 @@ static unsigned int in_len;
static char *in, *inbuf;
@@ -23562,9 +23780,9 @@ diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers
static struct hv_ops virtio_cons;
/* The hvc device */
-diff -urNp linux-2.6.32.11/drivers/char/vt_ioctl.c linux-2.6.32.11/drivers/char/vt_ioctl.c
---- linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/char/vt_ioctl.c linux-2.6.32.12/drivers/char/vt_ioctl.c
+--- linux-2.6.32.12/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400
@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
case KDSKBENT:
if (!perm)
@@ -23592,9 +23810,9 @@ diff -urNp linux-2.6.32.11/drivers/char/vt_ioctl.c linux-2.6.32.11/drivers/char/
q = func_table[i];
first_free = funcbufptr + (funcbufsize - funcbufleft);
for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
-diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/cpufreq/cpufreq.c linux-2.6.32.12/drivers/cpufreq/cpufreq.c
+--- linux-2.6.32.12/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
complete(&policy->kobj_unregister);
}
@@ -23604,9 +23822,9 @@ diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpu
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuidle/sysfs.c
---- linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/cpuidle/sysfs.c linux-2.6.32.12/drivers/cpuidle/sysfs.c
+--- linux-2.6.32.12/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/cpuidle/sysfs.c 2010-04-29 17:46:36.917238919 -0400
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
return ret;
}
@@ -23625,9 +23843,18 @@ diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuid
.show = cpuidle_state_show,
};
-diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/ioat/dma.c
---- linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400
+@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpui
+ .release = cpuidle_state_sysfs_release,
+ };
+
+-static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
++static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
+ {
+ kobject_put(&device->kobjs[i]->kobj);
+ wait_for_completion(&device->kobjs[i]->kobj_unregister);
+diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.c linux-2.6.32.12/drivers/dma/ioat/dma.c
+--- linux-2.6.32.12/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -23637,9 +23864,9 @@ diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/io
.show = ioat_attr_show,
};
-diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.h linux-2.6.32.11/drivers/dma/ioat/dma.h
---- linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.h linux-2.6.32.12/drivers/dma/ioat/dma.h
+--- linux-2.6.32.12/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -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);
@@ -23649,9 +23876,9 @@ diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.h linux-2.6.32.11/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.11/drivers/edac/edac_core.h linux-2.6.32.11/drivers/edac/edac_core.h
---- linux-2.6.32.11/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/edac/edac_core.h linux-2.6.32.12/drivers/edac/edac_core.h
+--- linux-2.6.32.12/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400
@@ -99,11 +99,11 @@ extern int edac_debug_level;
#else /* !CONFIG_EDAC_DEBUG */
@@ -23669,9 +23896,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_core.h linux-2.6.32.11/drivers/edac
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/edac/edac_device_sysfs.c linux-2.6.32.12/drivers/edac/edac_device_sysfs.c
+--- linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
}
@@ -23699,9 +23926,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/driv
.show = edac_dev_block_show,
.store = edac_dev_block_store
};
-diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
return -EIO;
}
@@ -23720,9 +23947,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/
.show = mcidev_show,
.store = mcidev_store
};
-diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400
@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
}
@@ -23741,9 +23968,22 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers
.show = edac_pci_dev_show,
.store = edac_pci_dev_store
};
-diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/firmware/dmi_scan.c
---- linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/firewire/core-cdev.c linux-2.6.32.12/drivers/firewire/core-cdev.c
+--- linux-2.6.32.12/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/firewire/core-cdev.c 2010-04-29 17:46:37.101039010 -0400
+@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
+ int ret;
+
+ if ((request->channels == 0 && request->bandwidth == 0) ||
+- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
+- request->bandwidth < 0)
++ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
+ return -EINVAL;
+
+ r = kmalloc(sizeof(*r), GFP_KERNEL);
+diff -urNp linux-2.6.32.12/drivers/firmware/dmi_scan.c linux-2.6.32.12/drivers/firmware/dmi_scan.c
+--- linux-2.6.32.12/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -23756,9 +23996,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/f
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmware/edd.c
---- linux-2.6.32.11/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/firmware/edd.c linux-2.6.32.12/drivers/firmware/edd.c
+--- linux-2.6.32.12/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
return ret;
}
@@ -23768,9 +24008,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmwa
.show = edd_attr_show,
};
-diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/firmware/efivars.c
---- linux-2.6.32.11/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400
+diff -urNp linux-2.6.32.12/drivers/firmware/efivars.c linux-2.6.32.12/drivers/firmware/efivars.c
+--- linux-2.6.32.12/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
return ret;
}
@@ -23780,9 +24020,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/fi
.show = efivar_attr_show,
.store = efivar_attr_store,
};
-diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/firmware/iscsi_ibft.c linux-2.6.32.12/drivers/firmware/iscsi_ibft.c
+--- linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
return ret;
}
@@ -23792,9 +24032,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers
.show = ibft_show_attribute,
};
-diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/firmware/memmap.c
---- linux-2.6.32.11/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/firmware/memmap.c linux-2.6.32.12/drivers/firmware/memmap.c
+--- linux-2.6.32.12/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
NULL
};
@@ -23804,9 +24044,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/fir
.show = memmap_attr_show,
};
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_drv.c linux-2.6.32.12/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
char *kdata = NULL;
@@ -23816,9 +24056,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/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.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_fops.c linux-2.6.32.12/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:58.154995647 -0400
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
}
@@ -23840,7 +24080,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp
spin_unlock(&dev->count_lock);
retcode = drm_setup(dev);
goto out;
-@@ -433,7 +433,7 @@ int drm_release(struct inode *inode, str
+@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, str
lock_kernel();
@@ -23849,7 +24089,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp
if (dev->driver->preclose)
dev->driver->preclose(dev, file_priv);
-@@ -445,7 +445,7 @@ int drm_release(struct inode *inode, str
+@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, str
DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
task_pid_nr(current),
(long)old_encode_dev(file_priv->minor->device),
@@ -23858,7 +24098,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp
/* if the master has gone away we can't do anything with the lock */
if (file_priv->minor->master)
-@@ -522,9 +522,9 @@ int drm_release(struct inode *inode, str
+@@ -524,9 +524,9 @@ int drm_release(struct inode *inode, str
* End inline drm_release
*/
@@ -23870,9 +24110,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/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.11/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -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);
@@ -23882,9 +24122,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.11/drivers/g
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_lock.c linux-2.6.32.11/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_lock.c linux-2.6.32.12/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -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;
@@ -23903,9 +24143,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_lock.c linux-2.6.32.11/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.11/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -23928,9 +24168,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.11/drive
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400
@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -23940,9 +24180,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.11/dri
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400
@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -23952,9 +24192,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.11/dri
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -23987,9 +24227,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h linux-2.6.32.11/drivers/gp
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -23999,9 +24239,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.11/drive
.init = ivch_init,
.dpms = ivch_dpms,
.save = ivch_save,
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -24011,9 +24251,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.11/dri
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -24023,9 +24263,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.11/dri
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400
@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev);
}
@@ -24035,9 +24275,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.11/drive
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -24055,9 +24295,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.11/d
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400
@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
}
}
@@ -24082,9 +24322,21 @@ diff -urNp linux-2.6.32.11/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.11/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 2010-04-29 17:46:37.101039010 -0400
+@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
+
+ if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
+ error = freq - current_freq;
+- error = error < 0 ? 0xffffffff : error;
++ error = (int32_t)error < 0 ? 0xffffffff : error;
+ } else
+ error = abs(current_freq - freq);
+ vco_diff = abs(vco - best_vco);
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400
@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -24094,9 +24346,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.11
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -24148,9 +24400,18 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.11/d
}
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-04 20:46:41.581454607 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-29 17:46:36.939238869 -0400
+@@ -39,7 +39,7 @@
+ #include <linux/module.h>
+
+ #define TTM_ASSERT_LOCKED(param)
+-#define TTM_DEBUG(fmt, arg...)
++#define TTM_DEBUG(fmt, arg...) do {} while (0)
+ #define TTM_BO_HASH_ORDER 13
+
+ static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
NULL
};
@@ -24160,9 +24421,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.11/drivers/
.show = &ttm_bo_global_show
};
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -24183,9 +24444,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.11/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.11/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -24243,9 +24504,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.11/driv
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c
+--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
NULL
};
@@ -24255,21 +24516,21 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.11/driv
.show = &ttm_mem_zone_show,
.store = &ttm_mem_zone_store
};
-diff -urNp linux-2.6.32.11/drivers/gpu/vga/vgaarb.c linux-2.6.32.11/drivers/gpu/vga/vgaarb.c
---- linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-04-04 20:46:41.585591308 -0400
-@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file
- remaining -= 7;
- pr_devel("client 0x%p called 'target'\n", priv);
- /* if target is default */
-- if (!strncmp(buf, "default", 7))
-+ if (!strncmp(curr_pos, "default", 7))
- pdev = pci_dev_get(vga_default_device());
- else {
- if (!vga_pci_str_to_vars(curr_pos, remaining,
-diff -urNp linux-2.6.32.11/drivers/hwmon/k8temp.c linux-2.6.32.11/drivers/hwmon/k8temp.c
---- linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/hid/usbhid/hiddev.c linux-2.6.32.12/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 2010-04-29 17:46:37.113104605 -0400
+@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
+ return put_user(HID_VERSION, (int __user *)arg);
+
+ case HIDIOCAPPLICATION:
+- if (arg < 0 || arg >= hid->maxapplication)
++ if (arg >= hid->maxapplication)
+ return -EINVAL;
+
+ for (i = 0; i < hid->maxcollection; i++)
+diff -urNp linux-2.6.32.12/drivers/hwmon/k8temp.c linux-2.6.32.12/drivers/hwmon/k8temp.c
+--- linux-2.6.32.12/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static struct pci_device_id k8temp_ids[] = {
@@ -24279,9 +24540,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/k8temp.c linux-2.6.32.11/drivers/hwmon/
};
MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.32.11/drivers/hwmon/sis5595.c linux-2.6.32.11/drivers/hwmon/sis5595.c
---- linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/hwmon/sis5595.c linux-2.6.32.12/drivers/hwmon/sis5595.c
+--- linux-2.6.32.12/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static struct pci_device_id sis5595_pci_ids[] = {
@@ -24291,9 +24552,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/sis5595.c linux-2.6.32.11/drivers/hwmon
};
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.32.11/drivers/hwmon/via686a.c linux-2.6.32.11/drivers/hwmon/via686a.c
---- linux-2.6.32.11/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/hwmon/via686a.c linux-2.6.32.12/drivers/hwmon/via686a.c
+--- linux-2.6.32.12/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400
@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
static struct pci_device_id via686a_pci_ids[] = {
@@ -24303,9 +24564,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/via686a.c linux-2.6.32.11/drivers/hwmon
};
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.32.11/drivers/hwmon/vt8231.c linux-2.6.32.11/drivers/hwmon/vt8231.c
---- linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/hwmon/vt8231.c linux-2.6.32.12/drivers/hwmon/vt8231.c
+--- linux-2.6.32.12/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static struct pci_device_id vt8231_pci_ids[] = {
@@ -24315,9 +24576,9 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/vt8231.c linux-2.6.32.11/drivers/hwmon/
};
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.32.11/drivers/hwmon/w83791d.c linux-2.6.32.11/drivers/hwmon/w83791d.c
---- linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/hwmon/w83791d.c linux-2.6.32.12/drivers/hwmon/w83791d.c
+--- linux-2.6.32.12/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -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);
@@ -24329,21 +24590,21 @@ diff -urNp linux-2.6.32.11/drivers/hwmon/w83791d.c linux-2.6.32.11/drivers/hwmon
static struct w83791d_data *w83791d_update_device(struct device *dev);
#ifdef DEBUG
-diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:41:49.952923765 -0400
-+++ linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:46:41.585591308 -0400
-@@ -580,7 +580,7 @@ static struct pci_device_id i801_ids[] =
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
+diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400
++++ linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 2010-04-29 18:00:43.521920899 -0400
+@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
- { 0, }
+ { 0, 0, 0, 0, 0, 0, 0 }
};
MODULE_DEVICE_TABLE (pci, i801_ids);
-diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -24362,9 +24623,9 @@ diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.11/driver
};
MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400
@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
static struct pci_device_id sis630_ids[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -24374,9 +24635,9 @@ diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.11/drive
};
MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static struct pci_device_id sis96x_ids[] = {
@@ -24386,9 +24647,9 @@ diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.11/drive
};
MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.32.11/drivers/ide/ide-cd.c linux-2.6.32.11/drivers/ide/ide-cd.c
---- linux-2.6.32.11/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/ide/ide-cd.c linux-2.6.32.12/drivers/ide/ide-cd.c
+--- linux-2.6.32.12/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400
@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -24398,9 +24659,9 @@ diff -urNp linux-2.6.32.11/drivers/ide/ide-cd.c linux-2.6.32.11/drivers/ide/ide-
drive->dma = 0;
}
}
-diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/ieee1394/dv1394.c
---- linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/dv1394.c linux-2.6.32.12/drivers/ieee1394/dv1394.c
+--- linux-2.6.32.12/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -24419,9 +24680,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/iee
};
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.32.11/drivers/ieee1394/eth1394.c linux-2.6.32.11/drivers/ieee1394/eth1394.c
---- linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/eth1394.c linux-2.6.32.12/drivers/ieee1394/eth1394.c
+--- linux-2.6.32.12/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
@@ -24431,9 +24692,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/eth1394.c linux-2.6.32.11/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee1394/hosts.c
---- linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/hosts.c linux-2.6.32.12/drivers/ieee1394/hosts.c
+--- linux-2.6.32.12/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -24442,9 +24703,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
-diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/ohci1394.c linux-2.6.32.12/drivers/ieee1394/ohci1394.c
+--- linux-2.6.32.12/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -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)
@@ -24466,9 +24727,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/i
};
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.32.11/drivers/ieee1394/raw1394.c linux-2.6.32.11/drivers/ieee1394/raw1394.c
---- linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/raw1394.c linux-2.6.32.12/drivers/ieee1394/raw1394.c
+--- linux-2.6.32.12/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400
@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -24478,9 +24739,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/raw1394.c linux-2.6.32.11/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.32.11/drivers/ieee1394/sbp2.c linux-2.6.32.11/drivers/ieee1394/sbp2.c
---- linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/sbp2.c linux-2.6.32.12/drivers/ieee1394/sbp2.c
+--- linux-2.6.32.12/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400
@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -24499,9 +24760,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/sbp2.c linux-2.6.32.11/drivers/ieee1
{
int ret;
-diff -urNp linux-2.6.32.11/drivers/ieee1394/video1394.c linux-2.6.32.11/drivers/ieee1394/video1394.c
---- linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/ieee1394/video1394.c linux-2.6.32.12/drivers/ieee1394/video1394.c
+--- linux-2.6.32.12/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400
@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -24511,9 +24772,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/video1394.c linux-2.6.32.11/drivers/
};
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.32.11/drivers/infiniband/core/cm.c linux-2.6.32.11/drivers/infiniband/core/cm.c
---- linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/infiniband/core/cm.c linux-2.6.32.12/drivers/infiniband/core/cm.c
+--- linux-2.6.32.12/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400
@@ -112,7 +112,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -24657,9 +24918,9 @@ diff -urNp linux-2.6.32.11/drivers/infiniband/core/cm.c linux-2.6.32.11/drivers/
.show = cm_show_counter
};
-diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/infiniband/core/sysfs.c linux-2.6.32.12/drivers/infiniband/core/sysfs.c
+--- linux-2.6.32.12/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
return port_attr->show(p, port_attr, buf);
}
@@ -24669,9 +24930,9 @@ diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drive
.show = port_attr_show
};
-diff -urNp linux-2.6.32.11/drivers/input/keyboard/atkbd.c linux-2.6.32.11/drivers/input/keyboard/atkbd.c
---- linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/input/keyboard/atkbd.c linux-2.6.32.12/drivers/input/keyboard/atkbd.c
+--- linux-2.6.32.12/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400
@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -24681,9 +24942,9 @@ diff -urNp linux-2.6.32.11/drivers/input/keyboard/atkbd.c linux-2.6.32.11/driver
};
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/drivers/input/mouse/lifebook.c
---- linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400
+diff -urNp linux-2.6.32.12/drivers/input/mouse/lifebook.c linux-2.6.32.12/drivers/input/mouse/lifebook.c
+--- linux-2.6.32.12/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400
@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -24693,9 +24954,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/driver
};
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
-diff -urNp linux-2.6.32.11/drivers/input/mouse/psmouse-base.c linux-2.6.32.11/drivers/input/mouse/psmouse-base.c
---- linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/input/mouse/psmouse-base.c linux-2.6.32.12/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400
@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -24705,9 +24966,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/psmouse-base.c linux-2.6.32.11/dr
};
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drivers/input/mouse/synaptics.c
---- linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/input/mouse/synaptics.c linux-2.6.32.12/drivers/input/mouse/synaptics.c
+--- linux-2.6.32.12/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400
@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -24736,9 +24997,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drive
};
#endif
-diff -urNp linux-2.6.32.11/drivers/input/mousedev.c linux-2.6.32.11/drivers/input/mousedev.c
---- linux-2.6.32.11/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/input/mousedev.c linux-2.6.32.12/drivers/input/mousedev.c
+--- linux-2.6.32.12/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400
@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -24748,9 +25009,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mousedev.c linux-2.6.32.11/drivers/inpu
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400
-+++ linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400
++++ linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400
@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -24805,9 +25066,9 @@ diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.32.11/drivers/input/serio/serio_raw.c linux-2.6.32.11/drivers/input/serio/serio_raw.c
---- linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/input/serio/serio_raw.c linux-2.6.32.12/drivers/input/serio/serio_raw.c
+--- linux-2.6.32.12/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400
@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -24817,9 +25078,9 @@ diff -urNp linux-2.6.32.11/drivers/input/serio/serio_raw.c linux-2.6.32.11/drive
};
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/common.c linux-2.6.32.11/drivers/isdn/gigaset/common.c
---- linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/common.c linux-2.6.32.12/drivers/isdn/gigaset/common.c
+--- linux-2.6.32.12/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -24829,9 +25090,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/common.c linux-2.6.32.11/drivers
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400
@@ -446,7 +446,7 @@ struct cardstate {
spinlock_t cmdlock;
unsigned curlen, cmdbytes;
@@ -24841,9 +25102,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h linux-2.6.32.11/driver
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/interface.c linux-2.6.32.11/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400
-+++ linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/interface.c linux-2.6.32.12/drivers/isdn/gigaset/interface.c
+--- linux-2.6.32.12/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400
++++ linux-2.6.32.12/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
@@ -24931,9 +25192,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/interface.c linux-2.6.32.11/driv
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -24952,9 +25213,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c linux-2.6.32.11/driver
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-2.6.32.11/drivers/isdn/icn/icn.c linux-2.6.32.11/drivers/isdn/icn/icn.c
---- linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/isdn/icn/icn.c linux-2.6.32.12/drivers/isdn/icn/icn.c
+--- linux-2.6.32.12/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -24964,9 +25225,9 @@ diff -urNp linux-2.6.32.11/drivers/isdn/icn/icn.c linux-2.6.32.11/drivers/isdn/i
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-2.6.32.11/drivers/lguest/core.c linux-2.6.32.11/drivers/lguest/core.c
---- linux-2.6.32.11/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/lguest/core.c linux-2.6.32.12/drivers/lguest/core.c
+--- linux-2.6.32.12/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -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.
@@ -24985,9 +25246,9 @@ diff -urNp linux-2.6.32.11/drivers/lguest/core.c linux-2.6.32.11/drivers/lguest/
if (!switcher_vma) {
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -25006,9 +25267,9 @@ diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.11
.get_brightness = pmu_backlight_get_brightness,
.update_status = pmu_backlight_update_status,
-diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/macintosh/via-pmu.c
---- linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu.c linux-2.6.32.12/drivers/macintosh/via-pmu.c
+--- linux-2.6.32.12/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -25018,9 +25279,9 @@ diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/m
.enter = powerbook_sleep,
.valid = pmu_sleep_valid,
};
-diff -urNp linux-2.6.32.11/drivers/md/bitmap.c linux-2.6.32.11/drivers/md/bitmap.c
---- linux-2.6.32.11/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/md/bitmap.c linux-2.6.32.12/drivers/md/bitmap.c
+--- linux-2.6.32.12/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25030,9 +25291,9 @@ diff -urNp linux-2.6.32.11/drivers/md/bitmap.c linux-2.6.32.11/drivers/md/bitmap
# endif
#endif
-diff -urNp linux-2.6.32.11/drivers/md/dm-sysfs.c linux-2.6.32.11/drivers/md/dm-sysfs.c
---- linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/md/dm-sysfs.c linux-2.6.32.12/drivers/md/dm-sysfs.c
+--- linux-2.6.32.12/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
NULL,
};
@@ -25042,9 +25303,9 @@ diff -urNp linux-2.6.32.11/drivers/md/dm-sysfs.c linux-2.6.32.11/drivers/md/dm-s
.show = dm_attr_show,
};
-diff -urNp linux-2.6.32.11/drivers/md/dm-table.c linux-2.6.32.11/drivers/md/dm-table.c
---- linux-2.6.32.11/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400
+diff -urNp linux-2.6.32.12/drivers/md/dm-table.c linux-2.6.32.12/drivers/md/dm-table.c
+--- linux-2.6.32.12/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400
@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -25054,9 +25315,9 @@ diff -urNp linux-2.6.32.11/drivers/md/dm-table.c linux-2.6.32.11/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.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c
---- linux-2.6.32.11/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c
+--- linux-2.6.32.12/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400
@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko
mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
kfree(rdev);
@@ -25093,9 +25354,9 @@ diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/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.11/drivers/md/md.h linux-2.6.32.11/drivers/md/md.h
---- linux-2.6.32.11/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/md/md.h linux-2.6.32.12/drivers/md/md.h
+--- linux-2.6.32.12/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400
@@ -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)
@@ -25105,9 +25366,9 @@ diff -urNp linux-2.6.32.11/drivers/md/md.h linux-2.6.32.11/drivers/md/md.h
}
struct mdk_personality
-diff -urNp linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400
@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -25116,9 +25377,9 @@ diff -urNp linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.11/d
struct file_operations *dvbdevfops;
struct device *clsdev;
int minor;
-diff -urNp linux-2.6.32.11/drivers/media/radio/radio-cadet.c linux-2.6.32.11/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/media/radio/radio-cadet.c linux-2.6.32.12/drivers/media/radio/radio-cadet.c
+--- linux-2.6.32.12/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -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++];
@@ -25128,9 +25389,9 @@ diff -urNp linux-2.6.32.11/drivers/media/radio/radio-cadet.c linux-2.6.32.11/dri
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c
+--- linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
int error;
@@ -25140,9 +25401,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c
+--- linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
int error;
@@ -25152,9 +25413,72 @@ diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c lin
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
-diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/message/fusion/mptdebug.h linux-2.6.32.12/drivers/message/fusion/mptdebug.h
+--- linux-2.6.32.12/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/message/fusion/mptdebug.h 2010-04-29 17:46:37.113104605 -0400
+@@ -71,7 +71,7 @@
+ CMD; \
+ }
+ #else
+-#define MPT_CHECK_LOGGING(IOC, CMD, BITS)
++#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0)
+ #endif
+
+
+diff -urNp linux-2.6.32.12/drivers/message/fusion/mptsas.c linux-2.6.32.12/drivers/message/fusion/mptsas.c
+--- linux-2.6.32.12/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/message/fusion/mptsas.c 2010-04-29 17:46:37.113104605 -0400
+@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
+ return 0;
+ }
+
++static inline void
++mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
++{
++ if (phy_info->port_details) {
++ phy_info->port_details->rphy = rphy;
++ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
++ ioc->name, rphy));
++ }
++
++ if (rphy) {
++ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
++ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
++ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
++ ioc->name, rphy, rphy->dev.release));
++ }
++}
++
+ /* no mutex */
+ static void
+ mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
+@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
+ return NULL;
+ }
+
+-static inline void
+-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
+-{
+- if (phy_info->port_details) {
+- phy_info->port_details->rphy = rphy;
+- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
+- ioc->name, rphy));
+- }
+-
+- if (rphy) {
+- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
+- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
+- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
+- ioc->name, rphy, rphy->dev.release));
+- }
+-}
+-
+ static inline struct sas_port *
+ mptsas_get_port(struct mptsas_phyinfo *phy_info)
+ {
+diff -urNp linux-2.6.32.12/drivers/message/i2o/i2o_proc.c linux-2.6.32.12/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400
@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -25241,9 +25565,9 @@ diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/driver
return 0;
}
-diff -urNp linux-2.6.32.11/drivers/misc/kgdbts.c linux-2.6.32.11/drivers/misc/kgdbts.c
---- linux-2.6.32.11/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/misc/kgdbts.c linux-2.6.32.12/drivers/misc/kgdbts.c
+--- linux-2.6.32.12/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -25262,9 +25586,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/kgdbts.c linux-2.6.32.11/drivers/misc/kg
.name = "kgdbts",
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
-diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400
@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -25276,9 +25600,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.11/dri
if (mcs_op_statistics[op].max < clks)
mcs_op_statistics[op].max = clks;
}
-diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -25302,9 +25626,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.11/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.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -25488,9 +25812,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/driv
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2000.c linux-2.6.32.11/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2000.c linux-2.6.32.12/drivers/mtd/devices/doc2000.c
+--- linux-2.6.32.12/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -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 */
@@ -25500,9 +25824,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2000.c linux-2.6.32.11/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.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2001.c linux-2.6.32.12/drivers/mtd/devices/doc2001.c
+--- linux-2.6.32.12/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -25512,9 +25836,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/ubi/build.c
---- linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/mtd/ubi/build.c linux-2.6.32.12/drivers/mtd/ubi/build.c
+--- linux-2.6.32.12/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -25554,9 +25878,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/u
}
/**
-diff -urNp linux-2.6.32.11/drivers/net/e1000e/82571.c linux-2.6.32.11/drivers/net/e1000e/82571.c
---- linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/net/e1000e/82571.c linux-2.6.32.12/drivers/net/e1000e/82571.c
+--- linux-2.6.32.12/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400
@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -25610,9 +25934,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/82571.c linux-2.6.32.11/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.11/drivers/net/e1000e/e1000.h linux-2.6.32.11/drivers/net/e1000e/e1000.h
---- linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/net/e1000e/e1000.h linux-2.6.32.12/drivers/net/e1000e/e1000.h
+--- linux-2.6.32.12/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400
@@ -375,9 +375,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -25626,9 +25950,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/e1000.h linux-2.6.32.11/drivers/ne
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.32.11/drivers/net/e1000e/es2lan.c linux-2.6.32.11/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400
+diff -urNp linux-2.6.32.12/drivers/net/e1000e/es2lan.c linux-2.6.32.12/drivers/net/e1000e/es2lan.c
+--- linux-2.6.32.12/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -25664,9 +25988,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/es2lan.c linux-2.6.32.11/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.11/drivers/net/e1000e/hw.h linux-2.6.32.11/drivers/net/e1000e/hw.h
---- linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400
-+++ linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/e1000e/hw.h linux-2.6.32.12/drivers/net/e1000e/hw.h
+--- linux-2.6.32.12/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400
++++ linux-2.6.32.12/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400
@@ -756,34 +756,34 @@ struct e1000_mac_operations {
/* Function pointers for the PHY. */
@@ -25726,9 +26050,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/hw.h linux-2.6.32.11/drivers/net/e
};
struct e1000_mac_info {
-diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400
-+++ linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/e1000e/ich8lan.c linux-2.6.32.12/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400
++++ linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400
@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -25756,9 +26080,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/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.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibmveth.c
---- linux-2.6.32.11/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/ibmveth.c linux-2.6.32.12/drivers/net/ibmveth.c
+--- linux-2.6.32.12/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
NULL,
};
@@ -25768,10 +26092,10 @@ diff -urNp linux-2.6.32.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibm
.show = veth_pool_show,
.store = veth_pool_store,
};
-diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-04-04 20:46:41.601781347 -0400
-@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct
+diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_82575.c linux-2.6.32.12/drivers/net/igb/e1000_82575.c
+--- linux-2.6.32.12/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400
++++ linux-2.6.32.12/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:58.193505226 -0400
+@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct
wr32(E1000_VT_CTL, vt_ctl);
}
@@ -25780,7 +26104,7 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers
.reset_hw = igb_reset_hw_82575,
.init_hw = igb_init_hw_82575,
.check_for_link = igb_check_for_link_82575,
-@@ -1409,13 +1409,13 @@ static struct e1000_mac_operations e1000
+@@ -1410,13 +1410,13 @@ static struct e1000_mac_operations e1000
.get_speed_and_duplex = igb_get_speed_and_duplex_copper,
};
@@ -25796,10 +26120,10 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_hw.h linux-2.6.32.11/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-04-04 20:46:41.601781347 -0400
-@@ -302,17 +302,17 @@ struct e1000_phy_operations {
+diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_hw.h linux-2.6.32.12/drivers/net/igb/e1000_hw.h
+--- linux-2.6.32.12/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400
++++ linux-2.6.32.12/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:58.197572571 -0400
+@@ -303,17 +303,17 @@ struct e1000_phy_operations {
};
struct e1000_nvm_operations {
@@ -25824,9 +26148,9 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_hw.h linux-2.6.32.11/drivers/ne
};
extern const struct e1000_info e1000_82575_info;
-diff -urNp linux-2.6.32.11/drivers/net/irda/vlsi_ir.c linux-2.6.32.11/drivers/net/irda/vlsi_ir.c
---- linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/irda/vlsi_ir.c linux-2.6.32.12/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
@@ -25843,9 +26167,9 @@ diff -urNp linux-2.6.32.11/drivers/net/irda/vlsi_ir.c linux-2.6.32.11/drivers/ne
spin_unlock_irqrestore(&idev->lock, flags);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
-diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/net/iseries_veth.c
---- linux-2.6.32.11/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/iseries_veth.c linux-2.6.32.12/drivers/net/iseries_veth.c
+--- linux-2.6.32.12/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
NULL
};
@@ -25864,9 +26188,9 @@ diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/ne
.show = veth_port_attribute_show
};
-diff -urNp linux-2.6.32.11/drivers/net/pcnet32.c linux-2.6.32.11/drivers/net/pcnet32.c
---- linux-2.6.32.11/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/pcnet32.c linux-2.6.32.12/drivers/net/pcnet32.c
+--- linux-2.6.32.12/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400
@@ -79,7 +79,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -25876,9 +26200,9 @@ diff -urNp linux-2.6.32.11/drivers/net/pcnet32.c linux-2.6.32.11/drivers/net/pcn
{ 0x300, 0x320, 0x340, 0x360, 0 };
static int pcnet32_debug = 0;
-diff -urNp linux-2.6.32.11/drivers/net/tg3.h linux-2.6.32.11/drivers/net/tg3.h
---- linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400
-+++ linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/tg3.h linux-2.6.32.12/drivers/net/tg3.h
+--- linux-2.6.32.12/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400
++++ linux-2.6.32.12/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400
@@ -95,6 +95,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -25887,9 +26211,9 @@ diff -urNp linux-2.6.32.11/drivers/net/tg3.h linux-2.6.32.11/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.11/drivers/net/tulip/de4x5.c linux-2.6.32.11/drivers/net/tulip/de4x5.c
---- linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -0400
+diff -urNp linux-2.6.32.12/drivers/net/tulip/de4x5.c linux-2.6.32.12/drivers/net/tulip/de4x5.c
+--- linux-2.6.32.12/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -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];
@@ -25908,9 +26232,9 @@ diff -urNp linux-2.6.32.11/drivers/net/tulip/de4x5.c linux-2.6.32.11/drivers/net
return -EFAULT;
break;
}
-diff -urNp linux-2.6.32.11/drivers/net/usb/hso.c linux-2.6.32.11/drivers/net/usb/hso.c
---- linux-2.6.32.11/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/usb/hso.c linux-2.6.32.12/drivers/net/usb/hso.c
+--- linux-2.6.32.12/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400
@@ -258,7 +258,7 @@ struct hso_serial {
/* from usb_serial_port */
@@ -25989,9 +26313,9 @@ diff -urNp linux-2.6.32.11/drivers/net/usb/hso.c linux-2.6.32.11/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.11/drivers/net/wireless/b43/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -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);
@@ -26001,9 +26325,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c linux-2.6.32.11/dr
/* Offset of struct b43_dfs_file in struct b43_dfsentry */
size_t file_struct_offset;
};
-diff -urNp linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -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);
@@ -26013,9 +26337,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
},
};
@@ -26025,9 +26349,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
};
@@ -26037,10 +26361,10 @@ diff -urNp linux-2.6.32.11/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.11/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-04 20:46:41.605567348 -0400
-@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib =
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:38.221487644 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:58.277496729 -0400
+@@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib =
},
};
@@ -26049,10 +26373,10 @@ diff -urNp linux-2.6.32.11/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.11/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-04 20:46:41.605567348 -0400
-@@ -1626,14 +1626,14 @@ static struct iwl_lib_ops iwl5150_lib =
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:38.221487644 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:58.285504530 -0400
+@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib =
},
};
@@ -26069,9 +26393,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
.calc_rssi = iwl5000_calc_rssi,
};
@@ -26081,9 +26405,23 @@ diff -urNp linux-2.6.32.11/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.11/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-04-29 17:46:37.170092362 -0400
+@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
+ #endif
+
+ #else
+-#define IWL_DEBUG(__priv, level, fmt, args...)
+-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
+ static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
+ void *p, u32 len)
+ {}
+diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h
+--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400
@@ -67,7 +67,7 @@ struct iwl_tx_queue;
/* shared structures from iwl-5000.c */
@@ -26093,9 +26431,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1
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.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400
@@ -708,7 +708,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -26105,9 +26443,21 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 2010-04-29 17:46:37.185749089 -0400
+@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
+
+ devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
+
+- if (rts_threshold < 0 || rts_threshold > 2347)
++ if (rts_threshold > 2347)
+ rts_threshold = 2347;
+
+ tmp = cpu_to_le32(rts_threshold);
+diff -urNp linux-2.6.32.12/drivers/oprofile/buffer_sync.c linux-2.6.32.12/drivers/oprofile/buffer_sync.c
+--- linux-2.6.32.12/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400
@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -26143,9 +26493,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/driver
}
}
release_mm(mm);
-diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drivers/oprofile/event_buffer.c
---- linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/oprofile/event_buffer.c linux-2.6.32.12/drivers/oprofile/event_buffer.c
+--- linux-2.6.32.12/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -26155,9 +26505,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drive
return;
}
-diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/oprofile/oprof.c
---- linux-2.6.32.11/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400
+diff -urNp linux-2.6.32.12/drivers/oprofile/oprof.c linux-2.6.32.12/drivers/oprofile/oprof.c
+--- linux-2.6.32.12/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -26167,9 +26517,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/opro
start_switch_worker();
}
-diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/oprofile/oprofilefs.c linux-2.6.32.12/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.12/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400
@@ -187,7 +187,7 @@ static const struct file_operations atom
@@ -26179,9 +26529,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers
{
struct dentry *d = __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444);
-diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.c linux-2.6.32.12/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -26199,9 +26549,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/dri
}
-diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.h linux-2.6.32.12/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -26219,9 +26569,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/dri
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/parisc/pdc_stable.c
---- linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/parisc/pdc_stable.c linux-2.6.32.12/drivers/parisc/pdc_stable.c
+--- linux-2.6.32.12/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
return ret;
}
@@ -26231,9 +26581,9 @@ diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/p
.show = pdcspath_attr_show,
.store = pdcspath_attr_store,
};
-diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parport/procfs.c
---- linux-2.6.32.11/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/parport/procfs.c linux-2.6.32.12/drivers/parport/procfs.c
+--- linux-2.6.32.12/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -26252,9 +26602,9 @@ diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parp
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
}
@@ -26264,9 +26614,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/dr
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -26281,9 +26631,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.11/dr
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/hotplug/fakephp.c linux-2.6.32.12/drivers/pci/hotplug/fakephp.c
+--- linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
}
@@ -26293,9 +26643,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers
.store = legacy_store, .show = legacy_show
},
.release = &legacy_release,
-diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci/intel-iommu.c
---- linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/intel-iommu.c linux-2.6.32.12/drivers/pci/intel-iommu.c
+--- linux-2.6.32.12/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400
@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
return !dma_addr;
}
@@ -26305,9 +26655,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci
.alloc_coherent = intel_alloc_coherent,
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
-diff -urNp linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400
@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
static const struct pci_device_id port_pci_ids[] = { {
/* handle any PCI-Express port */
@@ -26317,9 +26667,29 @@ diff -urNp linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.11/driver
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/drivers/pci/proc.c
---- linux-2.6.32.11/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/probe.c linux-2.6.32.12/drivers/pci/probe.c
+--- linux-2.6.32.12/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/probe.c 2010-04-29 17:46:37.193749810 -0400
+@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
+ return ret;
+ }
+
+-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
++static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+ {
+ return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
+ }
+
+-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
++static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+ {
+diff -urNp linux-2.6.32.12/drivers/pci/proc.c linux-2.6.32.12/drivers/pci/proc.c
+--- linux-2.6.32.12/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400
@@ -480,7 +480,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -26337,9 +26707,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/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.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c
---- linux-2.6.32.11/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pci/slot.c linux-2.6.32.12/drivers/pci/slot.c
+--- linux-2.6.32.12/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
return attribute->store ? attribute->store(slot, buf, len) : -EIO;
}
@@ -26349,9 +26719,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c
.show = pci_slot_attr_show,
.store = pci_slot_attr_store,
};
-diff -urNp linux-2.6.32.11/drivers/pcmcia/ti113x.h linux-2.6.32.11/drivers/pcmcia/ti113x.h
---- linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pcmcia/ti113x.h linux-2.6.32.12/drivers/pcmcia/ti113x.h
+--- linux-2.6.32.12/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400
@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -26361,9 +26731,9 @@ diff -urNp linux-2.6.32.11/drivers/pcmcia/ti113x.h linux-2.6.32.11/drivers/pcmci
};
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.32.11/drivers/pcmcia/yenta_socket.c linux-2.6.32.11/drivers/pcmcia/yenta_socket.c
---- linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/pcmcia/yenta_socket.c linux-2.6.32.12/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400
@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
/* match any cardbus bridge */
@@ -26373,9 +26743,9 @@ diff -urNp linux-2.6.32.11/drivers/pcmcia/yenta_socket.c linux-2.6.32.11/drivers
};
MODULE_DEVICE_TABLE(pci, yenta_table);
-diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/acer-wmi.c linux-2.6.32.12/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -26385,9 +26755,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drive
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/asus_acpi.c linux-2.6.32.12/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400
@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
@@ -26397,9 +26767,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/driv
.get_brightness = read_brightness,
.update_status = set_brightness_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/asus-laptop.c linux-2.6.32.11/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/asus-laptop.c linux-2.6.32.12/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
*/
static int read_brightness(struct backlight_device *bd);
@@ -26409,9 +26779,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/asus-laptop.c linux-2.6.32.11/dr
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/compal-laptop.c linux-2.6.32.12/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -26421,9 +26791,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/dell-laptop.c linux-2.6.32.12/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400
@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
return buffer.output[1];
}
@@ -26433,10 +26803,10 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/dr
.get_brightness = dell_get_intensity,
.update_status = dell_send_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-04-04 20:46:41.612789562 -0400
-@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device
+diff -urNp linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400
++++ linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:58.337509449 -0400
+@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
*/
static int read_brightness(struct backlight_device *bd);
static int update_bl_status(struct backlight_device *bd);
@@ -26445,9 +26815,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.11/d
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -26457,9 +26827,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/msi-laptop.c linux-2.6.32.12/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -26469,9 +26839,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/dri
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
}
@@ -26481,9 +26851,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/sony-laptop.c linux-2.6.32.12/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
}
@@ -26493,11 +26863,11 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/dr
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-04-04 20:46:41.612789562 -0400
-@@ -6083,7 +6083,7 @@ static int brightness_get(struct backlig
- return status & TP_EC_BACKLIGHT_LVLMSK;
+diff -urNp linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400
++++ linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 18:04:08.901389713 -0400
+@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
+ BACKLIGHT_UPDATE_HOTKEY);
}
-static struct backlight_ops ibm_backlight_data = {
@@ -26505,9 +26875,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.11/
.get_brightness = brightness_get,
.update_status = brightness_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400
@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -26517,9 +26887,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/d
.get_brightness = get_lcd,
.update_status = set_lcd_status,
};
-diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400
@@ -60,7 +60,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -26576,9 +26946,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drive
+
+ pax_close_kernel();
}
-diff -urNp linux-2.6.32.11/drivers/pnp/quirks.c linux-2.6.32.11/drivers/pnp/quirks.c
---- linux-2.6.32.11/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/pnp/quirks.c linux-2.6.32.12/drivers/pnp/quirks.c
+--- linux-2.6.32.12/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400
@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -26588,9 +26958,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/quirks.c linux-2.6.32.11/drivers/pnp/quir
};
void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/resource.c
---- linux-2.6.32.11/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/pnp/resource.c linux-2.6.32.12/drivers/pnp/resource.c
+--- linux-2.6.32.12/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -26609,9 +26979,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/re
return 0;
/* check if the resource is reserved */
-diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.c linux-2.6.32.12/drivers/s390/cio/qdio_perf.c
+--- linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400
@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
static int qdio_perf_proc_show(struct seq_file *m, void *v)
{
@@ -26687,9 +27057,9 @@ diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/
seq_printf(m, "\n");
return 0;
}
-diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.h linux-2.6.32.11/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400
+diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.h linux-2.6.32.12/drivers/s390/cio/qdio_perf.h
+--- linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400
@@ -13,46 +13,46 @@
struct qdio_perf_stats {
@@ -26762,9 +27132,9 @@ diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.h linux-2.6.32.11/drivers/
}
int qdio_setup_perf_stats(void);
-diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/drivers/scsi/ipr.c
---- linux-2.6.32.11/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/scsi/ipr.c linux-2.6.32.12/drivers/scsi/ipr.c
+--- linux-2.6.32.12/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -26774,9 +27144,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/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.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400
@@ -86,12 +86,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -26898,9 +27268,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/
fc_frame_free(fp);
}
-diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400
@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -26910,9 +27280,21 @@ diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers
.phy_reset = sas_ata_phy_reset,
.post_internal_cmd = sas_ata_post_internal,
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.32.11/drivers/scsi/scsi_logging.h linux-2.6.32.11/drivers/scsi/scsi_logging.h
---- linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-04-29 17:46:37.209772088 -0400
+@@ -79,7 +79,7 @@
+ CMD; \
+ }
+ #else
+-#define MPT_CHECK_LOGGING(IOC, CMD, BITS)
++#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0)
+ #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
+
+
+diff -urNp linux-2.6.32.12/drivers/scsi/scsi_logging.h linux-2.6.32.12/drivers/scsi/scsi_logging.h
+--- linux-2.6.32.12/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -26922,9 +27304,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/scsi_logging.h linux-2.6.32.11/drivers/s
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c
---- linux-2.6.32.11/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/scsi/sg.c linux-2.6.32.12/drivers/scsi/sg.c
+--- linux-2.6.32.12/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400
@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -26943,9 +27325,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.32.11/drivers/serial/8250_pci.c linux-2.6.32.11/drivers/serial/8250_pci.c
---- linux-2.6.32.11/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/serial/8250_pci.c linux-2.6.32.12/drivers/serial/8250_pci.c
+--- linux-2.6.32.12/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400
@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -26955,9 +27337,9 @@ diff -urNp linux-2.6.32.11/drivers/serial/8250_pci.c linux-2.6.32.11/drivers/ser
};
static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.32.11/drivers/serial/kgdboc.c linux-2.6.32.11/drivers/serial/kgdboc.c
---- linux-2.6.32.11/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/serial/kgdboc.c linux-2.6.32.12/drivers/serial/kgdboc.c
+--- linux-2.6.32.12/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
@@ -26976,9 +27358,9 @@ diff -urNp linux-2.6.32.11/drivers/serial/kgdboc.c linux-2.6.32.11/drivers/seria
.name = "kgdboc",
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
-diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/drivers/staging/android/binder.c
---- linux-2.6.32.11/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/android/binder.c linux-2.6.32.12/drivers/staging/android/binder.c
+--- linux-2.6.32.12/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}
@@ -26988,9 +27370,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/driv
.open = binder_vma_open,
.close = binder_vma_close,
};
-diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c
+--- linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
return VM_FAULT_NOPAGE;
}
@@ -27009,9 +27391,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers
.owner = THIS_MODULE,
.open = b3dfg_open,
.release = b3dfg_release,
-diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
@@ -27021,9 +27403,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/
.close = comedi_unmap,
};
-diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -27033,9 +27415,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400
@@ -1022,7 +1022,7 @@ done:
return rc;
}
@@ -27045,9 +27427,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400
@@ -833,7 +833,7 @@ done:
return rc;
}
@@ -27057,9 +27439,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400
@@ -805,7 +805,7 @@ dma_fail:
return rc;
}
@@ -27069,9 +27451,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -27090,9 +27472,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
.owner = THIS_MODULE,
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -27102,9 +27484,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -27123,9 +27505,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400
@@ -816,7 +816,7 @@ err:
return rc;
}
@@ -27135,9 +27517,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -27147,9 +27529,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/dri
.owner = THIS_MODULE,
.open = snd_open,
.release = snd_release,
-diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
@@ -27159,9 +27541,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.11/d
.owner = THIS_MODULE,
.read = qmi_read,
.write = qmi_write,
-diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
@@ -27180,9 +27562,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
.owner = THIS_MODULE,
.open = rpcrouter_open,
.release = rpcrouter_release,
-diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/staging/dst/dcore.c
---- linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dst/dcore.c linux-2.6.32.12/drivers/staging/dst/dcore.c
+--- linux-2.6.32.12/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
return 0;
}
@@ -27201,9 +27583,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/s
snprintf(n->name, sizeof(n->name), "%s", ctl->name);
err = dst_node_sysfs_init(n);
-diff -urNp linux-2.6.32.11/drivers/staging/dst/trans.c linux-2.6.32.11/drivers/staging/dst/trans.c
---- linux-2.6.32.11/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/dst/trans.c linux-2.6.32.12/drivers/staging/dst/trans.c
+--- linux-2.6.32.12/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
t->error = 0;
t->retries = 0;
@@ -27213,9 +27595,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dst/trans.c linux-2.6.32.11/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.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -27225,9 +27607,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400
@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
/* The one and only one */
static struct blkvsc_driver_context g_blkvsc_drv;
@@ -27237,9 +27619,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.11/drive
.owner = THIS_MODULE,
.open = blkvsc_open,
.release = blkvsc_release,
-diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers/staging/panel/panel.c
---- linux-2.6.32.11/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/panel/panel.c linux-2.6.32.12/drivers/staging/panel/panel.c
+--- linux-2.6.32.12/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -27258,9 +27640,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers
.read = keypad_read, /* read */
.open = keypad_open, /* open */
.release = keypad_release, /* close */
-diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drivers/staging/phison/phison.c
---- linux-2.6.32.11/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/phison/phison.c linux-2.6.32.12/drivers/staging/phison/phison.c
+--- linux-2.6.32.12/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -27270,9 +27652,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drive
.inherits = &ata_bmdma_port_ops,
.prereset = phison_pre_reset,
};
-diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/staging/poch/poch.c
---- linux-2.6.32.11/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/poch/poch.c linux-2.6.32.12/drivers/staging/poch/poch.c
+--- linux-2.6.32.12/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
@@ -27282,9 +27664,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/s
.owner = THIS_MODULE,
.open = poch_open,
.release = poch_release,
-diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/inode.c linux-2.6.32.11/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/inode.c linux-2.6.32.12/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -27294,9 +27676,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/inode.c linux-2.6.32.11/driv
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -27306,9 +27688,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c linux-2.6.32.11/dri
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400
@@ -570,7 +570,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -27318,9 +27700,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h linux-2.6.32.11/driv
unsigned long mcache_timeout;
unsigned int idx;
-diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/sep/sep_driver.c linux-2.6.32.12/drivers/staging/sep/sep_driver.c
+--- linux-2.6.32.12/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -27330,9 +27712,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/driv
.owner = THIS_MODULE,
.ioctl = sep_ioctl,
.poll = sep_poll,
-diff -urNp linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -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);
@@ -27342,9 +27724,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c
---- linux-2.6.32.11/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/uio/uio.c linux-2.6.32.12/drivers/uio/uio.c
+--- linux-2.6.32.12/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400
@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
return entry->show(mem, buf);
}
@@ -27363,9 +27745,9 @@ diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c
.show = portio_type_show,
};
-diff -urNp linux-2.6.32.11/drivers/usb/atm/usbatm.c linux-2.6.32.11/drivers/usb/atm/usbatm.c
---- linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/atm/usbatm.c linux-2.6.32.12/drivers/usb/atm/usbatm.c
+--- linux-2.6.32.12/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -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",
@@ -27445,10 +27827,10 @@ diff -urNp linux-2.6.32.11/drivers/usb/atm/usbatm.c linux-2.6.32.11/drivers/usb/
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.32.11/drivers/usb/class/cdc-acm.c linux-2.6.32.11/drivers/usb/class/cdc-acm.c
---- linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-04-04 20:46:41.625742858 -0400
-@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] =
+diff -urNp linux-2.6.32.12/drivers/usb/class/cdc-acm.c linux-2.6.32.12/drivers/usb/class/cdc-acm.c
+--- linux-2.6.32.12/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400
++++ linux-2.6.32.12/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:58.429105010 -0400
+@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] =
USB_CDC_ACM_PROTO_AT_CDMA) },
/* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */
@@ -27457,9 +27839,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/class/cdc-acm.c linux-2.6.32.11/drivers/u
};
MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.32.11/drivers/usb/class/usblp.c linux-2.6.32.11/drivers/usb/class/usblp.c
---- linux-2.6.32.11/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/class/usblp.c linux-2.6.32.12/drivers/usb/class/usblp.c
+--- linux-2.6.32.12/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400
@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -27478,9 +27860,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/class/usblp.c linux-2.6.32.11/drivers/usb
};
MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.c linux-2.6.32.11/drivers/usb/core/hcd.c
---- linux-2.6.32.11/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.c linux-2.6.32.12/drivers/usb/core/hcd.c
+--- linux-2.6.32.12/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -27499,9 +27881,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.c linux-2.6.32.11/drivers/usb/co
{
if (mon_ops)
-diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/core/hcd.h
---- linux-2.6.32.11/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.h linux-2.6.32.12/drivers/usb/core/hcd.h
+--- linux-2.6.32.12/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -27529,9 +27911,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/co
void usb_mon_deregister(void);
#else
-diff -urNp linux-2.6.32.11/drivers/usb/core/hub.c linux-2.6.32.11/drivers/usb/core/hub.c
---- linux-2.6.32.11/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/core/hub.c linux-2.6.32.12/drivers/usb/core/hub.c
+--- linux-2.6.32.12/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400
@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -27541,9 +27923,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hub.c linux-2.6.32.11/drivers/usb/co
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.32.11/drivers/usb/core/message.c linux-2.6.32.11/drivers/usb/core/message.c
---- linux-2.6.32.11/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/core/message.c linux-2.6.32.12/drivers/usb/core/message.c
+--- linux-2.6.32.12/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -27555,9 +27937,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/message.c linux-2.6.32.11/drivers/us
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.32.11/drivers/usb/host/ehci-pci.c linux-2.6.32.11/drivers/usb/host/ehci-pci.c
---- linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/host/ehci-pci.c linux-2.6.32.12/drivers/usb/host/ehci-pci.c
+--- linux-2.6.32.12/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400
@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
.driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -27567,9 +27949,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/host/ehci-pci.c linux-2.6.32.11/drivers/u
};
MODULE_DEVICE_TABLE(pci, pci_ids);
-diff -urNp linux-2.6.32.11/drivers/usb/host/uhci-hcd.c linux-2.6.32.11/drivers/usb/host/uhci-hcd.c
---- linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/host/uhci-hcd.c linux-2.6.32.12/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400
@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -27579,9 +27961,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/host/uhci-hcd.c linux-2.6.32.11/drivers/u
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/misc/appledisplay.c linux-2.6.32.12/drivers/usb/misc/appledisplay.c
+--- linux-2.6.32.12/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
return pdata->msgdata[1];
}
@@ -27591,9 +27973,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drive
.get_brightness = appledisplay_bl_get_brightness,
.update_status = appledisplay_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/usb/mon/mon_main.c linux-2.6.32.11/drivers/usb/mon/mon_main.c
---- linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/mon/mon_main.c linux-2.6.32.12/drivers/usb/mon/mon_main.c
+--- linux-2.6.32.12/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -27603,9 +27985,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/mon/mon_main.c linux-2.6.32.11/drivers/us
.urb_submit = mon_submit,
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
-diff -urNp linux-2.6.32.11/drivers/usb/storage/debug.h linux-2.6.32.11/drivers/usb/storage/debug.h
---- linux-2.6.32.11/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/storage/debug.h linux-2.6.32.12/drivers/usb/storage/debug.h
+--- linux-2.6.32.12/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -27619,9 +28001,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/storage/debug.h linux-2.6.32.11/drivers/u
#endif
#endif
-diff -urNp linux-2.6.32.11/drivers/usb/storage/usb.c linux-2.6.32.11/drivers/usb/storage/usb.c
---- linux-2.6.32.11/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/storage/usb.c linux-2.6.32.12/drivers/usb/storage/usb.c
+--- linux-2.6.32.12/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400
@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -27631,9 +28013,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/storage/usb.c linux-2.6.32.11/drivers/usb
};
#undef UNUSUAL_DEV
-diff -urNp linux-2.6.32.11/drivers/usb/storage/usual-tables.c linux-2.6.32.11/drivers/usb/storage/usual-tables.c
---- linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/usb/storage/usual-tables.c linux-2.6.32.12/drivers/usb/storage/usual-tables.c
+--- linux-2.6.32.12/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -27643,9 +28025,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/storage/usual-tables.c linux-2.6.32.11/dr
};
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
-diff -urNp linux-2.6.32.11/drivers/uwb/wlp/messages.c linux-2.6.32.11/drivers/uwb/wlp/messages.c
---- linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/uwb/wlp/messages.c linux-2.6.32.12/drivers/uwb/wlp/messages.c
+--- linux-2.6.32.12/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -27655,9 +28037,9 @@ diff -urNp linux-2.6.32.11/drivers/uwb/wlp/messages.c linux-2.6.32.11/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.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/uwb/wlp/sysfs.c linux-2.6.32.12/drivers/uwb/wlp/sysfs.c
+--- linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
return ret;
}
@@ -27668,9 +28050,9 @@ diff -urNp linux-2.6.32.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/w
.show = wlp_wss_attr_show,
.store = wlp_wss_attr_store,
};
-diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/video/atmel_lcdfb.c linux-2.6.32.12/drivers/video/atmel_lcdfb.c
+--- linux-2.6.32.12/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -27680,9 +28062,9 @@ diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/v
.update_status = atmel_bl_update_status,
.get_brightness = atmel_bl_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/video/aty/aty128fb.c
---- linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/video/aty/aty128fb.c linux-2.6.32.12/drivers/video/aty/aty128fb.c
+--- linux-2.6.32.12/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -27692,9 +28074,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/
.get_brightness = aty128_bl_get_brightness,
.update_status = aty128_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/video/aty/atyfb_base.c linux-2.6.32.12/drivers/video/aty/atyfb_base.c
+--- linux-2.6.32.12/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -27704,9 +28086,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/driver
.get_brightness = aty_bl_get_brightness,
.update_status = aty_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/video/aty/radeon_backlight.c linux-2.6.32.12/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -27716,9 +28098,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/
.get_brightness = radeon_bl_get_brightness,
.update_status = radeon_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
return error ? data->current_brightness : reg_val;
}
@@ -27728,9 +28110,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/
.update_status = adp5520_bl_update_status,
.get_brightness = adp5520_bl_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/adx_bl.c linux-2.6.32.12/drivers/video/backlight/adx_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
return 1;
}
@@ -27740,9 +28122,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/driv
.options = 0,
.update_status = adx_backlight_update_status,
.get_brightness = adx_backlight_get_brightness,
-diff -urNp linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c
+--- linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
return pwm_channel_enable(&pwmbl->pwmc);
}
@@ -27752,9 +28134,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1
.get_brightness = atmel_pwm_bl_get_intensity,
.update_status = atmel_pwm_bl_set_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/drivers/video/backlight/backlight.c
---- linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/backlight.c linux-2.6.32.12/drivers/video/backlight/backlight.c
+--- linux-2.6.32.12/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
* ERR_PTR() or a pointer to the newly allocated device.
*/
@@ -27764,9 +28146,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/d
{
struct backlight_device *new_bd;
int rc;
-diff -urNp linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c
+--- linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
}
EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -27776,9 +28158,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c linux-2.6.32.11/d
.get_brightness = corgi_bl_get_intensity,
.update_status = corgi_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c
+--- linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
return intensity;
}
@@ -27788,9 +28170,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/dr
.get_brightness = cr_backlight_get_intensity,
.update_status = cr_backlight_set_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/da903x_bl.c linux-2.6.32.12/drivers/video/backlight/da903x_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
return data->current_brightness;
}
@@ -27800,9 +28182,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/d
.update_status = da903x_backlight_update_status,
.get_brightness = da903x_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/generic_bl.c linux-2.6.32.11/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/generic_bl.c linux-2.6.32.12/drivers/video/backlight/generic_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
}
EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -27812,9 +28194,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/generic_bl.c linux-2.6.32.11/
.options = BL_CORE_SUSPENDRESUME,
.get_brightness = genericbl_get_intensity,
.update_status = genericbl_send_intensity,
-diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/hp680_bl.c linux-2.6.32.12/drivers/video/backlight/hp680_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
return current_intensity;
}
@@ -27824,9 +28206,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/dr
.get_brightness = hp680bl_get_intensity,
.update_status = hp680bl_set_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -93,7 +93,7 @@ out:
return ret;
}
@@ -27836,9 +28218,9 @@ diff -urNp linux-2.6.32.11/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.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
return kb3886bl_intensity;
}
@@ -27848,9 +28230,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/d
.get_brightness = kb3886bl_get_intensity,
.update_status = kb3886bl_send_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/locomolcd.c linux-2.6.32.12/drivers/video/backlight/locomolcd.c
+--- linux-2.6.32.12/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
return current_intensity;
}
@@ -27860,9 +28242,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/d
.get_brightness = locomolcd_get_intensity,
.update_status = locomolcd_set_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400
++++ linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:58.433026851 -0400
@@ -33,7 +33,7 @@ struct dmi_match_data {
unsigned long iostart;
unsigned long iolen;
@@ -27872,9 +28254,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
};
/* Module parameters. */
-diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/omap1_bl.c linux-2.6.32.12/drivers/video/backlight/omap1_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
return bl->current_intensity;
}
@@ -27884,9 +28266,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/dr
.get_brightness = omapbl_get_intensity,
.update_status = omapbl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/progear_bl.c linux-2.6.32.12/drivers/video/backlight/progear_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
return intensity - HW_LEVEL_MIN;
}
@@ -27896,9 +28278,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/
.get_brightness = progearbl_get_intensity,
.update_status = progearbl_set_intensity,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/pwm_bl.c linux-2.6.32.12/drivers/video/backlight/pwm_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
return bl->props.brightness;
}
@@ -27908,9 +28290,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/driv
.update_status = pwm_backlight_update_status,
.get_brightness = pwm_backlight_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/tosa_bl.c linux-2.6.32.12/drivers/video/backlight/tosa_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
return props->brightness;
}
@@ -27920,9 +28302,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/dri
.get_brightness = tosa_bl_get_brightness,
.update_status = tosa_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c
+--- linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
return data->current_brightness;
}
@@ -27932,9 +28314,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/d
.options = BL_CORE_SUSPENDRESUME,
.update_status = wm831x_backlight_update_status,
.get_brightness = wm831x_backlight_get_brightness,
-diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/bf54x-lq043fb.c linux-2.6.32.12/drivers/video/bf54x-lq043fb.c
+--- linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -27944,9 +28326,9 @@ diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers
.get_brightness = bl_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c
+--- linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -27956,9 +28338,22 @@ diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/driv
.get_brightness = bl_get_brightness,
};
-diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/fbmem.c
---- linux-2.6.32.11/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/fbcmap.c linux-2.6.32.12/drivers/video/fbcmap.c
+--- linux-2.6.32.12/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/fbcmap.c 2010-04-29 17:46:37.213234717 -0400
+@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
+ rc = -ENODEV;
+ goto out;
+ }
+- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
+- !info->fbops->fb_setcmap)) {
++ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
+ rc = -EINVAL;
+ goto out1;
+ }
+diff -urNp linux-2.6.32.12/drivers/video/fbmem.c linux-2.6.32.12/drivers/video/fbmem.c
+--- linux-2.6.32.12/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -27986,9 +28381,9 @@ diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/f
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.32.11/drivers/video/fbmon.c linux-2.6.32.11/drivers/video/fbmon.c
---- linux-2.6.32.11/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/fbmon.c linux-2.6.32.12/drivers/video/fbmon.c
+--- linux-2.6.32.12/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400
@@ -45,7 +45,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -27998,9 +28393,9 @@ diff -urNp linux-2.6.32.11/drivers/video/fbmon.c linux-2.6.32.11/drivers/video/f
#endif
#define FBMON_FIX_HEADER 1
-diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drivers/video/i810/i810_accel.c
---- linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/i810/i810_accel.c linux-2.6.32.12/drivers/video/i810/i810_accel.c
+--- linux-2.6.32.12/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -28009,9 +28404,9 @@ diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drive
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.32.11/drivers/video/i810/i810_main.c linux-2.6.32.11/drivers/video/i810/i810_main.c
---- linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400
+diff -urNp linux-2.6.32.12/drivers/video/i810/i810_main.c linux-2.6.32.12/drivers/video/i810/i810_main.c
+--- linux-2.6.32.12/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400
@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28021,9 +28416,9 @@ diff -urNp linux-2.6.32.11/drivers/video/i810/i810_main.c linux-2.6.32.11/driver
};
static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.32.11/drivers/video/modedb.c linux-2.6.32.11/drivers/video/modedb.c
---- linux-2.6.32.11/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/drivers/video/modedb.c linux-2.6.32.12/drivers/video/modedb.c
+--- linux-2.6.32.12/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400
@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -28324,9 +28719,9 @@ diff -urNp linux-2.6.32.11/drivers/video/modedb.c linux-2.6.32.11/drivers/video/
},
};
-diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28336,9 +28731,9 @@ diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/d
.get_brightness = nvidia_bl_get_brightness,
.update_status = nvidia_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/video/riva/fbdev.c
---- linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/drivers/video/riva/fbdev.c linux-2.6.32.12/drivers/video/riva/fbdev.c
+--- linux-2.6.32.12/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -28348,9 +28743,9 @@ diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/vi
.get_brightness = riva_bl_get_brightness,
.update_status = riva_bl_update_status,
};
-diff -urNp linux-2.6.32.11/drivers/video/uvesafb.c linux-2.6.32.11/drivers/video/uvesafb.c
---- linux-2.6.32.11/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/drivers/video/uvesafb.c linux-2.6.32.12/drivers/video/uvesafb.c
+--- linux-2.6.32.12/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400
@@ -18,6 +18,7 @@
#include <linux/fb.h>
#include <linux/io.h>
@@ -28426,9 +28821,9 @@ diff -urNp linux-2.6.32.11/drivers/video/uvesafb.c linux-2.6.32.11/drivers/video
}
framebuffer_release(info);
-diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/vesafb.c
---- linux-2.6.32.11/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/drivers/video/vesafb.c linux-2.6.32.12/drivers/video/vesafb.c
+--- linux-2.6.32.12/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400
@@ -9,6 +9,7 @@
*/
@@ -28532,9 +28927,9 @@ diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/drivers/xen/sys-hypervisor.c linux-2.6.32.12/drivers/xen/sys-hypervisor.c
+--- linux-2.6.32.12/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -28544,9 +28939,9 @@ diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/
.show = hyp_sysfs_show,
.store = hyp_sysfs_store,
};
-diff -urNp linux-2.6.32.11/fs/9p/vfs_inode.c linux-2.6.32.11/fs/9p/vfs_inode.c
---- linux-2.6.32.11/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/9p/vfs_inode.c linux-2.6.32.12/fs/9p/vfs_inode.c
+--- linux-2.6.32.12/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -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)
@@ -28556,9 +28951,9 @@ diff -urNp linux-2.6.32.11/fs/9p/vfs_inode.c linux-2.6.32.11/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.11/fs/aio.c linux-2.6.32.11/fs/aio.c
---- linux-2.6.32.11/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/aio.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/aio.c linux-2.6.32.12/fs/aio.c
+--- linux-2.6.32.12/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/aio.c 2010-04-04 20:46:41.637780128 -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;
@@ -28568,9 +28963,9 @@ diff -urNp linux-2.6.32.11/fs/aio.c linux-2.6.32.11/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.11/fs/attr.c linux-2.6.32.11/fs/attr.c
---- linux-2.6.32.11/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/attr.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/attr.c linux-2.6.32.12/fs/attr.c
+--- linux-2.6.32.12/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/attr.c 2010-04-04 20:46:41.637780128 -0400
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -28579,9 +28974,9 @@ diff -urNp linux-2.6.32.11/fs/attr.c linux-2.6.32.11/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.11/fs/autofs/root.c linux-2.6.32.11/fs/autofs/root.c
---- linux-2.6.32.11/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/autofs/root.c linux-2.6.32.12/fs/autofs/root.c
+--- linux-2.6.32.12/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -28592,9 +28987,9 @@ diff -urNp linux-2.6.32.11/fs/autofs/root.c linux-2.6.32.11/fs/autofs/root.c
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symlink.c
---- linux-2.6.32.11/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/autofs4/symlink.c linux-2.6.32.12/fs/autofs4/symlink.c
+--- linux-2.6.32.12/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -28604,9 +28999,9 @@ diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symli
return NULL;
}
-diff -urNp linux-2.6.32.11/fs/befs/linuxvfs.c linux-2.6.32.11/fs/befs/linuxvfs.c
---- linux-2.6.32.11/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/befs/linuxvfs.c linux-2.6.32.12/fs/befs/linuxvfs.c
+--- linux-2.6.32.12/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -28616,9 +29011,9 @@ diff -urNp linux-2.6.32.11/fs/befs/linuxvfs.c linux-2.6.32.11/fs/befs/linuxvfs.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.32.11/fs/binfmt_aout.c linux-2.6.32.11/fs/binfmt_aout.c
---- linux-2.6.32.11/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400
+diff -urNp linux-2.6.32.12/fs/binfmt_aout.c linux-2.6.32.12/fs/binfmt_aout.c
+--- linux-2.6.32.12/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -28686,9 +29081,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_aout.c linux-2.6.32.11/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.11/fs/binfmt_elf.c linux-2.6.32.11/fs/binfmt_elf.c
---- linux-2.6.32.11/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400
+diff -urNp linux-2.6.32.12/fs/binfmt_elf.c linux-2.6.32.12/fs/binfmt_elf.c
+--- linux-2.6.32.12/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
#define elf_core_dump NULL
#endif
@@ -29324,9 +29719,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_elf.c linux-2.6.32.11/fs/binfmt_elf.c
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.32.11/fs/binfmt_flat.c linux-2.6.32.11/fs/binfmt_flat.c
---- linux-2.6.32.11/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/binfmt_flat.c linux-2.6.32.12/fs/binfmt_flat.c
+--- linux-2.6.32.12/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -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",
@@ -29359,9 +29754,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_flat.c linux-2.6.32.11/fs/binfmt_flat.c
ret = result;
goto err;
}
-diff -urNp linux-2.6.32.11/fs/binfmt_misc.c linux-2.6.32.11/fs/binfmt_misc.c
---- linux-2.6.32.11/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/binfmt_misc.c linux-2.6.32.12/fs/binfmt_misc.c
+--- linux-2.6.32.12/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400
@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -29371,9 +29766,9 @@ diff -urNp linux-2.6.32.11/fs/binfmt_misc.c linux-2.6.32.11/fs/binfmt_misc.c
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c
---- linux-2.6.32.11/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/bio.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/bio.c linux-2.6.32.12/fs/bio.c
+--- linux-2.6.32.12/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/bio.c 2010-04-04 20:46:41.641560293 -0400
@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
i = 0;
@@ -29392,9 +29787,21 @@ diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.32.11/fs/btrfs/ctree.c linux-2.6.32.11/fs/btrfs/ctree.c
---- linux-2.6.32.11/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/block_dev.c linux-2.6.32.12/fs/block_dev.c
+--- linux-2.6.32.12/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400
++++ linux-2.6.32.12/fs/block_dev.c 2010-04-29 17:49:58.449523678 -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 */
+
+- else if (bdev->bd_contains->bd_holder == bd_claim)
++ else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
+ 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.12/fs/btrfs/ctree.c linux-2.6.32.12/fs/btrfs/ctree.c
+--- linux-2.6.32.12/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400
@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
ret = 0;
@@ -29403,9 +29810,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/ctree.c linux-2.6.32.11/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.11/fs/btrfs/disk-io.c linux-2.6.32.11/fs/btrfs/disk-io.c
---- linux-2.6.32.11/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/btrfs/disk-io.c linux-2.6.32.12/fs/btrfs/disk-io.c
+--- linux-2.6.32.12/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400
@@ -39,7 +39,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -29424,9 +29831,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/disk-io.c linux-2.6.32.11/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.11/fs/btrfs/extent_io.h linux-2.6.32.11/fs/btrfs/extent_io.h
---- linux-2.6.32.11/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/btrfs/extent_io.h linux-2.6.32.12/fs/btrfs/extent_io.h
+--- linux-2.6.32.12/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags);
@@ -29487,9 +29894,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/extent_io.h linux-2.6.32.11/fs/btrfs/extent_
};
struct extent_state {
-diff -urNp linux-2.6.32.11/fs/btrfs/free-space-cache.c linux-2.6.32.11/fs/btrfs/free-space-cache.c
---- linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/btrfs/free-space-cache.c linux-2.6.32.12/fs/btrfs/free-space-cache.c
+--- linux-2.6.32.12/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400
@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -29508,9 +29915,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/free-space-cache.c linux-2.6.32.11/fs/btrfs/
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.32.11/fs/btrfs/inode.c linux-2.6.32.11/fs/btrfs/inode.c
---- linux-2.6.32.11/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/btrfs/inode.c linux-2.6.32.12/fs/btrfs/inode.c
+--- linux-2.6.32.12/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -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;
@@ -29529,9 +29936,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/inode.c linux-2.6.32.11/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.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c
---- linux-2.6.32.11/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/btrfs/sysfs.c linux-2.6.32.12/fs/btrfs/sysfs.c
+--- linux-2.6.32.12/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
complete(&root->kobj_unregister);
}
@@ -29547,9 +29954,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c
.show = btrfs_root_attr_show,
.store = btrfs_root_attr_store,
};
-diff -urNp linux-2.6.32.11/fs/buffer.c linux-2.6.32.11/fs/buffer.c
---- linux-2.6.32.11/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/buffer.c linux-2.6.32.12/fs/buffer.c
+--- linux-2.6.32.12/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -29558,9 +29965,58 @@ diff -urNp linux-2.6.32.11/fs/buffer.c linux-2.6.32.11/fs/buffer.c
#include <linux/blkdev.h>
#include <linux/file.h>
#include <linux/quotaops.h>
-diff -urNp linux-2.6.32.11/fs/cachefiles/rdwr.c linux-2.6.32.11/fs/cachefiles/rdwr.c
---- linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400
+diff -urNp linux-2.6.32.12/fs/cachefiles/bind.c linux-2.6.32.12/fs/cachefiles/bind.c
+--- linux-2.6.32.12/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/cachefiles/bind.c 2010-04-29 17:46:37.245246835 -0400
+@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
+ args);
+
+ /* start by checking things over */
+- ASSERT(cache->fstop_percent >= 0 &&
+- cache->fstop_percent < cache->fcull_percent &&
++ ASSERT(cache->fstop_percent < cache->fcull_percent &&
+ cache->fcull_percent < cache->frun_percent &&
+ cache->frun_percent < 100);
+
+- ASSERT(cache->bstop_percent >= 0 &&
+- cache->bstop_percent < cache->bcull_percent &&
++ ASSERT(cache->bstop_percent < cache->bcull_percent &&
+ cache->bcull_percent < cache->brun_percent &&
+ cache->brun_percent < 100);
+
+diff -urNp linux-2.6.32.12/fs/cachefiles/daemon.c linux-2.6.32.12/fs/cachefiles/daemon.c
+--- linux-2.6.32.12/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/cachefiles/daemon.c 2010-04-29 17:46:37.253252101 -0400
+@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
+ if (test_bit(CACHEFILES_DEAD, &cache->flags))
+ return -EIO;
+
+- if (datalen < 0 || datalen > PAGE_SIZE - 1)
++ if (datalen > PAGE_SIZE - 1)
+ return -EOPNOTSUPP;
+
+ /* drag the command string into the kernel so we can parse it */
+@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc
+ if (args[0] != '%' || args[1] != '\0')
+ return -EINVAL;
+
+- if (fstop < 0 || fstop >= cache->fcull_percent)
++ if (fstop >= cache->fcull_percent)
+ return cachefiles_daemon_range_error(cache, args);
+
+ cache->fstop_percent = fstop;
+@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc
+ if (args[0] != '%' || args[1] != '\0')
+ return -EINVAL;
+
+- if (bstop < 0 || bstop >= cache->bcull_percent)
++ if (bstop >= cache->bcull_percent)
+ return cachefiles_daemon_range_error(cache, args);
+
+ cache->bstop_percent = bstop;
+diff -urNp linux-2.6.32.12/fs/cachefiles/rdwr.c linux-2.6.32.12/fs/cachefiles/rdwr.c
+--- linux-2.6.32.12/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400
@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -29570,9 +30026,9 @@ diff -urNp linux-2.6.32.11/fs/cachefiles/rdwr.c linux-2.6.32.11/fs/cachefiles/rd
set_fs(old_fs);
kunmap(page);
if (ret != len)
-diff -urNp linux-2.6.32.11/fs/cifs/cifs_uniupr.h linux-2.6.32.11/fs/cifs/cifs_uniupr.h
---- linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/cifs/cifs_uniupr.h linux-2.6.32.12/fs/cifs/cifs_uniupr.h
+--- linux-2.6.32.12/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -29582,9 +30038,9 @@ diff -urNp linux-2.6.32.11/fs/cifs/cifs_uniupr.h linux-2.6.32.11/fs/cifs/cifs_un
};
#endif
-diff -urNp linux-2.6.32.11/fs/cifs/link.c linux-2.6.32.11/fs/cifs/link.c
---- linux-2.6.32.11/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/cifs/link.c linux-2.6.32.12/fs/cifs/link.c
+--- linux-2.6.32.12/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -29594,9 +30050,9 @@ diff -urNp linux-2.6.32.11/fs/cifs/link.c linux-2.6.32.11/fs/cifs/link.c
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.32.11/fs/compat_binfmt_elf.c linux-2.6.32.11/fs/compat_binfmt_elf.c
---- linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/compat_binfmt_elf.c linux-2.6.32.12/fs/compat_binfmt_elf.c
+--- linux-2.6.32.12/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400
@@ -29,10 +29,12 @@
#undef elfhdr
#undef elf_phdr
@@ -29610,9 +30066,9 @@ diff -urNp linux-2.6.32.11/fs/compat_binfmt_elf.c linux-2.6.32.11/fs/compat_binf
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c
---- linux-2.6.32.11/fs/compat.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/compat.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/compat.c linux-2.6.32.12/fs/compat.c
+--- linux-2.6.32.12/fs/compat.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/compat.c 2010-04-04 20:46:41.645781188 -0400
@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
struct page *page;
@@ -29712,9 +30168,9 @@ diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c
out:
if (bprm->mm)
mmput(bprm->mm);
-diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c
---- linux-2.6.32.11/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/compat_ioctl.c linux-2.6.32.12/fs/compat_ioctl.c
+--- linux-2.6.32.12/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400
@@ -1827,15 +1827,15 @@ struct ioctl_trans {
};
@@ -29734,9 +30190,9 @@ diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c
/* ioctl should not be warned about even if it's not implemented.
Valid reasons to use this:
-diff -urNp linux-2.6.32.11/fs/debugfs/inode.c linux-2.6.32.11/fs/debugfs/inode.c
---- linux-2.6.32.11/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/debugfs/inode.c linux-2.6.32.12/fs/debugfs/inode.c
+--- linux-2.6.32.12/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400
@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -29746,9 +30202,9 @@ diff -urNp linux-2.6.32.11/fs/debugfs/inode.c linux-2.6.32.11/fs/debugfs/inode.c
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
-diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c
---- linux-2.6.32.11/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/dlm/lockspace.c linux-2.6.32.12/fs/dlm/lockspace.c
+--- linux-2.6.32.12/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
kfree(ls);
}
@@ -29758,10 +30214,10 @@ diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c
.show = dlm_attr_show,
.store = dlm_attr_store,
};
-diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode.c
---- linux-2.6.32.11/fs/ecryptfs/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ecryptfs/inode.c 2010-04-04 20:46:41.645781188 -0400
-@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry,
+diff -urNp linux-2.6.32.12/fs/ecryptfs/inode.c linux-2.6.32.12/fs/ecryptfs/inode.c
+--- linux-2.6.32.12/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400
++++ linux-2.6.32.12/fs/ecryptfs/inode.c 2010-04-29 17:49:58.465067636 -0400
+@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -29769,8 +30225,8 @@ diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode
+ (__force char __user *)lower_buf,
lower_bufsiz);
set_fs(old_fs);
- if (rc >= 0) {
-@@ -720,7 +720,7 @@ static void *ecryptfs_follow_link(struct
+ if (rc < 0)
+@@ -701,7 +701,7 @@ static void *ecryptfs_follow_link(struct
}
old_fs = get_fs();
set_fs(get_ds());
@@ -29779,9 +30235,9 @@ diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode
set_fs(old_fs);
if (rc < 0)
goto out_free;
-diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c
---- linux-2.6.32.11/fs/exec.c 2010-04-04 20:41:50.037938751 -0400
-+++ linux-2.6.32.11/fs/exec.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/exec.c linux-2.6.32.12/fs/exec.c
+--- linux-2.6.32.12/fs/exec.c 2010-04-04 20:41:50.037938751 -0400
++++ linux-2.6.32.12/fs/exec.c 2010-04-04 20:46:41.645781188 -0400
@@ -56,12 +56,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
@@ -30260,9 +30716,9 @@ diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c
/*
* lock_kernel() because format_corename() is controlled by sysctl, which
* uses lock_kernel()
-diff -urNp linux-2.6.32.11/fs/ext2/balloc.c linux-2.6.32.11/fs/ext2/balloc.c
---- linux-2.6.32.11/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/ext2/balloc.c linux-2.6.32.12/fs/ext2/balloc.c
+--- linux-2.6.32.12/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -30272,9 +30728,23 @@ diff -urNp linux-2.6.32.11/fs/ext2/balloc.c linux-2.6.32.11/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.11/fs/ext3/balloc.c linux-2.6.32.11/fs/ext3/balloc.c
---- linux-2.6.32.11/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400
+diff -urNp linux-2.6.32.12/fs/ext2/xattr.c linux-2.6.32.12/fs/ext2/xattr.c
+--- linux-2.6.32.12/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext2/xattr.c 2010-04-29 17:46:37.253252101 -0400
+@@ -85,8 +85,8 @@
+ printk("\n"); \
+ } while (0)
+ #else
+-# define ea_idebug(f...)
+-# define ea_bdebug(f...)
++# define ea_idebug(inode, f...) do {} while (0)
++# define ea_bdebug(bh, f...) do {} while (0)
+ #endif
+
+ static int ext2_xattr_set2(struct inode *, struct buffer_head *,
+diff -urNp linux-2.6.32.12/fs/ext3/balloc.c linux-2.6.32.12/fs/ext3/balloc.c
+--- linux-2.6.32.12/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -30284,9 +30754,9 @@ diff -urNp linux-2.6.32.11/fs/ext3/balloc.c linux-2.6.32.11/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.11/fs/ext3/namei.c linux-2.6.32.11/fs/ext3/namei.c
---- linux-2.6.32.11/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext3/namei.c linux-2.6.32.12/fs/ext3/namei.c
+--- linux-2.6.32.12/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -30296,9 +30766,9 @@ diff -urNp linux-2.6.32.11/fs/ext3/namei.c linux-2.6.32.11/fs/ext3/namei.c
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.32.11/fs/ext3/xattr.c linux-2.6.32.11/fs/ext3/xattr.c
---- linux-2.6.32.11/fs/ext3/xattr.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext3/xattr.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext3/xattr.c linux-2.6.32.12/fs/ext3/xattr.c
+--- linux-2.6.32.12/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400
++++ linux-2.6.32.12/fs/ext3/xattr.c 2010-04-29 17:49:58.485032679 -0400
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -30310,9 +30780,9 @@ diff -urNp linux-2.6.32.11/fs/ext3/xattr.c linux-2.6.32.11/fs/ext3/xattr.c
#endif
static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.32.11/fs/ext4/balloc.c linux-2.6.32.11/fs/ext4/balloc.c
---- linux-2.6.32.11/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext4/balloc.c linux-2.6.32.12/fs/ext4/balloc.c
+--- linux-2.6.32.12/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400
@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -30322,9 +30792,9 @@ diff -urNp linux-2.6.32.11/fs/ext4/balloc.c linux-2.6.32.11/fs/ext4/balloc.c
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.32.11/fs/ext4/ioctl.c linux-2.6.32.11/fs/ext4/ioctl.c
---- linux-2.6.32.11/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext4/ioctl.c linux-2.6.32.12/fs/ext4/ioctl.c
+--- linux-2.6.32.12/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400
@@ -221,6 +221,9 @@ setversion_out:
struct file *donor_filp;
int err;
@@ -30335,9 +30805,9 @@ diff -urNp linux-2.6.32.11/fs/ext4/ioctl.c linux-2.6.32.11/fs/ext4/ioctl.c
if (!(filp->f_mode & FMODE_READ) ||
!(filp->f_mode & FMODE_WRITE))
return -EBADF;
-diff -urNp linux-2.6.32.11/fs/ext4/namei.c linux-2.6.32.11/fs/ext4/namei.c
---- linux-2.6.32.11/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext4/namei.c linux-2.6.32.12/fs/ext4/namei.c
+--- linux-2.6.32.12/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400
@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -30347,9 +30817,9 @@ diff -urNp linux-2.6.32.11/fs/ext4/namei.c linux-2.6.32.11/fs/ext4/namei.c
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c
---- linux-2.6.32.11/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext4/super.c linux-2.6.32.12/fs/ext4/super.c
+--- linux-2.6.32.12/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400
@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
}
@@ -30359,9 +30829,23 @@ diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c
.show = ext4_attr_show,
.store = ext4_attr_store,
};
-diff -urNp linux-2.6.32.11/fs/fcntl.c linux-2.6.32.11/fs/fcntl.c
---- linux-2.6.32.11/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/ext4/xattr.c linux-2.6.32.12/fs/ext4/xattr.c
+--- linux-2.6.32.12/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ext4/xattr.c 2010-04-29 17:46:37.279760502 -0400
+@@ -82,8 +82,8 @@
+ printk("\n"); \
+ } while (0)
+ #else
+-# define ea_idebug(f...)
+-# define ea_bdebug(f...)
++# define ea_idebug(inode, f...) do {} while (0)
++# define ea_bdebug(bh, f...) do {} while (0)
+ #endif
+
+ static void ext4_xattr_cache_insert(struct buffer_head *);
+diff -urNp linux-2.6.32.12/fs/fcntl.c linux-2.6.32.12/fs/fcntl.c
+--- linux-2.6.32.12/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400
@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
switch (cmd) {
case F_DUPFD:
@@ -30380,9 +30864,9 @@ diff -urNp linux-2.6.32.11/fs/fcntl.c linux-2.6.32.11/fs/fcntl.c
rcu_read_unlock();
return ret;
}
-diff -urNp linux-2.6.32.11/fs/fifo.c linux-2.6.32.11/fs/fifo.c
---- linux-2.6.32.11/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fifo.c linux-2.6.32.12/fs/fifo.c
+--- linux-2.6.32.12/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400
@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -30453,9 +30937,9 @@ diff -urNp linux-2.6.32.11/fs/fifo.c linux-2.6.32.11/fs/fifo.c
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-2.6.32.11/fs/file.c linux-2.6.32.11/fs/file.c
---- linux-2.6.32.11/fs/file.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/file.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/file.c linux-2.6.32.12/fs/file.c
+--- linux-2.6.32.12/fs/file.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/file.c 2010-04-04 20:46:41.649500937 -0400
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -30473,9 +30957,9 @@ diff -urNp linux-2.6.32.11/fs/file.c linux-2.6.32.11/fs/file.c
if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
return -EMFILE;
-diff -urNp linux-2.6.32.11/fs/fs_struct.c linux-2.6.32.11/fs/fs_struct.c
---- linux-2.6.32.11/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fs_struct.c linux-2.6.32.12/fs/fs_struct.c
+--- linux-2.6.32.12/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400
@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
struct task_struct *g, *p;
struct fs_struct *fs;
@@ -30580,9 +31064,9 @@ diff -urNp linux-2.6.32.11/fs/fs_struct.c linux-2.6.32.11/fs/fs_struct.c
task_unlock(current);
if (kill)
-diff -urNp linux-2.6.32.11/fs/fuse/control.c linux-2.6.32.11/fs/fuse/control.c
---- linux-2.6.32.11/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fuse/control.c linux-2.6.32.12/fs/fuse/control.c
+--- linux-2.6.32.12/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400
@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -30592,9 +31076,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/control.c linux-2.6.32.11/fs/fuse/control.c
struct fuse_conn *fc;
int err;
-diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/fs/fuse/cuse.c
---- linux-2.6.32.11/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fuse/cuse.c linux-2.6.32.12/fs/fuse/cuse.c
+--- linux-2.6.32.12/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400
@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
return rc;
}
@@ -30629,9 +31113,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/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.11/fs/fuse/dev.c linux-2.6.32.11/fs/fuse/dev.c
---- linux-2.6.32.11/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fuse/dev.c linux-2.6.32.12/fs/fuse/dev.c
+--- linux-2.6.32.12/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400
@@ -745,7 +745,7 @@ __releases(&fc->lock)
* request_end(). Otherwise add it to the processing list, and set
* the 'sent' flag.
@@ -30737,9 +31221,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/dev.c linux-2.6.32.11/fs/fuse/dev.c
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
-diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c
---- linux-2.6.32.11/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fuse/dir.c linux-2.6.32.12/fs/fuse/dir.c
+--- linux-2.6.32.12/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -30749,9 +31233,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.32.11/fs/fuse/fuse_i.h linux-2.6.32.11/fs/fuse/fuse_i.h
---- linux-2.6.32.11/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/fuse/fuse_i.h linux-2.6.32.12/fs/fuse/fuse_i.h
+--- linux-2.6.32.12/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400
@@ -521,6 +521,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
@@ -30769,9 +31253,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/fuse_i.h linux-2.6.32.11/fs/fuse/fuse_i.h
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c
---- linux-2.6.32.11/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400
+diff -urNp linux-2.6.32.12/fs/gfs2/sys.c linux-2.6.32.12/fs/gfs2/sys.c
+--- linux-2.6.32.12/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
return a->store ? a->store(sdp, buf, len) : len;
}
@@ -30790,9 +31274,9 @@ diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c
.uevent = gfs2_uevent,
};
-diff -urNp linux-2.6.32.11/fs/hfs/inode.c linux-2.6.32.11/fs/hfs/inode.c
---- linux-2.6.32.11/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/hfs/inode.c linux-2.6.32.12/fs/hfs/inode.c
+--- linux-2.6.32.12/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -30811,9 +31295,9 @@ diff -urNp linux-2.6.32.11/fs/hfs/inode.c linux-2.6.32.11/fs/hfs/inode.c
hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
sizeof(struct hfs_cat_file));
if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c
---- linux-2.6.32.11/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/hfsplus/inode.c linux-2.6.32.12/fs/hfsplus/inode.c
+--- linux-2.6.32.12/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -30850,9 +31334,9 @@ diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
sizeof(struct hfsplus_cat_file));
hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.32.11/fs/hugetlbfs/inode.c linux-2.6.32.11/fs/hugetlbfs/inode.c
---- linux-2.6.32.11/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/hugetlbfs/inode.c 2010-04-06 22:13:08.677504702 -0400
+diff -urNp linux-2.6.32.12/fs/hugetlbfs/inode.c linux-2.6.32.12/fs/hugetlbfs/inode.c
+--- linux-2.6.32.12/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/hugetlbfs/inode.c 2010-04-06 22:13:08.677504702 -0400
@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -30862,9 +31346,9 @@ diff -urNp linux-2.6.32.11/fs/hugetlbfs/inode.c linux-2.6.32.11/fs/hugetlbfs/ino
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c
---- linux-2.6.32.11/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/ioctl.c linux-2.6.32.12/fs/ioctl.c
+--- linux-2.6.32.12/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
@@ -30892,9 +31376,9 @@ diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c
error = -EFAULT;
return error;
-diff -urNp linux-2.6.32.11/fs/jffs2/debug.h linux-2.6.32.11/fs/jffs2/debug.h
---- linux-2.6.32.11/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/jffs2/debug.h linux-2.6.32.12/fs/jffs2/debug.h
+--- linux-2.6.32.12/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -30996,9 +31480,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/debug.h linux-2.6.32.11/fs/jffs2/debug.h
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.32.11/fs/jffs2/erase.c linux-2.6.32.11/fs/jffs2/erase.c
---- linux-2.6.32.11/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/jffs2/erase.c linux-2.6.32.12/fs/jffs2/erase.c
+--- linux-2.6.32.12/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31009,9 +31493,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/erase.c linux-2.6.32.11/fs/jffs2/erase.c
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.32.11/fs/jffs2/summary.h linux-2.6.32.11/fs/jffs2/summary.h
---- linux-2.6.32.11/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/jffs2/summary.h linux-2.6.32.12/fs/jffs2/summary.h
+--- linux-2.6.32.12/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -31040,9 +31524,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/summary.h linux-2.6.32.11/fs/jffs2/summary.h
#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
#endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.32.11/fs/jffs2/wbuf.c linux-2.6.32.11/fs/jffs2/wbuf.c
---- linux-2.6.32.11/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/jffs2/wbuf.c linux-2.6.32.12/fs/jffs2/wbuf.c
+--- linux-2.6.32.12/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31053,9 +31537,9 @@ diff -urNp linux-2.6.32.11/fs/jffs2/wbuf.c linux-2.6.32.11/fs/jffs2/wbuf.c
};
/*
-diff -urNp linux-2.6.32.11/fs/lockd/svc.c linux-2.6.32.11/fs/lockd/svc.c
---- linux-2.6.32.11/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/lockd/svc.c linux-2.6.32.12/fs/lockd/svc.c
+--- linux-2.6.32.12/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400
@@ -43,7 +43,7 @@
static struct svc_program nlmsvc_program;
@@ -31065,9 +31549,9 @@ diff -urNp linux-2.6.32.11/fs/lockd/svc.c linux-2.6.32.11/fs/lockd/svc.c
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c
---- linux-2.6.32.11/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/locks.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/locks.c linux-2.6.32.12/fs/locks.c
+--- linux-2.6.32.12/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/locks.c 2010-04-04 20:46:41.653544810 -0400
@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -31089,9 +31573,9 @@ diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c
}
lock_kernel();
-diff -urNp linux-2.6.32.11/fs/namei.c linux-2.6.32.11/fs/namei.c
---- linux-2.6.32.11/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/namei.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/namei.c linux-2.6.32.12/fs/namei.c
+--- linux-2.6.32.12/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/namei.c 2010-04-04 20:46:41.653544810 -0400
@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(cookie);
@@ -31418,9 +31902,9 @@ diff -urNp linux-2.6.32.11/fs/namei.c linux-2.6.32.11/fs/namei.c
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-diff -urNp linux-2.6.32.11/fs/namespace.c linux-2.6.32.11/fs/namespace.c
---- linux-2.6.32.11/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/namespace.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/namespace.c linux-2.6.32.12/fs/namespace.c
+--- linux-2.6.32.12/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/namespace.c 2010-04-04 20:46:41.653544810 -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);
@@ -31481,9 +31965,9 @@ diff -urNp linux-2.6.32.11/fs/namespace.c linux-2.6.32.11/fs/namespace.c
read_lock(&current->fs->lock);
root = current->fs->root;
path_get(&current->fs->root);
-diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c
---- linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400
-+++ linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/nfs/inode.c linux-2.6.32.12/fs/nfs/inode.c
+--- linux-2.6.32.12/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400
++++ linux-2.6.32.12/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400
@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
@@ -31504,9 +31988,9 @@ diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
---- linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/nfs/nfs4proc.c linux-2.6.32.12/fs/nfs/nfs4proc.c
+--- linux-2.6.32.12/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400
++++ linux-2.6.32.12/fs/nfs/nfs4proc.c 2010-04-29 17:49:58.597031543 -0400
@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
@@ -31525,7 +32009,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
struct nfs_server *server = NFS_SERVER(state->inode);
int err;
do {
-@@ -1491,7 +1491,7 @@ static int _nfs4_open_expired(struct nfs
+@@ -1493,7 +1493,7 @@ static int _nfs4_open_expired(struct nfs
static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
{
struct nfs_server *server = NFS_SERVER(state->inode);
@@ -31534,7 +32018,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
-@@ -1591,7 +1591,7 @@ out_err:
+@@ -1593,7 +1593,7 @@ out_err:
static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred)
{
@@ -31543,7 +32027,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
struct nfs4_state *res;
int status;
-@@ -1682,7 +1682,7 @@ static int nfs4_do_setattr(struct inode
+@@ -1684,7 +1684,7 @@ static int nfs4_do_setattr(struct inode
struct nfs4_state *state)
{
struct nfs_server *server = NFS_SERVER(inode);
@@ -31552,7 +32036,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2048,7 +2048,7 @@ static int _nfs4_server_capabilities(str
+@@ -2050,7 +2050,7 @@ static int _nfs4_server_capabilities(str
int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
{
@@ -31561,7 +32045,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2082,7 +2082,7 @@ static int _nfs4_lookup_root(struct nfs_
+@@ -2084,7 +2084,7 @@ static int _nfs4_lookup_root(struct nfs_
static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
struct nfs_fsinfo *info)
{
@@ -31570,7 +32054,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2171,7 +2171,7 @@ static int _nfs4_proc_getattr(struct nfs
+@@ -2173,7 +2173,7 @@ static int _nfs4_proc_getattr(struct nfs
static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
{
@@ -31579,7 +32063,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2259,7 +2259,7 @@ static int nfs4_proc_lookupfh(struct nfs
+@@ -2261,7 +2261,7 @@ static int nfs4_proc_lookupfh(struct nfs
struct qstr *name, struct nfs_fh *fhandle,
struct nfs_fattr *fattr)
{
@@ -31588,7 +32072,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
-@@ -2288,7 +2288,7 @@ static int _nfs4_proc_lookup(struct inod
+@@ -2290,7 +2290,7 @@ static int _nfs4_proc_lookup(struct inod
static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
{
@@ -31597,7 +32081,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2352,7 +2352,7 @@ static int _nfs4_proc_access(struct inod
+@@ -2354,7 +2354,7 @@ static int _nfs4_proc_access(struct inod
static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
{
@@ -31606,7 +32090,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2408,7 +2408,7 @@ static int _nfs4_proc_readlink(struct in
+@@ -2410,7 +2410,7 @@ static int _nfs4_proc_readlink(struct in
static int nfs4_proc_readlink(struct inode *inode, struct page *page,
unsigned int pgbase, unsigned int pglen)
{
@@ -31615,7 +32099,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2506,7 +2506,7 @@ static int _nfs4_proc_remove(struct inod
+@@ -2508,7 +2508,7 @@ static int _nfs4_proc_remove(struct inod
static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
{
@@ -31624,7 +32108,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2580,7 +2580,7 @@ static int _nfs4_proc_rename(struct inod
+@@ -2582,7 +2582,7 @@ static int _nfs4_proc_rename(struct inod
static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
struct inode *new_dir, struct qstr *new_name)
{
@@ -31633,7 +32117,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(old_dir),
-@@ -2627,7 +2627,7 @@ static int _nfs4_proc_link(struct inode
+@@ -2629,7 +2629,7 @@ static int _nfs4_proc_link(struct inode
static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
{
@@ -31642,7 +32126,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -2719,7 +2719,7 @@ out:
+@@ -2721,7 +2721,7 @@ out:
static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
struct page *page, unsigned int len, struct iattr *sattr)
{
@@ -31651,7 +32135,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2750,7 +2750,7 @@ out:
+@@ -2752,7 +2752,7 @@ out:
static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
struct iattr *sattr)
{
@@ -31660,7 +32144,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2799,7 +2799,7 @@ static int _nfs4_proc_readdir(struct den
+@@ -2801,7 +2801,7 @@ static int _nfs4_proc_readdir(struct den
static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
u64 cookie, struct page *page, unsigned int count, int plus)
{
@@ -31669,7 +32153,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
-@@ -2847,7 +2847,7 @@ out:
+@@ -2849,7 +2849,7 @@ out:
static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
struct iattr *sattr, dev_t rdev)
{
@@ -31678,7 +32162,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
-@@ -2879,7 +2879,7 @@ static int _nfs4_proc_statfs(struct nfs_
+@@ -2881,7 +2881,7 @@ static int _nfs4_proc_statfs(struct nfs_
static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
{
@@ -31687,7 +32171,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(server,
-@@ -2910,7 +2910,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
+@@ -2912,7 +2912,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
{
@@ -31696,7 +32180,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
-@@ -2956,7 +2956,7 @@ static int _nfs4_proc_pathconf(struct nf
+@@ -2958,7 +2958,7 @@ static int _nfs4_proc_pathconf(struct nf
static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
struct nfs_pathconf *pathconf)
{
@@ -31705,7 +32189,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
-@@ -3255,7 +3255,7 @@ out_free:
+@@ -3257,7 +3257,7 @@ out_free:
static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
{
@@ -31714,7 +32198,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
ssize_t ret;
do {
ret = __nfs4_get_acl_uncached(inode, buf, buflen);
-@@ -3311,7 +3311,7 @@ static int __nfs4_proc_set_acl(struct in
+@@ -3313,7 +3313,7 @@ static int __nfs4_proc_set_acl(struct in
static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
{
@@ -31723,7 +32207,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(inode),
-@@ -3576,7 +3576,7 @@ out:
+@@ -3578,7 +3578,7 @@ out:
int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
{
struct nfs_server *server = NFS_SERVER(inode);
@@ -31732,7 +32216,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
-@@ -3649,7 +3649,7 @@ out:
+@@ -3651,7 +3651,7 @@ out:
static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
{
@@ -31741,7 +32225,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
-@@ -4042,7 +4042,7 @@ static int _nfs4_do_setlk(struct nfs4_st
+@@ -4044,7 +4044,7 @@ static int _nfs4_do_setlk(struct nfs4_st
static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
{
struct nfs_server *server = NFS_SERVER(state->inode);
@@ -31750,7 +32234,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
-@@ -4060,7 +4060,7 @@ static int nfs4_lock_reclaim(struct nfs4
+@@ -4062,7 +4062,7 @@ static int nfs4_lock_reclaim(struct nfs4
static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
{
struct nfs_server *server = NFS_SERVER(state->inode);
@@ -31759,7 +32243,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
err = nfs4_set_lock_state(state, request);
-@@ -4118,7 +4118,7 @@ out:
+@@ -4120,7 +4120,7 @@ out:
static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
{
@@ -31768,7 +32252,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
do {
-@@ -4178,7 +4178,7 @@ nfs4_proc_lock(struct file *filp, int cm
+@@ -4180,7 +4180,7 @@ nfs4_proc_lock(struct file *filp, int cm
int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
{
struct nfs_server *server = NFS_SERVER(state->inode);
@@ -31777,9 +32261,9 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c
---- linux-2.6.32.11/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400
+diff -urNp linux-2.6.32.12/fs/nfsd/lockd.c linux-2.6.32.12/fs/nfsd/lockd.c
+--- linux-2.6.32.12/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400
@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -31789,9 +32273,9 @@ diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
-diff -urNp linux-2.6.32.11/fs/nfsd/vfs.c linux-2.6.32.11/fs/nfsd/vfs.c
---- linux-2.6.32.11/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/nfsd/vfs.c linux-2.6.32.12/fs/nfsd/vfs.c
+--- linux-2.6.32.12/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400
@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -31819,9 +32303,9 @@ diff -urNp linux-2.6.32.11/fs/nfsd/vfs.c linux-2.6.32.11/fs/nfsd/vfs.c
set_fs(oldfs);
if (host_err < 0)
-diff -urNp linux-2.6.32.11/fs/nls/nls_base.c linux-2.6.32.11/fs/nls/nls_base.c
---- linux-2.6.32.11/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/nls/nls_base.c linux-2.6.32.12/fs/nls/nls_base.c
+--- linux-2.6.32.12/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -31831,9 +32315,9 @@ diff -urNp linux-2.6.32.11/fs/nls/nls_base.c linux-2.6.32.11/fs/nls/nls_base.c
};
#define UNICODE_MAX 0x0010ffff
-diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/fs/ntfs/file.c
---- linux-2.6.32.11/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/ntfs/file.c linux-2.6.32.12/fs/ntfs/file.c
+--- linux-2.6.32.12/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400
@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -31843,9 +32327,9 @@ diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/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.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/ocfs2/cluster/masklog.c linux-2.6.32.12/fs/ocfs2/cluster/masklog.c
+--- linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400
@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
return mlog_mask_store(mlog_attr->mask, buf, count);
}
@@ -31855,9 +32339,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/c
.show = mlog_show,
.store = mlog_store,
};
-diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/localalloc.c
---- linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/ocfs2/localalloc.c linux-2.6.32.12/fs/ocfs2/localalloc.c
+--- linux-2.6.32.12/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400
@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -31867,9 +32351,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/locala
status = 0;
bail:
-diff -urNp linux-2.6.32.11/fs/ocfs2/ocfs2.h linux-2.6.32.11/fs/ocfs2/ocfs2.h
---- linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/ocfs2/ocfs2.h linux-2.6.32.12/fs/ocfs2/ocfs2.h
+--- linux-2.6.32.12/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400
@@ -217,11 +217,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -31887,10 +32371,10 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/ocfs2.h linux-2.6.32.11/fs/ocfs2/ocfs2.h
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc.c
---- linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-04-04 20:46:41.657782339 -0400
-@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
+diff -urNp linux-2.6.32.12/fs/ocfs2/suballoc.c linux-2.6.32.12/fs/ocfs2/suballoc.c
+--- linux-2.6.32.12/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400
++++ linux-2.6.32.12/fs/ocfs2/suballoc.c 2010-04-29 17:49:58.609026943 -0400
+@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
}
@@ -31899,7 +32383,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
/* You should never ask for this much metadata */
BUG_ON(bits_wanted >
-@@ -1651,7 +1651,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
+@@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
mlog_errno(status);
goto bail;
}
@@ -31908,7 +32392,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
*blkno_start = bg_blkno + (u64) *suballoc_bit_start;
ac->ac_bits_given += (*num_bits);
-@@ -1725,7 +1725,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
+@@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
mlog_errno(status);
goto bail;
}
@@ -31917,7 +32401,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
BUG_ON(num_bits != 1);
-@@ -1827,7 +1827,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
+@@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
cluster_start,
num_clusters);
if (!status)
@@ -31926,7 +32410,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
} else {
if (min_clusters > (osb->bitmap_cpg - 1)) {
/* The only paths asking for contiguousness
-@@ -1855,7 +1855,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
+@@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
bg_blkno,
bg_bit_off);
@@ -31935,9 +32419,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
}
}
if (status < 0) {
-diff -urNp linux-2.6.32.11/fs/ocfs2/super.c linux-2.6.32.11/fs/ocfs2/super.c
---- linux-2.6.32.11/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/ocfs2/super.c linux-2.6.32.12/fs/ocfs2/super.c
+--- linux-2.6.32.12/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -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",
@@ -31972,9 +32456,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/super.c linux-2.6.32.11/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c
---- linux-2.6.32.11/fs/open.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/open.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/open.c linux-2.6.32.12/fs/open.c
+--- linux-2.6.32.12/fs/open.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/open.c 2010-04-04 20:46:41.657782339 -0400
@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
if (length < 0)
return -EINVAL;
@@ -32148,9 +32632,9 @@ diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c
mnt_drop_write(file->f_path.mnt);
out_fput:
fput(file);
-diff -urNp linux-2.6.32.11/fs/pipe.c linux-2.6.32.11/fs/pipe.c
---- linux-2.6.32.11/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/pipe.c linux-2.6.32.12/fs/pipe.c
+--- linux-2.6.32.12/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400
@@ -401,9 +401,9 @@ redo:
}
if (bufs) /* More to do? */
@@ -32274,9 +32758,9 @@ diff -urNp linux-2.6.32.11/fs/pipe.c linux-2.6.32.11/fs/pipe.c
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c
---- linux-2.6.32.11/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400
+diff -urNp linux-2.6.32.12/fs/proc/array.c linux-2.6.32.12/fs/proc/array.c
+--- linux-2.6.32.12/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400
@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
}
#endif /* CONFIG_MMU */
@@ -32367,9 +32851,9 @@ diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
---- linux-2.6.32.11/fs/proc/base.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/base.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/base.c linux-2.6.32.12/fs/proc/base.c
+--- linux-2.6.32.12/fs/proc/base.c 2010-04-29 17:49:38.453075413 -0400
++++ linux-2.6.32.12/fs/proc/base.c 2010-04-29 17:49:58.609026943 -0400
@@ -102,6 +102,22 @@ struct pid_entry {
union proc_op op;
};
@@ -32449,7 +32933,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
#define MAX_STACK_TRACE_DEPTH 64
-@@ -521,7 +557,7 @@ static int proc_pid_limits(struct task_s
+@@ -522,7 +558,7 @@ static int proc_pid_limits(struct task_s
return count;
}
@@ -32458,7 +32942,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -935,6 +971,9 @@ static ssize_t environ_read(struct file
+@@ -936,6 +972,9 @@ static ssize_t environ_read(struct file
if (!task)
goto out_no_task;
@@ -32468,7 +32952,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out;
-@@ -1455,7 +1494,11 @@ static struct inode *proc_pid_make_inode
+@@ -1456,7 +1495,11 @@ static struct inode *proc_pid_make_inode
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
@@ -32480,7 +32964,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
rcu_read_unlock();
}
security_task_to_inode(task, inode);
-@@ -1473,6 +1516,9 @@ static int pid_getattr(struct vfsmount *
+@@ -1474,6 +1517,9 @@ static int pid_getattr(struct vfsmount *
struct inode *inode = dentry->d_inode;
struct task_struct *task;
const struct cred *cred;
@@ -32490,7 +32974,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
generic_fillattr(inode, stat);
-@@ -1480,12 +1526,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1481,12 +1527,34 @@ static int pid_getattr(struct vfsmount *
stat->uid = 0;
stat->gid = 0;
task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -32526,7 +33010,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
}
}
rcu_read_unlock();
-@@ -1517,11 +1585,20 @@ static int pid_revalidate(struct dentry
+@@ -1518,11 +1586,20 @@ static int pid_revalidate(struct dentry
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -32547,7 +33031,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
rcu_read_unlock();
} else {
inode->i_uid = 0;
-@@ -1642,7 +1719,8 @@ static int proc_fd_info(struct inode *in
+@@ -1643,7 +1720,8 @@ static int proc_fd_info(struct inode *in
int fd = proc_fd(inode);
if (task) {
@@ -32557,7 +33041,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
put_task_struct(task);
}
if (files) {
-@@ -1894,12 +1972,22 @@ static const struct file_operations proc
+@@ -1895,12 +1973,22 @@ static const struct file_operations proc
static int proc_fd_permission(struct inode *inode, int mask)
{
int rv;
@@ -32582,7 +33066,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
return rv;
}
-@@ -2008,6 +2096,9 @@ static struct dentry *proc_pident_lookup
+@@ -2009,6 +2097,9 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -32592,7 +33076,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2052,6 +2143,9 @@ static int proc_pident_readdir(struct fi
+@@ -2053,6 +2144,9 @@ static int proc_pident_readdir(struct fi
if (!task)
goto out_no_task;
@@ -32602,7 +33086,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2319,7 +2413,7 @@ static void *proc_self_follow_link(struc
+@@ -2320,7 +2414,7 @@ static void *proc_self_follow_link(struc
static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
@@ -32611,7 +33095,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
if (!IS_ERR(s))
__putname(s);
}
-@@ -2432,6 +2526,9 @@ static struct dentry *proc_base_lookup(s
+@@ -2433,6 +2527,9 @@ static struct dentry *proc_base_lookup(s
if (p > last)
goto out;
@@ -32621,7 +33105,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
error = proc_base_instantiate(dir, dentry, task, p);
out:
-@@ -2518,7 +2615,7 @@ static const struct pid_entry tgid_base_
+@@ -2519,7 +2616,7 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_SCHED_DEBUG
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
@@ -32630,7 +33114,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2546,7 +2643,7 @@ static const struct pid_entry tgid_base_
+@@ -2547,7 +2644,7 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_KALLSYMS
INF("wchan", S_IRUGO, proc_pid_wchan),
#endif
@@ -32639,7 +33123,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-@@ -2576,6 +2673,9 @@ static const struct pid_entry tgid_base_
+@@ -2577,6 +2674,9 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_TASK_IO_ACCOUNTING
INF("io", S_IRUGO, proc_tgid_io_accounting),
#endif
@@ -32649,7 +33133,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
};
static int proc_tgid_base_readdir(struct file * filp,
-@@ -2700,7 +2800,14 @@ static struct dentry *proc_pid_instantia
+@@ -2701,7 +2801,14 @@ static struct dentry *proc_pid_instantia
if (!inode)
goto out;
@@ -32664,7 +33148,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -2742,7 +2849,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -2743,7 +2850,11 @@ struct dentry *proc_pid_lookup(struct in
if (!task)
goto out;
@@ -32676,7 +33160,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
put_task_struct(task);
out:
return result;
-@@ -2807,6 +2918,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -2808,6 +2919,11 @@ int proc_pid_readdir(struct file * filp,
{
unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
@@ -32688,7 +33172,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
struct tgid_iter iter;
struct pid_namespace *ns;
-@@ -2825,8 +2941,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -2826,8 +2942,27 @@ int proc_pid_readdir(struct file * filp,
for (iter = next_tgid(ns, iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -32717,7 +33201,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
put_task_struct(iter.task);
goto out;
}
-@@ -2852,7 +2987,7 @@ static const struct pid_entry tid_base_s
+@@ -2853,7 +2988,7 @@ static const struct pid_entry tid_base_s
#ifdef CONFIG_SCHED_DEBUG
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
@@ -32726,7 +33210,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
INF("syscall", S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline", S_IRUGO, proc_pid_cmdline),
-@@ -2879,7 +3014,7 @@ static const struct pid_entry tid_base_s
+@@ -2880,7 +3015,7 @@ static const struct pid_entry tid_base_s
#ifdef CONFIG_KALLSYMS
INF("wchan", S_IRUGO, proc_pid_wchan),
#endif
@@ -32735,9 +33219,9 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.32.11/fs/proc/cmdline.c linux-2.6.32.11/fs/proc/cmdline.c
---- linux-2.6.32.11/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/cmdline.c linux-2.6.32.12/fs/proc/cmdline.c
+--- linux-2.6.32.12/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -32750,9 +33234,9 @@ diff -urNp linux-2.6.32.11/fs/proc/cmdline.c linux-2.6.32.11/fs/proc/cmdline.c
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-2.6.32.11/fs/proc/devices.c linux-2.6.32.11/fs/proc/devices.c
---- linux-2.6.32.11/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/devices.c linux-2.6.32.12/fs/proc/devices.c
+--- linux-2.6.32.12/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -32765,9 +33249,9 @@ diff -urNp linux-2.6.32.11/fs/proc/devices.c linux-2.6.32.11/fs/proc/devices.c
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-2.6.32.11/fs/proc/inode.c linux-2.6.32.11/fs/proc/inode.c
---- linux-2.6.32.11/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/inode.c linux-2.6.32.12/fs/proc/inode.c
+--- linux-2.6.32.12/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400
@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -32780,9 +33264,9 @@ diff -urNp linux-2.6.32.11/fs/proc/inode.c linux-2.6.32.11/fs/proc/inode.c
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.32.11/fs/proc/internal.h linux-2.6.32.11/fs/proc/internal.h
---- linux-2.6.32.11/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/internal.h linux-2.6.32.12/fs/proc/internal.h
+--- linux-2.6.32.12/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -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,
@@ -32793,9 +33277,9 @@ diff -urNp linux-2.6.32.11/fs/proc/internal.h linux-2.6.32.11/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.11/fs/proc/Kconfig linux-2.6.32.11/fs/proc/Kconfig
---- linux-2.6.32.11/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/Kconfig linux-2.6.32.12/fs/proc/Kconfig
+--- linux-2.6.32.12/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -32823,9 +33307,9 @@ diff -urNp linux-2.6.32.11/fs/proc/Kconfig linux-2.6.32.11/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.11/fs/proc/kcore.c linux-2.6.32.11/fs/proc/kcore.c
---- linux-2.6.32.11/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/kcore.c linux-2.6.32.12/fs/proc/kcore.c
+--- linux-2.6.32.12/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400
@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
static int open_kcore(struct inode *inode, struct file *filp)
@@ -32836,9 +33320,9 @@ diff -urNp linux-2.6.32.11/fs/proc/kcore.c linux-2.6.32.11/fs/proc/kcore.c
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.32.11/fs/proc/meminfo.c linux-2.6.32.11/fs/proc/meminfo.c
---- linux-2.6.32.11/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/meminfo.c linux-2.6.32.12/fs/proc/meminfo.c
+--- linux-2.6.32.12/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
@@ -32848,9 +33332,9 @@ diff -urNp linux-2.6.32.11/fs/proc/meminfo.c linux-2.6.32.11/fs/proc/meminfo.c
#endif
);
-diff -urNp linux-2.6.32.11/fs/proc/nommu.c linux-2.6.32.11/fs/proc/nommu.c
---- linux-2.6.32.11/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/nommu.c linux-2.6.32.12/fs/proc/nommu.c
+--- linux-2.6.32.12/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -32860,9 +33344,9 @@ diff -urNp linux-2.6.32.11/fs/proc/nommu.c linux-2.6.32.11/fs/proc/nommu.c
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.32.11/fs/proc/proc_net.c linux-2.6.32.11/fs/proc/proc_net.c
---- linux-2.6.32.11/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/proc_net.c linux-2.6.32.12/fs/proc/proc_net.c
+--- linux-2.6.32.12/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -32881,9 +33365,9 @@ diff -urNp linux-2.6.32.11/fs/proc/proc_net.c linux-2.6.32.11/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.32.11/fs/proc/proc_sysctl.c linux-2.6.32.11/fs/proc/proc_sysctl.c
---- linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/proc_sysctl.c linux-2.6.32.12/fs/proc/proc_sysctl.c
+--- linux-2.6.32.12/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
@@ -32923,9 +33407,9 @@ diff -urNp linux-2.6.32.11/fs/proc/proc_sysctl.c linux-2.6.32.11/fs/proc/proc_sy
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.32.11/fs/proc/root.c linux-2.6.32.11/fs/proc/root.c
---- linux-2.6.32.11/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/root.c linux-2.6.32.12/fs/proc/root.c
+--- linux-2.6.32.12/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -32942,9 +33426,9 @@ diff -urNp linux-2.6.32.11/fs/proc/root.c linux-2.6.32.11/fs/proc/root.c
proc_sys_init();
}
-diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c
---- linux-2.6.32.11/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/task_mmu.c linux-2.6.32.12/fs/proc/task_mmu.c
+--- linux-2.6.32.12/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
@@ -33065,9 +33549,9 @@ diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/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.11/fs/proc/task_nommu.c linux-2.6.32.11/fs/proc/task_nommu.c
---- linux-2.6.32.11/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/proc/task_nommu.c linux-2.6.32.12/fs/proc/task_nommu.c
+--- linux-2.6.32.12/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -33086,9 +33570,9 @@ diff -urNp linux-2.6.32.11/fs/proc/task_nommu.c linux-2.6.32.11/fs/proc/task_nom
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.32.11/fs/readdir.c linux-2.6.32.11/fs/readdir.c
---- linux-2.6.32.11/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/readdir.c linux-2.6.32.12/fs/readdir.c
+--- linux-2.6.32.12/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -33178,9 +33662,9 @@ diff -urNp linux-2.6.32.11/fs/readdir.c linux-2.6.32.11/fs/readdir.c
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/fs/reiserfs/do_balan.c
---- linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/reiserfs/do_balan.c linux-2.6.32.12/fs/reiserfs/do_balan.c
+--- linux-2.6.32.12/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -33190,9 +33674,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/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.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/item_ops.c
---- linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/reiserfs/item_ops.c linux-2.6.32.12/fs/reiserfs/item_ops.c
+--- linux-2.6.32.12/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -33247,9 +33731,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/it
&stat_data_ops,
&indirect_ops,
&direct_ops,
-diff -urNp linux-2.6.32.11/fs/reiserfs/procfs.c linux-2.6.32.11/fs/reiserfs/procfs.c
---- linux-2.6.32.11/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/reiserfs/procfs.c linux-2.6.32.12/fs/reiserfs/procfs.c
+--- linux-2.6.32.12/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -33259,9 +33743,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/procfs.c linux-2.6.32.11/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.11/fs/select.c linux-2.6.32.11/fs/select.c
---- linux-2.6.32.11/fs/select.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/select.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/select.c linux-2.6.32.12/fs/select.c
+--- linux-2.6.32.12/fs/select.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/select.c 2010-04-04 20:46:41.661529739 -0400
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -33278,9 +33762,9 @@ diff -urNp linux-2.6.32.11/fs/select.c linux-2.6.32.11/fs/select.c
if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
return -EINVAL;
-diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c
---- linux-2.6.32.11/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/seq_file.c linux-2.6.32.12/fs/seq_file.c
+--- linux-2.6.32.12/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -33321,9 +33805,9 @@ diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c
if (!m->buf)
goto Enomem;
m->count = 0;
-diff -urNp linux-2.6.32.11/fs/smbfs/symlink.c linux-2.6.32.11/fs/smbfs/symlink.c
---- linux-2.6.32.11/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/smbfs/symlink.c linux-2.6.32.12/fs/smbfs/symlink.c
+--- linux-2.6.32.12/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -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)
@@ -33333,9 +33817,9 @@ diff -urNp linux-2.6.32.11/fs/smbfs/symlink.c linux-2.6.32.11/fs/smbfs/symlink.c
if (!IS_ERR(s))
__putname(s);
}
-diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c
---- linux-2.6.32.11/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/splice.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/splice.c linux-2.6.32.12/fs/splice.c
+--- linux-2.6.32.12/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/splice.c 2010-04-04 20:46:41.661529739 -0400
@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -33474,9 +33958,9 @@ diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-2.6.32.11/fs/sysfs/file.c linux-2.6.32.11/fs/sysfs/file.c
---- linux-2.6.32.11/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/sysfs/file.c linux-2.6.32.12/fs/sysfs/file.c
+--- linux-2.6.32.12/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400
@@ -53,7 +53,7 @@ struct sysfs_buffer {
size_t count;
loff_t pos;
@@ -33513,9 +33997,9 @@ diff -urNp linux-2.6.32.11/fs/sysfs/file.c linux-2.6.32.11/fs/sysfs/file.c
int error = -EACCES;
char *p;
-diff -urNp linux-2.6.32.11/fs/sysfs/symlink.c linux-2.6.32.11/fs/sysfs/symlink.c
---- linux-2.6.32.11/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -0400
+diff -urNp linux-2.6.32.12/fs/sysfs/symlink.c linux-2.6.32.12/fs/sysfs/symlink.c
+--- linux-2.6.32.12/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -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)
@@ -33525,9 +34009,9 @@ diff -urNp linux-2.6.32.11/fs/sysfs/symlink.c linux-2.6.32.11/fs/sysfs/symlink.c
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-2.6.32.11/fs/udf/balloc.c linux-2.6.32.11/fs/udf/balloc.c
---- linux-2.6.32.11/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400
+diff -urNp linux-2.6.32.12/fs/udf/balloc.c linux-2.6.32.12/fs/udf/balloc.c
+--- linux-2.6.32.12/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
mutex_lock(&sbi->s_alloc_mutex);
@@ -33550,9 +34034,35 @@ diff -urNp linux-2.6.32.11/fs/udf/balloc.c linux-2.6.32.11/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.11/fs/utimes.c linux-2.6.32.11/fs/utimes.c
---- linux-2.6.32.11/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400
+diff -urNp linux-2.6.32.12/fs/udf/misc.c linux-2.6.32.12/fs/udf/misc.c
+--- linux-2.6.32.12/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/udf/misc.c 2010-04-29 17:46:37.289044536 -0400
+@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
+ iinfo->i_lenEAttr += size;
+ return (struct genericFormat *)&ea[offset];
+ }
+- if (loc & 0x02)
+- ;
++ if (loc & 0x02) {
++ }
+
+ return NULL;
+ }
+diff -urNp linux-2.6.32.12/fs/udf/udfdecl.h linux-2.6.32.12/fs/udf/udfdecl.h
+--- linux-2.6.32.12/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/udf/udfdecl.h 2010-04-29 17:46:37.289044536 -0400
+@@ -26,7 +26,7 @@ do { \
+ printk(f, ##a); \
+ } while (0)
+ #else
+-#define udf_debug(f, a...) /**/
++#define udf_debug(f, a...) do {} while (0)
+ #endif
+
+ #define udf_info(f, a...) \
+diff -urNp linux-2.6.32.12/fs/utimes.c linux-2.6.32.12/fs/utimes.c
+--- linux-2.6.32.12/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -33574,9 +34084,9 @@ diff -urNp linux-2.6.32.11/fs/utimes.c linux-2.6.32.11/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.11/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400
+diff -urNp linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400
@@ -134,7 +134,7 @@ xfs_find_handle(
}
@@ -33586,9 +34096,9 @@ diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.11/fs/xfs/l
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
goto out_put;
-diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-04-04 20:46:41.665784997 -0400
+diff -urNp linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400
++++ linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:58.609026943 -0400
@@ -468,7 +468,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -33598,9 +34108,9 @@ diff -urNp linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.11/fs/xfs/li
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.32.11/fs/xfs/xfs_bmap.c linux-2.6.32.11/fs/xfs/xfs_bmap.c
---- linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400
+diff -urNp linux-2.6.32.12/fs/xfs/xfs_bmap.c linux-2.6.32.12/fs/xfs/xfs_bmap.c
+--- linux-2.6.32.12/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -33610,9 +34120,9 @@ diff -urNp linux-2.6.32.11/fs/xfs/xfs_bmap.c linux-2.6.32.11/fs/xfs/xfs_bmap.c
#endif /* DEBUG */
#if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.32.11/grsecurity/gracl_alloc.c linux-2.6.32.11/grsecurity/gracl_alloc.c
---- linux-2.6.32.11/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_alloc.c linux-2.6.32.12/grsecurity/gracl_alloc.c
+--- linux-2.6.32.12/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -33719,10 +34229,10 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_alloc.c linux-2.6.32.11/grsecurity/g
+ else
+ return 1;
+}
-diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c
---- linux-2.6.32.11/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl.c 2010-04-06 22:16:21.600343588 -0400
-@@ -0,0 +1,3924 @@
+diff -urNp linux-2.6.32.12/grsecurity/gracl.c linux-2.6.32.12/grsecurity/gracl.c
+--- linux-2.6.32.12/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl.c 2010-04-29 17:48:04.497204424 -0400
+@@ -0,0 +1,3897 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -33862,37 +34372,10 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c
+static int
+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
+{
-+ int i;
-+ unsigned long *l1;
-+ unsigned long *l2;
-+ unsigned char *c1;
-+ unsigned char *c2;
-+ int num_longs;
-+
+ if (likely(lena != lenb))
+ return 0;
+
-+ l1 = (unsigned long *)a;
-+ l2 = (unsigned long *)b;
-+
-+ num_longs = lena / sizeof(unsigned long);
-+
-+ for (i = num_longs; i--; l1++, l2++) {
-+ if (unlikely(*l1 != *l2))
-+ return 0;
-+ }
-+
-+ c1 = (unsigned char *) l1;
-+ c2 = (unsigned char *) l2;
-+
-+ i = lena - (num_longs * sizeof(unsigned long));
-+
-+ for (; i--; c1++, c2++) {
-+ if (unlikely(*c1 != *c2))
-+ return 0;
-+ }
-+
-+ return 1;
++ return !memcmp(a, b, lena);
+}
+
+static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
@@ -37647,9 +38130,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.32.11/grsecurity/gracl_cap.c linux-2.6.32.11/grsecurity/gracl_cap.c
---- linux-2.6.32.11/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_cap.c linux-2.6.32.12/grsecurity/gracl_cap.c
+--- linux-2.6.32.12/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,131 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -37782,9 +38265,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_cap.c linux-2.6.32.11/grsecurity/gra
+ return 0;
+}
+
-diff -urNp linux-2.6.32.11/grsecurity/gracl_fs.c linux-2.6.32.11/grsecurity/gracl_fs.c
---- linux-2.6.32.11/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_fs.c linux-2.6.32.12/grsecurity/gracl_fs.c
+--- linux-2.6.32.12/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,424 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -38210,9 +38693,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_fs.c linux-2.6.32.11/grsecurity/grac
+
+ return 0;
+}
-diff -urNp linux-2.6.32.11/grsecurity/gracl_ip.c linux-2.6.32.11/grsecurity/gracl_ip.c
---- linux-2.6.32.11/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_ip.c linux-2.6.32.12/grsecurity/gracl_ip.c
+--- linux-2.6.32.12/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,339 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -38553,9 +39036,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_ip.c linux-2.6.32.11/grsecurity/grac
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.32.11/grsecurity/gracl_learn.c linux-2.6.32.11/grsecurity/gracl_learn.c
---- linux-2.6.32.11/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_learn.c linux-2.6.32.12/grsecurity/gracl_learn.c
+--- linux-2.6.32.12/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -38768,9 +39251,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_learn.c linux-2.6.32.11/grsecurity/g
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.32.11/grsecurity/gracl_res.c linux-2.6.32.11/grsecurity/gracl_res.c
---- linux-2.6.32.11/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_res.c linux-2.6.32.12/grsecurity/gracl_res.c
+--- linux-2.6.32.12/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -38837,9 +39320,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_res.c linux-2.6.32.11/grsecurity/gra
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/gracl_segv.c linux-2.6.32.11/grsecurity/gracl_segv.c
---- linux-2.6.32.11/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_segv.c linux-2.6.32.12/grsecurity/gracl_segv.c
+--- linux-2.6.32.12/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -39151,9 +39634,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_segv.c linux-2.6.32.11/grsecurity/gr
+
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/gracl_shm.c linux-2.6.32.11/grsecurity/gracl_shm.c
---- linux-2.6.32.11/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/gracl_shm.c linux-2.6.32.12/grsecurity/gracl_shm.c
+--- linux-2.6.32.12/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,37 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -39192,9 +39675,9 @@ diff -urNp linux-2.6.32.11/grsecurity/gracl_shm.c linux-2.6.32.11/grsecurity/gra
+
+ return 1;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_chdir.c linux-2.6.32.11/grsecurity/grsec_chdir.c
---- linux-2.6.32.11/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_chdir.c linux-2.6.32.12/grsecurity/grsec_chdir.c
+--- linux-2.6.32.12/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -39215,9 +39698,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_chdir.c linux-2.6.32.11/grsecurity/g
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_chroot.c linux-2.6.32.11/grsecurity/grsec_chroot.c
---- linux-2.6.32.11/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_chroot.c linux-2.6.32.12/grsecurity/grsec_chroot.c
+--- linux-2.6.32.12/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,348 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -39567,9 +40050,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_chroot.c linux-2.6.32.11/grsecurity/
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.32.11/grsecurity/grsec_disabled.c linux-2.6.32.11/grsecurity/grsec_disabled.c
---- linux-2.6.32.11/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_disabled.c linux-2.6.32.12/grsecurity/grsec_disabled.c
+--- linux-2.6.32.12/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,426 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -39997,9 +40480,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_disabled.c linux-2.6.32.11/grsecurit
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-2.6.32.11/grsecurity/grsec_exec.c linux-2.6.32.11/grsecurity/grsec_exec.c
---- linux-2.6.32.11/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_exec.c linux-2.6.32.12/grsecurity/grsec_exec.c
+--- linux-2.6.32.12/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,89 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40090,9 +40573,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_exec.c linux-2.6.32.11/grsecurity/gr
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_fifo.c linux-2.6.32.11/grsecurity/grsec_fifo.c
---- linux-2.6.32.11/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_fifo.c linux-2.6.32.12/grsecurity/grsec_fifo.c
+--- linux-2.6.32.12/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40118,9 +40601,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_fifo.c linux-2.6.32.11/grsecurity/gr
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_fork.c linux-2.6.32.11/grsecurity/grsec_fork.c
---- linux-2.6.32.11/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_fork.c linux-2.6.32.12/grsecurity/grsec_fork.c
+--- linux-2.6.32.12/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,15 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40137,9 +40620,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_fork.c linux-2.6.32.11/grsecurity/gr
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_init.c linux-2.6.32.11/grsecurity/grsec_init.c
---- linux-2.6.32.11/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_init.c linux-2.6.32.12/grsecurity/grsec_init.c
+--- linux-2.6.32.12/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,241 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40382,9 +40865,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_init.c linux-2.6.32.11/grsecurity/gr
+
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_link.c linux-2.6.32.11/grsecurity/grsec_link.c
---- linux-2.6.32.11/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_link.c linux-2.6.32.12/grsecurity/grsec_link.c
+--- linux-2.6.32.12/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40429,9 +40912,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_link.c linux-2.6.32.11/grsecurity/gr
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_log.c linux-2.6.32.11/grsecurity/grsec_log.c
---- linux-2.6.32.11/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_log.c linux-2.6.32.12/grsecurity/grsec_log.c
+--- linux-2.6.32.12/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,296 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40729,9 +41212,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_log.c linux-2.6.32.11/grsecurity/grs
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_mem.c linux-2.6.32.11/grsecurity/grsec_mem.c
---- linux-2.6.32.11/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_mem.c linux-2.6.32.12/grsecurity/grsec_mem.c
+--- linux-2.6.32.12/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,85 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40818,9 +41301,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_mem.c linux-2.6.32.11/grsecurity/grs
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_mount.c linux-2.6.32.11/grsecurity/grsec_mount.c
---- linux-2.6.32.11/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_mount.c linux-2.6.32.12/grsecurity/grsec_mount.c
+--- linux-2.6.32.12/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40884,9 +41367,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_mount.c linux-2.6.32.11/grsecurity/g
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_ptrace.c linux-2.6.32.11/grsecurity/grsec_ptrace.c
---- linux-2.6.32.11/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_ptrace.c linux-2.6.32.12/grsecurity/grsec_ptrace.c
+--- linux-2.6.32.12/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40902,9 +41385,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_ptrace.c linux-2.6.32.11/grsecurity/
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_sig.c linux-2.6.32.11/grsecurity/grsec_sig.c
---- linux-2.6.32.11/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_sig.c linux-2.6.32.12/grsecurity/grsec_sig.c
+--- linux-2.6.32.12/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40971,9 +41454,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_sig.c linux-2.6.32.11/grsecurity/grs
+ return;
+}
+
-diff -urNp linux-2.6.32.11/grsecurity/grsec_sock.c linux-2.6.32.11/grsecurity/grsec_sock.c
---- linux-2.6.32.11/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_sock.c linux-2.6.32.12/grsecurity/grsec_sock.c
+--- linux-2.6.32.12/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,271 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -41246,9 +41729,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_sock.c linux-2.6.32.11/grsecurity/gr
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_sysctl.c linux-2.6.32.11/grsecurity/grsec_sysctl.c
---- linux-2.6.32.11/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_sysctl.c linux-2.6.32.12/grsecurity/grsec_sysctl.c
+--- linux-2.6.32.12/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,447 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41697,9 +42180,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_sysctl.c linux-2.6.32.11/grsecurity/
+ { .ctl_name = 0 }
+};
+#endif
-diff -urNp linux-2.6.32.11/grsecurity/grsec_textrel.c linux-2.6.32.11/grsecurity/grsec_textrel.c
---- linux-2.6.32.11/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_textrel.c linux-2.6.32.12/grsecurity/grsec_textrel.c
+--- linux-2.6.32.12/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41717,9 +42200,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_textrel.c linux-2.6.32.11/grsecurity
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_time.c linux-2.6.32.11/grsecurity/grsec_time.c
---- linux-2.6.32.11/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_time.c linux-2.6.32.12/grsecurity/grsec_time.c
+--- linux-2.6.32.12/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,13 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41734,9 +42217,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_time.c linux-2.6.32.11/grsecurity/gr
+#endif
+ return;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsec_tpe.c linux-2.6.32.11/grsecurity/grsec_tpe.c
---- linux-2.6.32.11/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsec_tpe.c linux-2.6.32.12/grsecurity/grsec_tpe.c
+--- linux-2.6.32.12/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,38 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41776,9 +42259,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsec_tpe.c linux-2.6.32.11/grsecurity/grs
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.32.11/grsecurity/grsum.c linux-2.6.32.11/grsecurity/grsum.c
---- linux-2.6.32.11/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/grsum.c linux-2.6.32.12/grsecurity/grsum.c
+--- linux-2.6.32.12/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,59 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -41839,9 +42322,9 @@ diff -urNp linux-2.6.32.11/grsecurity/grsum.c linux-2.6.32.11/grsecurity/grsum.c
+
+ return retval;
+}
-diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig
---- linux-2.6.32.11/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/Kconfig linux-2.6.32.12/grsecurity/Kconfig
+--- linux-2.6.32.12/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400
@@ -0,0 +1,965 @@
+#
+# grecurity configuration
@@ -42808,9 +43291,9 @@ diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig
+endmenu
+
+endmenu
-diff -urNp linux-2.6.32.11/grsecurity/Makefile linux-2.6.32.11/grsecurity/Makefile
---- linux-2.6.32.11/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/grsecurity/Makefile linux-2.6.32.12/grsecurity/Makefile
+--- linux-2.6.32.12/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -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
@@ -42841,9 +43324,23 @@ diff -urNp linux-2.6.32.11/grsecurity/Makefile linux-2.6.32.11/grsecurity/Makefi
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/acpi/acpi_drivers.h
---- linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/include/acpi/acoutput.h linux-2.6.32.12/include/acpi/acoutput.h
+--- linux-2.6.32.12/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/acpi/acoutput.h 2010-04-29 17:46:37.297250222 -0400
+@@ -264,8 +264,8 @@
+ * leaving no executable debug code!
+ */
+ #define ACPI_FUNCTION_NAME(a)
+-#define ACPI_DEBUG_PRINT(pl)
+-#define ACPI_DEBUG_PRINT_RAW(pl)
++#define ACPI_DEBUG_PRINT(pl) do {} while (0)
++#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0)
+
+ #endif /* ACPI_DEBUG_OUTPUT */
+
+diff -urNp linux-2.6.32.12/include/acpi/acpi_drivers.h linux-2.6.32.12/include/acpi/acpi_drivers.h
+--- linux-2.6.32.12/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400
@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
@@ -42873,9 +43370,9 @@ diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/a
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.32.11/include/asm-generic/atomic-long.h linux-2.6.32.11/include/asm-generic/atomic-long.h
---- linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/atomic-long.h linux-2.6.32.12/include/asm-generic/atomic-long.h
+--- linux-2.6.32.12/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -43096,9 +43593,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/atomic-long.h linux-2.6.32.11/inc
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.32.11/include/asm-generic/dma-mapping-common.h linux-2.6.32.11/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/dma-mapping-common.h linux-2.6.32.12/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -43207,9 +43704,9 @@ diff -urNp linux-2.6.32.11/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.11/include/asm-generic/futex.h linux-2.6.32.11/include/asm-generic/futex.h
---- linux-2.6.32.11/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/futex.h linux-2.6.32.12/include/asm-generic/futex.h
+--- linux-2.6.32.12/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -43228,9 +43725,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/futex.h linux-2.6.32.11/include/a
{
return -ENOSYS;
}
-diff -urNp linux-2.6.32.11/include/asm-generic/int-l64.h linux-2.6.32.11/include/asm-generic/int-l64.h
---- linux-2.6.32.11/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/int-l64.h linux-2.6.32.12/include/asm-generic/int-l64.h
+--- linux-2.6.32.12/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -43240,9 +43737,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/int-l64.h linux-2.6.32.11/include
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.32.11/include/asm-generic/int-ll64.h linux-2.6.32.11/include/asm-generic/int-ll64.h
---- linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/int-ll64.h linux-2.6.32.12/include/asm-generic/int-ll64.h
+--- linux-2.6.32.12/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -43252,9 +43749,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/int-ll64.h linux-2.6.32.11/includ
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.32.11/include/asm-generic/kmap_types.h linux-2.6.32.11/include/asm-generic/kmap_types.h
---- linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/kmap_types.h linux-2.6.32.12/include/asm-generic/kmap_types.h
+--- linux-2.6.32.12/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
@@ -43265,9 +43762,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/kmap_types.h linux-2.6.32.11/incl
};
#undef KMAP_D
-diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include/asm-generic/pgtable.h
---- linux-2.6.32.11/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/pgtable.h linux-2.6.32.12/include/asm-generic/pgtable.h
+--- linux-2.6.32.12/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
@@ -43283,9 +43780,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.32.11/include/asm-generic/vmlinux.lds.h linux-2.6.32.11/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/asm-generic/vmlinux.lds.h linux-2.6.32.12/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400
@@ -199,6 +199,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -43324,19 +43821,19 @@ diff -urNp linux-2.6.32.11/include/asm-generic/vmlinux.lds.h linux-2.6.32.11/inc
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/drm_pciids.h
---- linux-2.6.32.11/include/drm/drm_pciids.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/drm/drm_pciids.h 2010-04-04 20:46:41.673688119 -0400
-@@ -375,7 +375,7 @@
- {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+diff -urNp linux-2.6.32.12/include/drm/drm_pciids.h linux-2.6.32.12/include/drm/drm_pciids.h
+--- linux-2.6.32.12/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400
++++ linux-2.6.32.12/include/drm/drm_pciids.h 2010-04-29 18:05:16.209337414 -0400
+@@ -377,7 +377,7 @@
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+ {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
- {0, 0, 0}
+ {0, 0, 0, 0, 0, 0}
#define r128_PCI_IDS \
{0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -415,14 +415,14 @@
+@@ -417,14 +417,14 @@
{0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -43353,7 +43850,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define mach64_PCI_IDS \
{0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -445,7 +445,7 @@
+@@ -447,7 +447,7 @@
{0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -43362,7 +43859,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define sisdrv_PCI_IDS \
{0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -456,7 +456,7 @@
+@@ -458,7 +458,7 @@
{0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
{0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
@@ -43371,7 +43868,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define tdfx_PCI_IDS \
{0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -465,7 +465,7 @@
+@@ -467,7 +467,7 @@
{0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -43380,7 +43877,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define viadrv_PCI_IDS \
{0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -477,14 +477,14 @@
+@@ -479,14 +479,14 @@
{0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
{0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
@@ -43397,7 +43894,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define i830_PCI_IDS \
{0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-@@ -492,11 +492,11 @@
+@@ -494,11 +494,11 @@
{0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
@@ -43411,7 +43908,7 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define savage_PCI_IDS \
{0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
-@@ -522,10 +522,10 @@
+@@ -524,10 +524,10 @@
{0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
{0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
{0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
@@ -43424,15 +43921,15 @@ diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/
#define i915_PCI_IDS \
{0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
-@@ -558,4 +558,4 @@
+@@ -560,4 +560,4 @@
{0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
{0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
{0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
- {0, 0, 0}
+ {0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h
---- linux-2.6.32.11/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/drm/drmP.h linux-2.6.32.12/include/drm/drmP.h
+--- linux-2.6.32.12/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400
@@ -814,7 +814,7 @@ struct drm_driver {
void (*vgaarb_irq)(struct drm_device *dev, bool state);
@@ -43460,9 +43957,9 @@ diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h
/*@} */
struct list_head filelist;
-diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a.out.h
---- linux-2.6.32.11/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/a.out.h linux-2.6.32.12/include/linux/a.out.h
+--- linux-2.6.32.12/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -43478,9 +43975,9 @@ diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/atmdev.h
---- linux-2.6.32.11/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/atmdev.h linux-2.6.32.12/include/linux/atmdev.h
+--- linux-2.6.32.12/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -43490,9 +43987,9 @@ diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/include/linux/backlight.h
---- linux-2.6.32.11/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/backlight.h linux-2.6.32.12/include/linux/backlight.h
+--- linux-2.6.32.12/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400
@@ -36,18 +36,18 @@ struct backlight_device;
struct fb_info;
@@ -43534,9 +44031,9 @@ diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/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.11/include/linux/binfmts.h linux-2.6.32.11/include/linux/binfmts.h
---- linux-2.6.32.11/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/binfmts.h linux-2.6.32.12/include/linux/binfmts.h
+--- linux-2.6.32.12/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400
@@ -78,6 +78,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -43545,9 +44042,9 @@ diff -urNp linux-2.6.32.11/include/linux/binfmts.h linux-2.6.32.11/include/linux
unsigned long min_coredump; /* minimal dump size */
int hasvdso;
};
-diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/blkdev.h
---- linux-2.6.32.11/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/blkdev.h linux-2.6.32.12/include/linux/blkdev.h
+--- linux-2.6.32.12/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400
@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -43579,9 +44076,9 @@ diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/cache.h
---- linux-2.6.32.11/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/cache.h linux-2.6.32.12/include/linux/cache.h
+--- linux-2.6.32.12/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -43593,9 +44090,9 @@ diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/c
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/linux/capability.h
---- linux-2.6.32.11/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/capability.h linux-2.6.32.12/include/linux/capability.h
+--- linux-2.6.32.12/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -43604,9 +44101,9 @@ diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/li
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.32.11/include/linux/compiler-gcc4.h linux-2.6.32.11/include/linux/compiler-gcc4.h
---- linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/compiler-gcc4.h linux-2.6.32.12/include/linux/compiler-gcc4.h
+--- linux-2.6.32.12/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400
@@ -36,4 +36,8 @@
the kernel context */
#define __cold __attribute__((__cold__))
@@ -43616,9 +44113,9 @@ diff -urNp linux-2.6.32.11/include/linux/compiler-gcc4.h linux-2.6.32.11/include
+#define __bos0(ptr) __bos((ptr), 0)
+#define __bos1(ptr) __bos((ptr), 1)
#endif
-diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linux/compiler.h
---- linux-2.6.32.11/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/compiler.h linux-2.6.32.12/include/linux/compiler.h
+--- linux-2.6.32.12/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400
@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -43642,9 +44139,9 @@ diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linu
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.32.11/include/linux/decompress/mm.h linux-2.6.32.11/include/linux/decompress/mm.h
---- linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400
-+++ linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/decompress/mm.h linux-2.6.32.12/include/linux/decompress/mm.h
+--- linux-2.6.32.12/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400
++++ linux-2.6.32.12/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400
@@ -78,7 +78,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -43654,9 +44151,9 @@ diff -urNp linux-2.6.32.11/include/linux/decompress/mm.h linux-2.6.32.11/include
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/linux/dma-mapping.h
---- linux-2.6.32.11/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/dma-mapping.h linux-2.6.32.12/include/linux/dma-mapping.h
+--- linux-2.6.32.12/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400
@@ -16,50 +16,50 @@ enum dma_data_direction {
};
@@ -43723,9 +44220,9 @@ diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/l
};
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst.h
---- linux-2.6.32.11/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/dst.h linux-2.6.32.12/include/linux/dst.h
+--- linux-2.6.32.12/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400
@@ -380,7 +380,7 @@ struct dst_node
struct thread_pool *pool;
@@ -43735,9 +44232,9 @@ diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst
/*
* How frequently and how many times transaction
-diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf.h
---- linux-2.6.32.11/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400
+diff -urNp linux-2.6.32.12/include/linux/elf.h linux-2.6.32.12/include/linux/elf.h
+--- linux-2.6.32.12/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -43810,9 +44307,9 @@ diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf
#endif
-diff -urNp linux-2.6.32.11/include/linux/fs.h linux-2.6.32.11/include/linux/fs.h
---- linux-2.6.32.11/include/linux/fs.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/fs.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/fs.h linux-2.6.32.12/include/linux/fs.h
+--- linux-2.6.32.12/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400
++++ linux-2.6.32.12/include/linux/fs.h 2010-04-29 17:49:58.621028174 -0400
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)4096)
@@ -43974,9 +44471,9 @@ diff -urNp linux-2.6.32.11/include/linux/fs.h linux-2.6.32.11/include/linux/fs.h
};
/*
-diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/linux/fs_struct.h
---- linux-2.6.32.11/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/fs_struct.h linux-2.6.32.12/include/linux/fs_struct.h
+--- linux-2.6.32.12/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -43986,9 +44483,9 @@ diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/lin
rwlock_t lock;
int umask;
int in_exec;
-diff -urNp linux-2.6.32.11/include/linux/genhd.h linux-2.6.32.11/include/linux/genhd.h
---- linux-2.6.32.11/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/genhd.h linux-2.6.32.12/include/linux/genhd.h
+--- linux-2.6.32.12/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400
@@ -161,7 +161,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -43998,9 +44495,9 @@ diff -urNp linux-2.6.32.11/include/linux/genhd.h linux-2.6.32.11/include/linux/g
struct work_struct async_notify;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.32.11/include/linux/gracl.h linux-2.6.32.11/include/linux/gracl.h
---- linux-2.6.32.11/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/gracl.h linux-2.6.32.12/include/linux/gracl.h
+--- linux-2.6.32.12/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400
@@ -0,0 +1,309 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -44311,9 +44808,9 @@ diff -urNp linux-2.6.32.11/include/linux/gracl.h linux-2.6.32.11/include/linux/g
+
+#endif
+
-diff -urNp linux-2.6.32.11/include/linux/gralloc.h linux-2.6.32.11/include/linux/gralloc.h
---- linux-2.6.32.11/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/gralloc.h linux-2.6.32.12/include/linux/gralloc.h
+--- linux-2.6.32.12/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -44324,9 +44821,9 @@ diff -urNp linux-2.6.32.11/include/linux/gralloc.h linux-2.6.32.11/include/linux
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-2.6.32.11/include/linux/grdefs.h linux-2.6.32.11/include/linux/grdefs.h
---- linux-2.6.32.11/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/grdefs.h linux-2.6.32.12/include/linux/grdefs.h
+--- linux-2.6.32.12/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400
@@ -0,0 +1,136 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -44464,9 +44961,9 @@ diff -urNp linux-2.6.32.11/include/linux/grdefs.h linux-2.6.32.11/include/linux/
+};
+
+#endif
-diff -urNp linux-2.6.32.11/include/linux/grinternal.h linux-2.6.32.11/include/linux/grinternal.h
---- linux-2.6.32.11/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/grinternal.h linux-2.6.32.12/include/linux/grinternal.h
+--- linux-2.6.32.12/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400
@@ -0,0 +1,215 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -44683,9 +45180,9 @@ diff -urNp linux-2.6.32.11/include/linux/grinternal.h linux-2.6.32.11/include/li
+#endif
+
+#endif
-diff -urNp linux-2.6.32.11/include/linux/grmsg.h linux-2.6.32.11/include/linux/grmsg.h
---- linux-2.6.32.11/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/grmsg.h linux-2.6.32.12/include/linux/grmsg.h
+--- linux-2.6.32.12/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400
@@ -0,0 +1,107 @@
+#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"
@@ -44794,9 +45291,9 @@ diff -urNp linux-2.6.32.11/include/linux/grmsg.h linux-2.6.32.11/include/linux/g
+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
+#define GR_VM86_MSG "denied use of vm86 by "
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.32.11/include/linux/grsecurity.h linux-2.6.32.11/include/linux/grsecurity.h
---- linux-2.6.32.11/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/grsecurity.h linux-2.6.32.12/include/linux/grsecurity.h
+--- linux-2.6.32.12/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400
@@ -0,0 +1,199 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
@@ -44997,9 +45494,9 @@ diff -urNp linux-2.6.32.11/include/linux/grsecurity.h linux-2.6.32.11/include/li
+#endif
+
+#endif
-diff -urNp linux-2.6.32.11/include/linux/hdpu_features.h linux-2.6.32.11/include/linux/hdpu_features.h
---- linux-2.6.32.11/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/hdpu_features.h linux-2.6.32.12/include/linux/hdpu_features.h
+--- linux-2.6.32.12/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
@@ -45009,9 +45506,9 @@ diff -urNp linux-2.6.32.11/include/linux/hdpu_features.h linux-2.6.32.11/include
unsigned char cached_val;
int inited;
unsigned long *set_addr;
-diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/include/linux/highmem.h
---- linux-2.6.32.11/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/highmem.h linux-2.6.32.12/include/linux/highmem.h
+--- linux-2.6.32.12/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -45031,9 +45528,9 @@ diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/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.11/include/linux/init_task.h linux-2.6.32.11/include/linux/init_task.h
---- linux-2.6.32.11/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/init_task.h linux-2.6.32.12/include/linux/init_task.h
+--- linux-2.6.32.12/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400
@@ -115,6 +115,13 @@ extern struct cred init_cred;
# define INIT_PERF_EVENTS(tsk)
#endif
@@ -45056,9 +45553,9 @@ diff -urNp linux-2.6.32.11/include/linux/init_task.h linux-2.6.32.11/include/lin
}
-diff -urNp linux-2.6.32.11/include/linux/interrupt.h linux-2.6.32.11/include/linux/interrupt.h
---- linux-2.6.32.11/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/interrupt.h linux-2.6.32.12/include/linux/interrupt.h
+--- linux-2.6.32.12/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400
@@ -357,7 +357,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -45083,9 +45580,9 @@ diff -urNp linux-2.6.32.11/include/linux/interrupt.h linux-2.6.32.11/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.11/include/linux/jbd2.h linux-2.6.32.11/include/linux/jbd2.h
---- linux-2.6.32.11/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/jbd2.h linux-2.6.32.12/include/linux/jbd2.h
+--- linux-2.6.32.12/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400
@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
@@ -45095,9 +45592,9 @@ diff -urNp linux-2.6.32.11/include/linux/jbd2.h linux-2.6.32.11/include/linux/jb
#endif
static inline void *jbd2_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.11/include/linux/jbd.h linux-2.6.32.11/include/linux/jbd.h
---- linux-2.6.32.11/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/jbd.h linux-2.6.32.12/include/linux/jbd.h
+--- linux-2.6.32.12/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400
@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
@@ -45107,9 +45604,9 @@ diff -urNp linux-2.6.32.11/include/linux/jbd.h linux-2.6.32.11/include/linux/jbd
#endif
static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linux/kallsyms.h
---- linux-2.6.32.11/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/kallsyms.h linux-2.6.32.12/include/linux/kallsyms.h
+--- linux-2.6.32.12/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400
@@ -15,7 +15,8 @@
struct module;
@@ -45130,9 +45627,9 @@ diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linu
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.32.11/include/linux/kgdb.h linux-2.6.32.11/include/linux/kgdb.h
---- linux-2.6.32.11/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/kgdb.h linux-2.6.32.12/include/linux/kgdb.h
+--- linux-2.6.32.12/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400
@@ -251,20 +251,20 @@ struct kgdb_arch {
*/
struct kgdb_io {
@@ -45163,9 +45660,9 @@ diff -urNp linux-2.6.32.11/include/linux/kgdb.h linux-2.6.32.11/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.11/include/linux/kobject.h linux-2.6.32.11/include/linux/kobject.h
---- linux-2.6.32.11/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/kobject.h linux-2.6.32.12/include/linux/kobject.h
+--- linux-2.6.32.12/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
struct kobj_type {
@@ -45214,10 +45711,10 @@ diff -urNp linux-2.6.32.11/include/linux/kobject.h linux-2.6.32.11/include/linux
struct kobject *parent_kobj);
static inline struct kset *to_kset(struct kobject *kobj)
-diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linux/kvm_host.h
---- linux-2.6.32.11/include/linux/kvm_host.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/kvm_host.h 2010-04-04 20:46:41.677383221 -0400
-@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
+diff -urNp linux-2.6.32.12/include/linux/kvm_host.h linux-2.6.32.12/include/linux/kvm_host.h
+--- linux-2.6.32.12/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400
++++ linux-2.6.32.12/include/linux/kvm_host.h 2010-04-29 17:49:58.621028174 -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);
@@ -45226,7 +45723,7 @@ diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linu
struct module *module);
void kvm_exit(void);
-@@ -311,7 +311,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
+@@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
struct kvm_guest_debug *dbg);
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
@@ -45235,9 +45732,9 @@ diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linu
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.32.11/include/linux/libata.h linux-2.6.32.11/include/linux/libata.h
---- linux-2.6.32.11/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400
+diff -urNp linux-2.6.32.12/include/linux/libata.h linux-2.6.32.12/include/linux/libata.h
+--- linux-2.6.32.12/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -45303,9 +45800,9 @@ diff -urNp linux-2.6.32.11/include/linux/libata.h linux-2.6.32.11/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.11/include/linux/lockd/bind.h linux-2.6.32.11/include/linux/lockd/bind.h
---- linux-2.6.32.11/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/lockd/bind.h linux-2.6.32.12/include/linux/lockd/bind.h
+--- linux-2.6.32.12/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -45323,9 +45820,9 @@ diff -urNp linux-2.6.32.11/include/linux/lockd/bind.h linux-2.6.32.11/include/li
/*
* Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.32.11/include/linux/mm.h linux-2.6.32.11/include/linux/mm.h
---- linux-2.6.32.11/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/mm.h linux-2.6.32.12/include/linux/mm.h
+--- linux-2.6.32.12/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400
@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -45388,9 +45885,9 @@ diff -urNp linux-2.6.32.11/include/linux/mm.h linux-2.6.32.11/include/linux/mm.h
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.32.11/include/linux/mm_types.h linux-2.6.32.11/include/linux/mm_types.h
---- linux-2.6.32.11/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/mm_types.h linux-2.6.32.12/include/linux/mm_types.h
+--- linux-2.6.32.12/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400
@@ -186,6 +186,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -45425,9 +45922,9 @@ diff -urNp linux-2.6.32.11/include/linux/mm_types.h linux-2.6.32.11/include/linu
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.32.11/include/linux/mmu_notifier.h linux-2.6.32.11/include/linux/mmu_notifier.h
---- linux-2.6.32.11/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/mmu_notifier.h linux-2.6.32.12/include/linux/mmu_notifier.h
+--- linux-2.6.32.12/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -45444,9 +45941,9 @@ diff -urNp linux-2.6.32.11/include/linux/mmu_notifier.h linux-2.6.32.11/include/
})
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
-diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/include/linux/mod_devicetable.h
---- linux-2.6.32.11/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/mod_devicetable.h linux-2.6.32.12/include/linux/mod_devicetable.h
+--- linux-2.6.32.12/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -45465,9 +45962,9 @@ diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/inclu
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/module.h
---- linux-2.6.32.11/include/linux/module.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/module.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/module.h linux-2.6.32.12/include/linux/module.h
+--- linux-2.6.32.12/include/linux/module.h 2010-04-29 17:49:38.529851956 -0400
++++ linux-2.6.32.12/include/linux/module.h 2010-04-29 17:49:58.621028174 -0400
@@ -287,16 +287,16 @@ struct module
int (*init)(void);
@@ -45540,9 +46037,9 @@ diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.32.11/include/linux/moduleloader.h linux-2.6.32.11/include/linux/moduleloader.h
---- linux-2.6.32.11/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/moduleloader.h linux-2.6.32.12/include/linux/moduleloader.h
+--- linux-2.6.32.12/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -45565,9 +46062,9 @@ diff -urNp linux-2.6.32.11/include/linux/moduleloader.h linux-2.6.32.11/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.11/include/linux/namei.h linux-2.6.32.11/include/linux/namei.h
---- linux-2.6.32.11/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/namei.h linux-2.6.32.12/include/linux/namei.h
+--- linux-2.6.32.12/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -45592,9 +46089,9 @@ diff -urNp linux-2.6.32.11/include/linux/namei.h linux-2.6.32.11/include/linux/n
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.32.11/include/linux/nodemask.h linux-2.6.32.11/include/linux/nodemask.h
---- linux-2.6.32.11/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/nodemask.h linux-2.6.32.12/include/linux/nodemask.h
+--- linux-2.6.32.12/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
#define any_online_node(mask) \
@@ -45611,9 +46108,9 @@ diff -urNp linux-2.6.32.11/include/linux/nodemask.h linux-2.6.32.11/include/linu
})
#define num_online_nodes() num_node_state(N_ONLINE)
-diff -urNp linux-2.6.32.11/include/linux/oprofile.h linux-2.6.32.11/include/linux/oprofile.h
---- linux-2.6.32.11/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/oprofile.h linux-2.6.32.12/include/linux/oprofile.h
+--- linux-2.6.32.12/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -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);
@@ -45626,9 +46123,9 @@ diff -urNp linux-2.6.32.11/include/linux/oprofile.h linux-2.6.32.11/include/linu
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.32.11/include/linux/pipe_fs_i.h linux-2.6.32.11/include/linux/pipe_fs_i.h
---- linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/pipe_fs_i.h linux-2.6.32.12/include/linux/pipe_fs_i.h
+--- linux-2.6.32.12/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400
@@ -46,9 +46,9 @@ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
@@ -45642,9 +46139,9 @@ diff -urNp linux-2.6.32.11/include/linux/pipe_fs_i.h linux-2.6.32.11/include/lin
unsigned int r_counter;
unsigned int w_counter;
struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.32.11/include/linux/poison.h linux-2.6.32.11/include/linux/poison.h
---- linux-2.6.32.11/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/poison.h linux-2.6.32.12/include/linux/poison.h
+--- linux-2.6.32.12/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400
@@ -7,8 +7,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -45656,9 +46153,9 @@ diff -urNp linux-2.6.32.11/include/linux/poison.h linux-2.6.32.11/include/linux/
/********** include/linux/timer.h **********/
/*
-diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/include/linux/proc_fs.h
---- linux-2.6.32.11/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/proc_fs.h linux-2.6.32.12/include/linux/proc_fs.h
+--- linux-2.6.32.12/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -45679,9 +46176,9 @@ diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/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.11/include/linux/random.h linux-2.6.32.11/include/linux/random.h
---- linux-2.6.32.11/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/random.h linux-2.6.32.12/include/linux/random.h
+--- linux-2.6.32.12/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
@@ -45694,9 +46191,9 @@ diff -urNp linux-2.6.32.11/include/linux/random.h linux-2.6.32.11/include/linux/
#endif /* __KERNEL___ */
#endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/include/linux/reiserfs_fs.h
---- linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs.h linux-2.6.32.12/include/linux/reiserfs_fs.h
+--- linux-2.6.32.12/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -45743,9 +46240,9 @@ diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/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.11/include/linux/reiserfs_fs_sb.h linux-2.6.32.11/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs_sb.h linux-2.6.32.12/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400
@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -45755,9 +46252,9 @@ diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs_sb.h linux-2.6.32.11/includ
// tree gets re-balanced
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
-diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/sched.h
---- linux-2.6.32.11/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/sched.h linux-2.6.32.12/include/linux/sched.h
+--- linux-2.6.32.12/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400
@@ -101,6 +101,7 @@ struct bio;
struct fs_struct;
struct bts_context;
@@ -46006,9 +46503,9 @@ diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/s
extern void thread_info_cache_init(void);
#ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.32.11/include/linux/screen_info.h linux-2.6.32.11/include/linux/screen_info.h
---- linux-2.6.32.11/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/screen_info.h linux-2.6.32.12/include/linux/screen_info.h
+--- linux-2.6.32.12/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400
@@ -42,7 +42,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -46019,9 +46516,9 @@ diff -urNp linux-2.6.32.11/include/linux/screen_info.h linux-2.6.32.11/include/l
} __attribute__((packed));
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
-diff -urNp linux-2.6.32.11/include/linux/security.h linux-2.6.32.11/include/linux/security.h
---- linux-2.6.32.11/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/security.h linux-2.6.32.12/include/linux/security.h
+--- linux-2.6.32.12/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -46030,9 +46527,9 @@ diff -urNp linux-2.6.32.11/include/linux/security.h linux-2.6.32.11/include/linu
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.32.11/include/linux/shm.h linux-2.6.32.11/include/linux/shm.h
---- linux-2.6.32.11/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400
+diff -urNp linux-2.6.32.12/include/linux/shm.h linux-2.6.32.12/include/linux/shm.h
+--- linux-2.6.32.12/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -46044,9 +46541,9 @@ diff -urNp linux-2.6.32.11/include/linux/shm.h linux-2.6.32.11/include/linux/shm
};
/* shm_mode upper byte flags */
-diff -urNp linux-2.6.32.11/include/linux/slab.h linux-2.6.32.11/include/linux/slab.h
---- linux-2.6.32.11/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400
+diff -urNp linux-2.6.32.12/include/linux/slab.h linux-2.6.32.12/include/linux/slab.h
+--- linux-2.6.32.12/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
@@ -46118,9 +46615,9 @@ diff -urNp linux-2.6.32.11/include/linux/slab.h linux-2.6.32.11/include/linux/sl
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.32.11/include/linux/slub_def.h linux-2.6.32.11/include/linux/slub_def.h
---- linux-2.6.32.11/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/slub_def.h linux-2.6.32.12/include/linux/slub_def.h
+--- linux-2.6.32.12/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400
@@ -86,7 +86,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -46130,9 +46627,9 @@ diff -urNp linux-2.6.32.11/include/linux/slub_def.h linux-2.6.32.11/include/linu
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
-diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/sonet.h
---- linux-2.6.32.11/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/sonet.h linux-2.6.32.12/include/linux/sonet.h
+--- linux-2.6.32.12/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -46142,9 +46639,9 @@ diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/s
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/include/linux/suspend.h
---- linux-2.6.32.11/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/suspend.h linux-2.6.32.12/include/linux/suspend.h
+--- linux-2.6.32.12/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
@@ -46233,9 +46730,9 @@ diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/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.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/sysctl.h
---- linux-2.6.32.11/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/sysctl.h linux-2.6.32.12/include/linux/sysctl.h
+--- linux-2.6.32.12/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400
@@ -164,7 +164,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -46249,9 +46746,9 @@ diff -urNp linux-2.6.32.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/
/* CTL_VM names: */
enum
-diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/sysfs.h
---- linux-2.6.32.11/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/sysfs.h linux-2.6.32.12/include/linux/sysfs.h
+--- linux-2.6.32.12/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400
@@ -75,8 +75,8 @@ struct bin_attribute {
};
@@ -46263,9 +46760,9 @@ diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/s
};
struct sysfs_dirent;
-diff -urNp linux-2.6.32.11/include/linux/thread_info.h linux-2.6.32.11/include/linux/thread_info.h
---- linux-2.6.32.11/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/thread_info.h linux-2.6.32.12/include/linux/thread_info.h
+--- linux-2.6.32.12/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
@@ -46275,9 +46772,9 @@ diff -urNp linux-2.6.32.11/include/linux/thread_info.h linux-2.6.32.11/include/l
u32 val;
u32 flags;
u32 bitset;
-diff -urNp linux-2.6.32.11/include/linux/tty.h linux-2.6.32.11/include/linux/tty.h
---- linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400
-+++ linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/tty.h linux-2.6.32.12/include/linux/tty.h
+--- linux-2.6.32.12/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400
++++ linux-2.6.32.12/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400
@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
@@ -46313,9 +46810,9 @@ diff -urNp linux-2.6.32.11/include/linux/tty.h linux-2.6.32.11/include/linux/tty
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff -urNp linux-2.6.32.11/include/linux/tty_ldisc.h linux-2.6.32.11/include/linux/tty_ldisc.h
---- linux-2.6.32.11/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/tty_ldisc.h linux-2.6.32.12/include/linux/tty_ldisc.h
+--- linux-2.6.32.12/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400
@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -46325,9 +46822,9 @@ diff -urNp linux-2.6.32.11/include/linux/tty_ldisc.h linux-2.6.32.11/include/lin
};
struct tty_ldisc {
-diff -urNp linux-2.6.32.11/include/linux/types.h linux-2.6.32.11/include/linux/types.h
---- linux-2.6.32.11/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/types.h linux-2.6.32.12/include/linux/types.h
+--- linux-2.6.32.12/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
@@ -46355,9 +46852,9 @@ diff -urNp linux-2.6.32.11/include/linux/types.h linux-2.6.32.11/include/linux/t
#endif
struct ustat {
-diff -urNp linux-2.6.32.11/include/linux/uaccess.h linux-2.6.32.11/include/linux/uaccess.h
---- linux-2.6.32.11/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/uaccess.h linux-2.6.32.12/include/linux/uaccess.h
+--- linux-2.6.32.12/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -46389,9 +46886,9 @@ diff -urNp linux-2.6.32.11/include/linux/uaccess.h linux-2.6.32.11/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.11/include/linux/vmalloc.h linux-2.6.32.11/include/linux/vmalloc.h
---- linux-2.6.32.11/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/linux/vmalloc.h linux-2.6.32.12/include/linux/vmalloc.h
+--- linux-2.6.32.12/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -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 */
@@ -46486,9 +46983,9 @@ diff -urNp linux-2.6.32.11/include/linux/vmalloc.h linux-2.6.32.11/include/linux
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.32.11/include/net/irda/ircomm_tty.h linux-2.6.32.11/include/net/irda/ircomm_tty.h
---- linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/net/irda/ircomm_tty.h linux-2.6.32.12/include/net/irda/ircomm_tty.h
+--- linux-2.6.32.12/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400
@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
@@ -46500,9 +46997,9 @@ diff -urNp linux-2.6.32.11/include/net/irda/ircomm_tty.h linux-2.6.32.11/include
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/neighbour.h
---- linux-2.6.32.11/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/net/neighbour.h linux-2.6.32.12/include/net/neighbour.h
+--- linux-2.6.32.12/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400
@@ -125,12 +125,12 @@ struct neighbour
struct neigh_ops
{
@@ -46522,9 +47019,9 @@ diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/n
};
struct pneigh_entry
-diff -urNp linux-2.6.32.11/include/net/sctp/sctp.h linux-2.6.32.11/include/net/sctp/sctp.h
---- linux-2.6.32.11/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/net/sctp/sctp.h linux-2.6.32.12/include/net/sctp/sctp.h
+--- linux-2.6.32.12/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
@@ -46536,9 +47033,9 @@ diff -urNp linux-2.6.32.11/include/net/sctp/sctp.h linux-2.6.32.11/include/net/s
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.32.11/include/net/tcp.h linux-2.6.32.11/include/net/tcp.h
---- linux-2.6.32.11/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/net/tcp.h linux-2.6.32.12/include/net/tcp.h
+--- linux-2.6.32.12/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400
@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -46547,9 +47044,9 @@ diff -urNp linux-2.6.32.11/include/net/tcp.h linux-2.6.32.11/include/net/tcp.h
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.32.11/include/net/udp.h linux-2.6.32.11/include/net/udp.h
---- linux-2.6.32.11/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/net/udp.h linux-2.6.32.12/include/net/udp.h
+--- linux-2.6.32.12/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400
@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -46558,9 +47055,9 @@ diff -urNp linux-2.6.32.11/include/net/udp.h linux-2.6.32.11/include/net/udp.h
struct file_operations seq_fops;
struct seq_operations seq_ops;
};
-diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/sound/ac97_codec.h
---- linux-2.6.32.11/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/sound/ac97_codec.h linux-2.6.32.12/include/sound/ac97_codec.h
+--- linux-2.6.32.12/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400
@@ -419,15 +419,15 @@
struct snd_ac97;
@@ -46593,9 +47090,9 @@ diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/so
void *private_data;
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
-diff -urNp linux-2.6.32.11/include/trace/events/irq.h linux-2.6.32.11/include/trace/events/irq.h
---- linux-2.6.32.11/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/trace/events/irq.h linux-2.6.32.12/include/trace/events/irq.h
+--- linux-2.6.32.12/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
@@ -46632,9 +47129,9 @@ diff -urNp linux-2.6.32.11/include/trace/events/irq.h linux-2.6.32.11/include/tr
TP_ARGS(h, vec),
-diff -urNp linux-2.6.32.11/include/video/uvesafb.h linux-2.6.32.11/include/video/uvesafb.h
---- linux-2.6.32.11/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/include/video/uvesafb.h linux-2.6.32.12/include/video/uvesafb.h
+--- linux-2.6.32.12/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -46643,9 +47140,9 @@ diff -urNp linux-2.6.32.11/include/video/uvesafb.h linux-2.6.32.11/include/video
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
-diff -urNp linux-2.6.32.11/init/do_mounts.c linux-2.6.32.11/init/do_mounts.c
---- linux-2.6.32.11/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/do_mounts.c 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/init/do_mounts.c linux-2.6.32.12/init/do_mounts.c
+--- linux-2.6.32.12/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/do_mounts.c 2010-04-04 20:46:41.685762250 -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)
@@ -46691,9 +47188,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts.c linux-2.6.32.11/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.11/init/do_mounts.h linux-2.6.32.11/init/do_mounts.h
---- linux-2.6.32.11/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/init/do_mounts.h linux-2.6.32.12/init/do_mounts.h
+--- linux-2.6.32.12/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -46713,9 +47210,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts.h linux-2.6.32.11/init/do_mounts.h
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
-diff -urNp linux-2.6.32.11/init/do_mounts_initrd.c linux-2.6.32.11/init/do_mounts_initrd.c
---- linux-2.6.32.11/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -0400
+diff -urNp linux-2.6.32.12/init/do_mounts_initrd.c linux-2.6.32.12/init/do_mounts_initrd.c
+--- linux-2.6.32.12/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -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);
@@ -46799,9 +47296,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts_initrd.c linux-2.6.32.11/init/do_mount
+ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.32.11/init/do_mounts_md.c linux-2.6.32.11/init/do_mounts_md.c
---- linux-2.6.32.11/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/init/do_mounts_md.c linux-2.6.32.12/init/do_mounts_md.c
+--- linux-2.6.32.12/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -46829,9 +47326,9 @@ diff -urNp linux-2.6.32.11/init/do_mounts_md.c linux-2.6.32.11/init/do_mounts_md
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
-diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c
---- linux-2.6.32.11/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/init/initramfs.c linux-2.6.32.12/init/initramfs.c
+--- linux-2.6.32.12/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -46940,9 +47437,9 @@ diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig
---- linux-2.6.32.11/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/Kconfig 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/init/Kconfig linux-2.6.32.12/init/Kconfig
+--- linux-2.6.32.12/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/Kconfig 2010-04-04 20:46:41.689696132 -0400
@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
config COMPAT_BRK
@@ -46964,9 +47461,9 @@ diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig
config RT_MUTEXES
boolean
-diff -urNp linux-2.6.32.11/init/main.c linux-2.6.32.11/init/main.c
---- linux-2.6.32.11/init/main.c 2010-04-04 20:41:50.060586306 -0400
-+++ linux-2.6.32.11/init/main.c 2010-04-04 20:58:33.225084964 -0400
+diff -urNp linux-2.6.32.12/init/main.c linux-2.6.32.12/init/main.c
+--- linux-2.6.32.12/init/main.c 2010-04-04 20:41:50.060586306 -0400
++++ linux-2.6.32.12/init/main.c 2010-04-04 20:58:33.225084964 -0400
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
@@ -47111,9 +47608,9 @@ diff -urNp linux-2.6.32.11/init/main.c linux-2.6.32.11/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.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c
---- linux-2.6.32.11/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/init/noinitramfs.c linux-2.6.32.12/init/noinitramfs.c
+--- linux-2.6.32.12/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400
@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
{
int err;
@@ -47132,9 +47629,9 @@ diff -urNp linux-2.6.32.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c
if (err < 0)
goto out;
-diff -urNp linux-2.6.32.11/ipc/ipc_sysctl.c linux-2.6.32.11/ipc/ipc_sysctl.c
---- linux-2.6.32.11/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/ipc/ipc_sysctl.c linux-2.6.32.12/ipc/ipc_sysctl.c
+--- linux-2.6.32.12/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400
@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
.extra1 = &zero,
.extra2 = &one,
@@ -47153,9 +47650,9 @@ diff -urNp linux-2.6.32.11/ipc/ipc_sysctl.c linux-2.6.32.11/ipc/ipc_sysctl.c
};
static int __init ipc_sysctl_init(void)
-diff -urNp linux-2.6.32.11/ipc/mqueue.c linux-2.6.32.11/ipc/mqueue.c
---- linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400
-+++ linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/ipc/mqueue.c linux-2.6.32.12/ipc/mqueue.c
+--- linux-2.6.32.12/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400
++++ linux-2.6.32.12/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -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));
@@ -47164,9 +47661,9 @@ diff -urNp linux-2.6.32.11/ipc/mqueue.c linux-2.6.32.11/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.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c
---- linux-2.6.32.11/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/ipc/shm.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/ipc/shm.c linux-2.6.32.12/ipc/shm.c
+--- linux-2.6.32.12/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/ipc/shm.c 2010-04-04 20:46:41.689696132 -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
@@ -47219,9 +47716,9 @@ diff -urNp linux-2.6.32.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-2.6.32.11/kernel/acct.c linux-2.6.32.11/kernel/acct.c
---- linux-2.6.32.11/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/acct.c linux-2.6.32.12/kernel/acct.c
+--- linux-2.6.32.12/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400
@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -47231,9 +47728,9 @@ diff -urNp linux-2.6.32.11/kernel/acct.c linux-2.6.32.11/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.11/kernel/capability.c linux-2.6.32.11/kernel/capability.c
---- linux-2.6.32.11/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/capability.c linux-2.6.32.12/kernel/capability.c
+--- linux-2.6.32.12/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400
@@ -306,10 +306,21 @@ int capable(int cap)
BUG();
}
@@ -47257,9 +47754,9 @@ diff -urNp linux-2.6.32.11/kernel/capability.c linux-2.6.32.11/kernel/capability
+
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c
---- linux-2.6.32.11/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/configs.c linux-2.6.32.12/kernel/configs.c
+--- linux-2.6.32.12/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -47280,9 +47777,9 @@ diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c
if (!entry)
return -ENOMEM;
-diff -urNp linux-2.6.32.11/kernel/cpu.c linux-2.6.32.11/kernel/cpu.c
---- linux-2.6.32.11/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/cpu.c linux-2.6.32.12/kernel/cpu.c
+--- linux-2.6.32.12/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400
@@ -19,7 +19,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -47292,9 +47789,9 @@ diff -urNp linux-2.6.32.11/kernel/cpu.c linux-2.6.32.11/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.11/kernel/cred.c linux-2.6.32.11/kernel/cred.c
---- linux-2.6.32.11/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/cred.c linux-2.6.32.12/kernel/cred.c
+--- linux-2.6.32.12/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400
@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
@@ -47304,9 +47801,9 @@ diff -urNp linux-2.6.32.11/kernel/cred.c linux-2.6.32.11/kernel/cred.c
/* dumpability changes */
if (old->euid != new->euid ||
old->egid != new->egid ||
-diff -urNp linux-2.6.32.11/kernel/exit.c linux-2.6.32.11/kernel/exit.c
---- linux-2.6.32.11/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/exit.c linux-2.6.32.12/kernel/exit.c
+--- linux-2.6.32.12/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400
@@ -56,6 +56,10 @@
#include <asm/mmu_context.h>
#include "cred-internals.h"
@@ -47396,9 +47893,9 @@ diff -urNp linux-2.6.32.11/kernel/exit.c linux-2.6.32.11/kernel/exit.c
get_task_struct(p);
read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c
---- linux-2.6.32.11/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/fork.c linux-2.6.32.12/kernel/fork.c
+--- linux-2.6.32.12/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400
@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -47551,9 +48048,9 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c
}
if (new_mm) {
-diff -urNp linux-2.6.32.11/kernel/futex.c linux-2.6.32.11/kernel/futex.c
---- linux-2.6.32.11/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400
+diff -urNp linux-2.6.32.12/kernel/futex.c linux-2.6.32.12/kernel/futex.c
+--- linux-2.6.32.12/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -47621,9 +48118,9 @@ diff -urNp linux-2.6.32.11/kernel/futex.c linux-2.6.32.11/kernel/futex.c
{
unsigned long uentry;
-diff -urNp linux-2.6.32.11/kernel/futex_compat.c linux-2.6.32.11/kernel/futex_compat.c
---- linux-2.6.32.11/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/futex_compat.c linux-2.6.32.12/kernel/futex_compat.c
+--- linux-2.6.32.12/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -47661,9 +48158,9 @@ diff -urNp linux-2.6.32.11/kernel/futex_compat.c linux-2.6.32.11/kernel/futex_co
head = p->compat_robust_list;
read_unlock(&tasklist_lock);
}
-diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c
---- linux-2.6.32.11/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/gcov/base.c linux-2.6.32.12/kernel/gcov/base.c
+--- linux-2.6.32.12/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -47685,9 +48182,9 @@ diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c
---- linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400
-+++ linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/hrtimer.c linux-2.6.32.12/kernel/hrtimer.c
+--- linux-2.6.32.12/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400
++++ linux-2.6.32.12/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400
@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -47697,9 +48194,9 @@ diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c
{
hrtimer_peek_ahead_timers();
}
-diff -urNp linux-2.6.32.11/kernel/kallsyms.c linux-2.6.32.11/kernel/kallsyms.c
---- linux-2.6.32.11/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/kallsyms.c 2010-04-06 22:21:53.692294722 -0400
+diff -urNp linux-2.6.32.12/kernel/kallsyms.c linux-2.6.32.12/kernel/kallsyms.c
+--- linux-2.6.32.12/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/kallsyms.c 2010-04-06 22:21:53.692294722 -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)
@@ -47776,9 +48273,9 @@ diff -urNp linux-2.6.32.11/kernel/kallsyms.c linux-2.6.32.11/kernel/kallsyms.c
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-diff -urNp linux-2.6.32.11/kernel/kgdb.c linux-2.6.32.11/kernel/kgdb.c
---- linux-2.6.32.11/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/kgdb.c linux-2.6.32.12/kernel/kgdb.c
+--- linux-2.6.32.12/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -47806,9 +48303,9 @@ diff -urNp linux-2.6.32.11/kernel/kgdb.c linux-2.6.32.11/kernel/kgdb.c
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c
---- linux-2.6.32.11/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/kmod.c linux-2.6.32.12/kernel/kmod.c
+--- linux-2.6.32.12/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400
@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
@@ -47828,9 +48325,9 @@ diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c
/* If modprobe needs a service that is in a module, we get a recursive
* loop. Limit the number of running kmod threads to max_threads/2 or
* MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
-diff -urNp linux-2.6.32.11/kernel/kprobes.c linux-2.6.32.11/kernel/kprobes.c
---- linux-2.6.32.11/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/kprobes.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/kprobes.c linux-2.6.32.12/kernel/kprobes.c
+--- linux-2.6.32.12/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/kprobes.c 2010-04-29 17:46:36.959467563 -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.
@@ -47849,9 +48346,27 @@ diff -urNp linux-2.6.32.11/kernel/kprobes.c linux-2.6.32.11/kernel/kprobes.c
kfree(kip);
}
return 1;
-diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c
---- linux-2.6.32.11/kernel/lockdep.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/lockdep.c 2010-04-04 20:46:41.693491350 -0400
+@@ -1189,7 +1189,7 @@ static int __init init_kprobes(void)
+ {
+ int i, err = 0;
+ unsigned long offset = 0, size = 0;
+- char *modname, namebuf[128];
++ char *modname, namebuf[KSYM_NAME_LEN];
+ const char *symbol_name;
+ void *addr;
+ struct kprobe_blackpoint *kb;
+@@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(st
+ const char *sym = NULL;
+ unsigned int i = *(loff_t *) v;
+ unsigned long offset = 0;
+- char *modname, namebuf[128];
++ char *modname, namebuf[KSYM_NAME_LEN];
+
+ head = &kprobe_table[i];
+ preempt_disable();
+diff -urNp linux-2.6.32.12/kernel/lockdep.c linux-2.6.32.12/kernel/lockdep.c
+--- linux-2.6.32.12/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400
++++ linux-2.6.32.12/kernel/lockdep.c 2010-04-29 18:02:39.221319476 -0400
@@ -577,6 +577,10 @@ static int static_obj(void *obj)
int i;
#endif
@@ -47866,9 +48381,9 @@ diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c
@@ -592,8 +596,7 @@ static int static_obj(void *obj)
*/
for_each_possible_cpu(i) {
- start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
-- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
-- + per_cpu_offset(i);
+ start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
+- end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
+- + PERCPU_ENOUGH_ROOM;
+ end = start + PERCPU_ENOUGH_ROOM;
if ((addr >= start) && (addr < end))
@@ -47881,9 +48396,21 @@ diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c
printk("the code is fine but needs lockdep annotation.\n");
printk("turning off the locking correctness validator.\n");
dump_stack();
-diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c
---- linux-2.6.32.11/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/module.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/lockdep_proc.c linux-2.6.32.12/kernel/lockdep_proc.c
+--- linux-2.6.32.12/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/lockdep_proc.c 2010-04-29 17:46:37.305259446 -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)
+ {
+- char str[128];
++ char str[KSYM_NAME_LEN];
+ const char *name = class->name;
+
+ if (!name) {
+diff -urNp linux-2.6.32.12/kernel/module.c linux-2.6.32.12/kernel/module.c
+--- linux-2.6.32.12/kernel/module.c 2010-04-29 17:49:38.586002480 -0400
++++ linux-2.6.32.12/kernel/module.c 2010-04-29 17:49:58.693515313 -0400
@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
static BLOCKING_NOTIFIER_HEAD(module_notify_list);
@@ -48423,9 +48950,9 @@ diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.32.11/kernel/panic.c linux-2.6.32.11/kernel/panic.c
---- linux-2.6.32.11/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/panic.c linux-2.6.32.12/kernel/panic.c
+--- linux-2.6.32.12/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400
@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
*/
void __stack_chk_fail(void)
@@ -48436,9 +48963,9 @@ diff -urNp linux-2.6.32.11/kernel/panic.c linux-2.6.32.11/kernel/panic.c
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c
---- linux-2.6.32.11/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/params.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/params.c linux-2.6.32.12/kernel/params.c
+--- linux-2.6.32.12/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/params.c 2010-04-04 20:46:41.693491350 -0400
@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
return ret;
}
@@ -48457,9 +48984,9 @@ diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c
.filter = uevent_filter,
};
-diff -urNp linux-2.6.32.11/kernel/pid.c linux-2.6.32.11/kernel/pid.c
---- linux-2.6.32.11/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400
+diff -urNp linux-2.6.32.12/kernel/pid.c linux-2.6.32.12/kernel/pid.c
+--- linux-2.6.32.12/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -48493,9 +49020,9 @@ diff -urNp linux-2.6.32.11/kernel/pid.c linux-2.6.32.11/kernel/pid.c
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.32.11/kernel/posix-cpu-timers.c linux-2.6.32.11/kernel/posix-cpu-timers.c
---- linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/posix-cpu-timers.c linux-2.6.32.12/kernel/posix-cpu-timers.c
+--- linux-2.6.32.12/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -48520,9 +49047,9 @@ diff -urNp linux-2.6.32.11/kernel/posix-cpu-timers.c linux-2.6.32.11/kernel/posi
if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
/*
* At the soft limit, send a SIGXCPU every second.
-diff -urNp linux-2.6.32.11/kernel/power/hibernate.c linux-2.6.32.11/kernel/power/hibernate.c
---- linux-2.6.32.11/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/power/hibernate.c linux-2.6.32.12/kernel/power/hibernate.c
+--- linux-2.6.32.12/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400
@@ -48,14 +48,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -48540,9 +49067,9 @@ diff -urNp linux-2.6.32.11/kernel/power/hibernate.c linux-2.6.32.11/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.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/poweroff.c
---- linux-2.6.32.11/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/power/poweroff.c linux-2.6.32.12/kernel/power/poweroff.c
+--- linux-2.6.32.12/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -48552,9 +49079,9 @@ diff -urNp linux-2.6.32.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
-diff -urNp linux-2.6.32.11/kernel/power/process.c linux-2.6.32.11/kernel/power/process.c
---- linux-2.6.32.11/kernel/power/process.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/power/process.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/power/process.c linux-2.6.32.12/kernel/power/process.c
+--- linux-2.6.32.12/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400
++++ linux-2.6.32.12/kernel/power/process.c 2010-04-29 17:49:58.697130575 -0400
@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
@@ -48594,9 +49121,9 @@ diff -urNp linux-2.6.32.11/kernel/power/process.c linux-2.6.32.11/kernel/power/p
do_gettimeofday(&end);
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/suspend.c
---- linux-2.6.32.11/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/power/suspend.c linux-2.6.32.12/kernel/power/suspend.c
+--- linux-2.6.32.12/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
@@ -48613,9 +49140,9 @@ diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/s
{
mutex_lock(&pm_mutex);
suspend_ops = ops;
-diff -urNp linux-2.6.32.11/kernel/printk.c linux-2.6.32.11/kernel/printk.c
---- linux-2.6.32.11/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/printk.c linux-2.6.32.12/kernel/printk.c
+--- linux-2.6.32.12/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400
@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
@@ -48628,9 +49155,9 @@ diff -urNp linux-2.6.32.11/kernel/printk.c linux-2.6.32.11/kernel/printk.c
error = security_syslog(type);
if (error)
return error;
-diff -urNp linux-2.6.32.11/kernel/ptrace.c linux-2.6.32.11/kernel/ptrace.c
---- linux-2.6.32.11/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/ptrace.c linux-2.6.32.12/kernel/ptrace.c
+--- linux-2.6.32.12/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400
@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
@@ -48712,9 +49239,9 @@ diff -urNp linux-2.6.32.11/kernel/ptrace.c linux-2.6.32.11/kernel/ptrace.c
}
int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
-diff -urNp linux-2.6.32.11/kernel/rcutree.c linux-2.6.32.11/kernel/rcutree.c
---- linux-2.6.32.11/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/rcutree.c linux-2.6.32.12/kernel/rcutree.c
+--- linux-2.6.32.12/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400
@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
@@ -48724,9 +49251,9 @@ diff -urNp linux-2.6.32.11/kernel/rcutree.c linux-2.6.32.11/kernel/rcutree.c
{
/*
* Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c
---- linux-2.6.32.11/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/relay.c linux-2.6.32.12/kernel/relay.c
+--- linux-2.6.32.12/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400
@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
return 0;
@@ -48736,9 +49263,9 @@ diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c
return ret;
if (read_start + ret == nonpad_end)
-diff -urNp linux-2.6.32.11/kernel/resource.c linux-2.6.32.11/kernel/resource.c
---- linux-2.6.32.11/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400
+diff -urNp linux-2.6.32.12/kernel/resource.c linux-2.6.32.12/kernel/resource.c
+--- linux-2.6.32.12/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -48758,10 +49285,10 @@ diff -urNp linux-2.6.32.11/kernel/resource.c linux-2.6.32.11/kernel/resource.c
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
---- linux-2.6.32.11/kernel/sched.c 2010-04-04 20:41:50.068477203 -0400
-+++ linux-2.6.32.11/kernel/sched.c 2010-04-04 20:46:41.697788265 -0400
-@@ -4843,7 +4843,7 @@ out:
+diff -urNp linux-2.6.32.12/kernel/sched.c linux-2.6.32.12/kernel/sched.c
+--- linux-2.6.32.12/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400
++++ linux-2.6.32.12/kernel/sched.c 2010-04-29 17:49:58.717524885 -0400
+@@ -4841,7 +4841,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.
*/
@@ -48770,7 +49297,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
{
int this_cpu = smp_processor_id();
struct rq *this_rq = cpu_rq(this_cpu);
-@@ -6112,6 +6112,8 @@ int can_nice(const struct task_struct *p
+@@ -6110,6 +6110,8 @@ int can_nice(const struct task_struct *p
/* convert nice value [19,-20] to rlimit style value [1,40] */
int nice_rlim = 20 - nice;
@@ -48779,7 +49306,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}
-@@ -6145,7 +6147,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -6143,7 +6145,8 @@ SYSCALL_DEFINE1(nice, int, increment)
if (nice > 19)
nice = 19;
@@ -48789,7 +49316,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
return -EPERM;
retval = security_task_setnice(current, nice);
-@@ -6295,6 +6298,8 @@ recheck:
+@@ -6293,6 +6296,8 @@ recheck:
if (rt_policy(policy)) {
unsigned long rlim_rtprio;
@@ -48798,7 +49325,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
if (!lock_task_sighand(p, &flags))
return -ESRCH;
rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
-@@ -7447,7 +7452,7 @@ static struct ctl_table sd_ctl_dir[] = {
+@@ -7452,7 +7457,7 @@ static struct ctl_table sd_ctl_dir[] = {
.procname = "sched_domain",
.mode = 0555,
},
@@ -48807,7 +49334,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
};
static struct ctl_table sd_ctl_root[] = {
-@@ -7457,7 +7462,7 @@ static struct ctl_table sd_ctl_root[] =
+@@ -7462,7 +7467,7 @@ static struct ctl_table sd_ctl_root[] =
.mode = 0555,
.child = sd_ctl_dir,
},
@@ -48816,9 +49343,33 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
};
static struct ctl_table *sd_alloc_ctl_entry(int n)
-diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c
---- linux-2.6.32.11/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/signal.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/signal.c linux-2.6.32.12/kernel/signal.c
+--- linux-2.6.32.12/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/signal.c 2010-04-29 17:46:37.333938325 -0400
+@@ -41,12 +41,12 @@
+
+ static struct kmem_cache *sigqueue_cachep;
+
+-static void __user *sig_handler(struct task_struct *t, int sig)
++static __sighandler_t sig_handler(struct task_struct *t, int sig)
+ {
+ return t->sighand->action[sig - 1].sa.sa_handler;
+ }
+
+-static int sig_handler_ignored(void __user *handler, int sig)
++static int sig_handler_ignored(__sighandler_t handler, int sig)
+ {
+ /* Is it explicitly or implicitly ignored? */
+ return handler == SIG_IGN ||
+@@ -56,7 +56,7 @@ static int sig_handler_ignored(void __us
+ static int sig_task_ignored(struct task_struct *t, int sig,
+ int from_ancestor_ns)
+ {
+- void __user *handler;
++ __sighandler_t handler;
+
+ handler = sig_handler(t, sig);
+
@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
*/
user = get_uid(__task_cred(t)->user);
@@ -48829,6 +49380,15 @@ diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c
if (override_rlimit ||
atomic_read(&user->sigpending) <=
t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur)
+@@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct
+
+ int unhandled_signal(struct task_struct *tsk, int sig)
+ {
+- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
++ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
+ if (is_global_init(tsk))
+ return 1;
+ if (handler != SIG_IGN && handler != SIG_DFL)
@@ -625,6 +628,9 @@ static int check_kill_permission(int sig
}
}
@@ -48871,9 +49431,9 @@ diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c
return ret;
}
-diff -urNp linux-2.6.32.11/kernel/smp.c linux-2.6.32.11/kernel/smp.c
---- linux-2.6.32.11/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/smp.c linux-2.6.32.12/kernel/smp.c
+--- linux-2.6.32.12/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400
@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
}
EXPORT_SYMBOL(smp_call_function);
@@ -48901,9 +49461,9 @@ diff -urNp linux-2.6.32.11/kernel/smp.c linux-2.6.32.11/kernel/smp.c
{
spin_unlock_irq(&call_function.lock);
}
-diff -urNp linux-2.6.32.11/kernel/softirq.c linux-2.6.32.11/kernel/softirq.c
---- linux-2.6.32.11/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/softirq.c linux-2.6.32.12/kernel/softirq.c
+--- linux-2.6.32.12/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -48958,9 +49518,9 @@ diff -urNp linux-2.6.32.11/kernel/softirq.c linux-2.6.32.11/kernel/softirq.c
{
struct tasklet_struct *list;
-diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c
---- linux-2.6.32.11/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/sys.c linux-2.6.32.12/kernel/sys.c
+--- linux-2.6.32.12/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -49096,9 +49656,9 @@ diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c
error = -EINVAL;
break;
}
-diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c
---- linux-2.6.32.11/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/sysctl.c linux-2.6.32.12/kernel/sysctl.c
+--- linux-2.6.32.12/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400
@@ -63,6 +63,13 @@
static int deprecated_sysctl_warning(struct __sysctl_args *args);
@@ -49220,9 +49780,9 @@ diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c
error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
if (error)
return error;
-diff -urNp linux-2.6.32.11/kernel/taskstats.c linux-2.6.32.11/kernel/taskstats.c
---- linux-2.6.32.11/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/taskstats.c linux-2.6.32.12/kernel/taskstats.c
+--- linux-2.6.32.12/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400
@@ -26,9 +26,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -49246,9 +49806,9 @@ diff -urNp linux-2.6.32.11/kernel/taskstats.c linux-2.6.32.11/kernel/taskstats.c
if (!alloc_cpumask_var(&mask, GFP_KERNEL))
return -ENOMEM;
-diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/time/tick-broadcast.c
---- linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/time/tick-broadcast.c linux-2.6.32.12/kernel/time/tick-broadcast.c
+--- linux-2.6.32.12/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -49258,9 +49818,9 @@ diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/t
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c
---- linux-2.6.32.11/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/time.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/time.c linux-2.6.32.12/kernel/time.c
+--- linux-2.6.32.12/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/time.c 2010-04-04 20:46:41.701624986 -0400
@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
return err;
@@ -49298,9 +49858,9 @@ diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c
{
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.32.11/kernel/timer.c linux-2.6.32.11/kernel/timer.c
---- linux-2.6.32.11/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/timer.c linux-2.6.32.12/kernel/timer.c
+--- linux-2.6.32.12/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400
@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
@@ -49310,9 +49870,9 @@ diff -urNp linux-2.6.32.11/kernel/timer.c linux-2.6.32.11/kernel/timer.c
{
struct tvec_base *base = __get_cpu_var(tvec_bases);
-diff -urNp linux-2.6.32.11/kernel/trace/ftrace.c linux-2.6.32.11/kernel/trace/ftrace.c
---- linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400
-+++ linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/trace/ftrace.c linux-2.6.32.12/kernel/trace/ftrace.c
+--- linux-2.6.32.12/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400
++++ linux-2.6.32.12/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400
@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
@@ -49334,9 +49894,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/ftrace.c linux-2.6.32.11/kernel/trace/ft
}
/*
-diff -urNp linux-2.6.32.11/kernel/trace/Kconfig linux-2.6.32.11/kernel/trace/Kconfig
---- linux-2.6.32.11/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400
+diff -urNp linux-2.6.32.12/kernel/trace/Kconfig linux-2.6.32.12/kernel/trace/Kconfig
+--- linux-2.6.32.12/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400
@@ -126,6 +126,7 @@ if FTRACE
config FUNCTION_TRACER
bool "Kernel Function Tracer"
@@ -49353,9 +49913,21 @@ diff -urNp linux-2.6.32.11/kernel/trace/Kconfig linux-2.6.32.11/kernel/trace/Kco
select FUNCTION_TRACER
select STACKTRACE
select KALLSYMS
-diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/trace.c
---- linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400
-+++ linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/kernel/trace/ring_buffer.c linux-2.6.32.12/kernel/trace/ring_buffer.c
+--- linux-2.6.32.12/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400
++++ linux-2.6.32.12/kernel/trace/ring_buffer.c 2010-04-29 17:46:37.362529614 -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.
+ */
+-static int inline
++static inline int
+ 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.12/kernel/trace/trace.c linux-2.6.32.12/kernel/trace/trace.c
+--- linux-2.6.32.12/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400
++++ linux-2.6.32.12/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400
@@ -3808,10 +3808,9 @@ static const struct file_operations trac
};
#endif
@@ -49380,9 +49952,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/tra
static int once;
struct dentry *d_tracer;
-diff -urNp linux-2.6.32.11/kernel/trace/trace_events.c linux-2.6.32.11/kernel/trace/trace_events.c
---- linux-2.6.32.11/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/kernel/trace/trace_events.c linux-2.6.32.12/kernel/trace/trace_events.c
+--- linux-2.6.32.12/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400
@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
* Modules must own their file_operations to keep up with
* reference counting.
@@ -49392,9 +49964,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_events.c linux-2.6.32.11/kernel/tr
struct ftrace_module_file_ops {
struct list_head list;
struct module *mod;
-diff -urNp linux-2.6.32.11/kernel/trace/trace_output.c linux-2.6.32.11/kernel/trace/trace_output.c
---- linux-2.6.32.11/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/kernel/trace/trace_output.c linux-2.6.32.12/kernel/trace/trace_output.c
+--- linux-2.6.32.12/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -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);
@@ -49404,9 +49976,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_output.c linux-2.6.32.11/kernel/tr
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/trace/trace_stack.c
---- linux-2.6.32.11/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/kernel/trace/trace_stack.c linux-2.6.32.12/kernel/trace/trace_stack.c
+--- linux-2.6.32.12/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -49416,9 +49988,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/tra
return;
local_irq_save(flags);
-diff -urNp linux-2.6.32.11/kernel/utsname_sysctl.c linux-2.6.32.11/kernel/utsname_sysctl.c
---- linux-2.6.32.11/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/kernel/utsname_sysctl.c linux-2.6.32.12/kernel/utsname_sysctl.c
+--- linux-2.6.32.12/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400
@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
.proc_handler = proc_do_uts_string,
.strategy = sysctl_uts_string,
@@ -49437,9 +50009,9 @@ diff -urNp linux-2.6.32.11/kernel/utsname_sysctl.c linux-2.6.32.11/kernel/utsnam
};
static int __init utsname_sysctl_init(void)
-diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c
---- linux-2.6.32.11/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/bug.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/bug.c linux-2.6.32.12/lib/bug.c
+--- linux-2.6.32.12/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/bug.c 2010-04-04 20:46:41.705142860 -0400
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -49449,9 +50021,9 @@ diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c
printk(KERN_EMERG "------------[ cut here ]------------\n");
-diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c
---- linux-2.6.32.11/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/debugobjects.c linux-2.6.32.12/lib/debugobjects.c
+--- linux-2.6.32.12/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400
@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -49461,9 +50033,9 @@ diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c
if (is_on_stack == onstack)
return;
-diff -urNp linux-2.6.32.11/lib/dma-debug.c linux-2.6.32.11/lib/dma-debug.c
---- linux-2.6.32.11/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/dma-debug.c linux-2.6.32.12/lib/dma-debug.c
+--- linux-2.6.32.12/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400
@@ -861,7 +861,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -49473,9 +50045,9 @@ diff -urNp linux-2.6.32.11/lib/dma-debug.c linux-2.6.32.11/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.11/lib/idr.c linux-2.6.32.11/lib/idr.c
---- linux-2.6.32.11/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/idr.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/idr.c linux-2.6.32.12/lib/idr.c
+--- linux-2.6.32.12/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/idr.c 2010-04-04 20:46:41.705142860 -0400
@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
@@ -49485,9 +50057,9 @@ diff -urNp linux-2.6.32.11/lib/idr.c linux-2.6.32.11/lib/idr.c
*starting_id = id;
return IDR_NEED_TO_GROW;
}
-diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c
---- linux-2.6.32.11/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/inflate.c linux-2.6.32.12/lib/inflate.c
+--- linux-2.6.32.12/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400
@@ -266,7 +266,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -49497,9 +50069,9 @@ diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/lib/Kconfig.debug
---- linux-2.6.32.11/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/Kconfig.debug linux-2.6.32.12/lib/Kconfig.debug
+--- linux-2.6.32.12/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400
@@ -905,7 +905,7 @@ config LATENCYTOP
select STACKTRACE
select SCHEDSTATS
@@ -49509,9 +50081,9 @@ diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/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.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c
---- linux-2.6.32.11/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/kobject.c linux-2.6.32.12/lib/kobject.c
+--- linux-2.6.32.12/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
return ret;
}
@@ -49539,9 +50111,9 @@ diff -urNp linux-2.6.32.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c
struct kobject *parent_kobj)
{
struct kset *kset;
-diff -urNp linux-2.6.32.11/lib/kobject_uevent.c linux-2.6.32.11/lib/kobject_uevent.c
---- linux-2.6.32.11/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/kobject_uevent.c linux-2.6.32.12/lib/kobject_uevent.c
+--- linux-2.6.32.12/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
const char *subsystem;
struct kobject *top_kobj;
@@ -49551,9 +50123,9 @@ diff -urNp linux-2.6.32.11/lib/kobject_uevent.c linux-2.6.32.11/lib/kobject_ueve
u64 seq;
int i = 0;
int retval = 0;
-diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c
---- linux-2.6.32.11/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/parser.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/parser.c linux-2.6.32.12/lib/parser.c
+--- linux-2.6.32.12/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/parser.c 2010-04-04 20:46:41.705142860 -0400
@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
@@ -49563,9 +50135,9 @@ diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c
if (!buf)
return -ENOMEM;
memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.32.11/lib/radix-tree.c linux-2.6.32.11/lib/radix-tree.c
---- linux-2.6.32.11/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/radix-tree.c linux-2.6.32.12/lib/radix-tree.c
+--- linux-2.6.32.12/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400
@@ -81,7 +81,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -49575,9 +50147,9 @@ diff -urNp linux-2.6.32.11/lib/radix-tree.c linux-2.6.32.11/lib/radix-tree.c
static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
{
-diff -urNp linux-2.6.32.11/lib/random32.c linux-2.6.32.11/lib/random32.c
---- linux-2.6.32.11/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/lib/random32.c 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/lib/random32.c linux-2.6.32.12/lib/random32.c
+--- linux-2.6.32.12/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/lib/random32.c 2010-04-04 20:46:41.705142860 -0400
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
@@ -49587,14 +50159,14 @@ diff -urNp linux-2.6.32.11/lib/random32.c linux-2.6.32.11/lib/random32.c
}
/**
-diff -urNp linux-2.6.32.11/localversion-grsec linux-2.6.32.11/localversion-grsec
---- linux-2.6.32.11/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.11/localversion-grsec 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/localversion-grsec linux-2.6.32.12/localversion-grsec
+--- linux-2.6.32.12/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.12/localversion-grsec 2010-04-04 20:46:41.705142860 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile
---- linux-2.6.32.11/Makefile 2010-04-04 20:41:49.914404054 -0400
-+++ linux-2.6.32.11/Makefile 2010-04-04 20:46:41.705142860 -0400
+diff -urNp linux-2.6.32.12/Makefile linux-2.6.32.12/Makefile
+--- linux-2.6.32.12/Makefile 2010-04-29 17:49:37.365428457 -0400
++++ linux-2.6.32.12/Makefile 2010-04-29 17:49:57.861101311 -0400
@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -49615,9 +50187,9 @@ diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c
---- linux-2.6.32.11/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/filemap.c linux-2.6.32.12/mm/filemap.c
+--- linux-2.6.32.12/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400
@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -49635,9 +50207,9 @@ diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.32.11/mm/fremap.c linux-2.6.32.11/mm/fremap.c
---- linux-2.6.32.11/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/fremap.c linux-2.6.32.12/mm/fremap.c
+--- linux-2.6.32.12/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -49650,9 +50222,9 @@ diff -urNp linux-2.6.32.11/mm/fremap.c linux-2.6.32.11/mm/fremap.c
/*
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
-diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c
---- linux-2.6.32.11/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/highmem.c linux-2.6.32.12/mm/highmem.c
+--- linux-2.6.32.12/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -49678,9 +50250,9 @@ diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c
---- linux-2.6.32.11/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c
+--- linux-2.6.32.12/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400
@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -49760,9 +50332,9 @@ diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/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.11/mm/Kconfig linux-2.6.32.11/mm/Kconfig
---- linux-2.6.32.11/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/Kconfig linux-2.6.32.12/mm/Kconfig
+--- linux-2.6.32.12/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400
@@ -228,7 +228,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
@@ -49772,9 +50344,9 @@ diff -urNp linux-2.6.32.11/mm/Kconfig linux-2.6.32.11/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.11/mm/maccess.c linux-2.6.32.11/mm/maccess.c
---- linux-2.6.32.11/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/maccess.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/maccess.c linux-2.6.32.12/mm/maccess.c
+--- linux-2.6.32.12/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/maccess.c 2010-04-04 20:46:41.708732353 -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.
@@ -49793,9 +50365,9 @@ diff -urNp linux-2.6.32.11/mm/maccess.c linux-2.6.32.11/mm/maccess.c
{
long ret;
mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.32.11/mm/madvise.c linux-2.6.32.11/mm/madvise.c
---- linux-2.6.32.11/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/madvise.c linux-2.6.32.12/mm/madvise.c
+--- linux-2.6.32.12/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400
@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -49872,9 +50444,9 @@ diff -urNp linux-2.6.32.11/mm/madvise.c linux-2.6.32.11/mm/madvise.c
error = 0;
if (end == start)
goto out;
-diff -urNp linux-2.6.32.11/mm/memory.c linux-2.6.32.11/mm/memory.c
---- linux-2.6.32.11/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/memory.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/memory.c linux-2.6.32.12/mm/memory.c
+--- linux-2.6.32.12/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/memory.c 2010-04-04 20:46:41.708732353 -0400
@@ -48,6 +48,7 @@
#include <linux/ksm.h>
#include <linux/rmap.h>
@@ -50279,9 +50851,9 @@ diff -urNp linux-2.6.32.11/mm/memory.c linux-2.6.32.11/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.11/mm/memory-failure.c linux-2.6.32.11/mm/memory-failure.c
---- linux-2.6.32.11/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/memory-failure.c linux-2.6.32.12/mm/memory-failure.c
+--- linux-2.6.32.12/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400
@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -50300,9 +50872,9 @@ diff -urNp linux-2.6.32.11/mm/memory-failure.c linux-2.6.32.11/mm/memory-failure
/*
* We need/can do nothing about count=0 pages.
-diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/mm/mempolicy.c
---- linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400
-+++ linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/mempolicy.c linux-2.6.32.12/mm/mempolicy.c
+--- linux-2.6.32.12/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400
++++ linux-2.6.32.12/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
struct vm_area_struct *next;
int err;
@@ -50383,9 +50955,9 @@ diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/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.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c
---- linux-2.6.32.11/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/migrate.c linux-2.6.32.12/mm/migrate.c
+--- linux-2.6.32.12/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400
@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
@@ -50411,9 +50983,9 @@ diff -urNp linux-2.6.32.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-2.6.32.11/mm/mlock.c linux-2.6.32.11/mm/mlock.c
---- linux-2.6.32.11/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400
+diff -urNp linux-2.6.32.12/mm/mlock.c linux-2.6.32.12/mm/mlock.c
+--- linux-2.6.32.12/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -50482,9 +51054,9 @@ diff -urNp linux-2.6.32.11/mm/mlock.c linux-2.6.32.11/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.11/mm/mmap.c linux-2.6.32.11/mm/mmap.c
---- linux-2.6.32.11/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400
+diff -urNp linux-2.6.32.12/mm/mmap.c linux-2.6.32.12/mm/mmap.c
+--- linux-2.6.32.12/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400
@@ -45,6 +45,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -51573,9 +52145,9 @@ diff -urNp linux-2.6.32.11/mm/mmap.c linux-2.6.32.11/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.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c
---- linux-2.6.32.11/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400
+diff -urNp linux-2.6.32.12/mm/mprotect.c linux-2.6.32.12/mm/mprotect.c
+--- linux-2.6.32.12/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400
@@ -24,10 +24,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -51766,9 +52338,9 @@ diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.32.11/mm/mremap.c linux-2.6.32.11/mm/mremap.c
---- linux-2.6.32.11/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400
+diff -urNp linux-2.6.32.12/mm/mremap.c linux-2.6.32.12/mm/mremap.c
+--- linux-2.6.32.12/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400
@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -51869,9 +52441,9 @@ diff -urNp linux-2.6.32.11/mm/mremap.c linux-2.6.32.11/mm/mremap.c
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c
---- linux-2.6.32.11/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400
+diff -urNp linux-2.6.32.12/mm/nommu.c linux-2.6.32.12/mm/nommu.c
+--- linux-2.6.32.12/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400
@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
EXPORT_SYMBOL(find_vma);
@@ -51888,9 +52460,9 @@ diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c
* expand a stack to a given address
* - not supported under NOMMU conditions
*/
-diff -urNp linux-2.6.32.11/mm/page_alloc.c linux-2.6.32.11/mm/page_alloc.c
---- linux-2.6.32.11/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/page_alloc.c 2010-04-04 20:46:41.713805609 -0400
+diff -urNp linux-2.6.32.12/mm/page_alloc.c linux-2.6.32.12/mm/page_alloc.c
+--- linux-2.6.32.12/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/page_alloc.c 2010-04-29 17:46:37.045244082 -0400
@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = __TestClearPageMlocked(page);
@@ -51938,9 +52510,18 @@ diff -urNp linux-2.6.32.11/mm/page_alloc.c linux-2.6.32.11/mm/page_alloc.c
arch_free_page(page, 0);
kernel_map_pages(page, 1, 0);
-diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/mm/percpu.c
---- linux-2.6.32.11/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400
+@@ -3723,7 +3740,7 @@ static void __init setup_usemap(struct p
+ zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
+ }
+ #else
+-static void inline setup_usemap(struct pglist_data *pgdat,
++static inline void setup_usemap(struct pglist_data *pgdat,
+ struct zone *zone, unsigned long zonesize) {}
+ #endif /* CONFIG_SPARSEMEM */
+
+diff -urNp linux-2.6.32.12/mm/percpu.c linux-2.6.32.12/mm/percpu.c
+--- linux-2.6.32.12/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400
@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -51950,9 +52531,9 @@ diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/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.11/mm/rmap.c linux-2.6.32.11/mm/rmap.c
---- linux-2.6.32.11/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400
+diff -urNp linux-2.6.32.12/mm/rmap.c linux-2.6.32.12/mm/rmap.c
+--- linux-2.6.32.12/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400
@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
struct mm_struct *mm = vma->vm_mm;
struct anon_vma *allocated;
@@ -51980,9 +52561,9 @@ diff -urNp linux-2.6.32.11/mm/rmap.c linux-2.6.32.11/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.11/mm/shmem.c linux-2.6.32.11/mm/shmem.c
---- linux-2.6.32.11/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/mm/shmem.c linux-2.6.32.12/mm/shmem.c
+--- linux-2.6.32.12/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400
@@ -31,7 +31,7 @@
#include <linux/swap.h>
#include <linux/ima.h>
@@ -51992,9 +52573,9 @@ diff -urNp linux-2.6.32.11/mm/shmem.c linux-2.6.32.11/mm/shmem.c
#ifdef CONFIG_SHMEM
/*
-diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c
---- linux-2.6.32.11/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/slab.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/mm/slab.c linux-2.6.32.12/mm/slab.c
+--- linux-2.6.32.12/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/slab.c 2010-04-04 20:46:41.716811517 -0400
@@ -308,7 +308,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
@@ -52092,9 +52673,9 @@ diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/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.11/mm/slob.c linux-2.6.32.11/mm/slob.c
---- linux-2.6.32.11/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/slob.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/mm/slob.c linux-2.6.32.12/mm/slob.c
+--- linux-2.6.32.12/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/slob.c 2010-04-04 20:46:41.716811517 -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
@@ -52415,9 +52996,9 @@ diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c
---- linux-2.6.32.11/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/slub.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/mm/slub.c linux-2.6.32.12/mm/slub.c
+--- linux-2.6.32.12/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/slub.c 2010-04-04 20:46:41.716811517 -0400
@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
page = virt_to_head_page(x);
@@ -52574,9 +53155,9 @@ diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c
static void print_slabinfo_header(struct seq_file *m)
{
seq_puts(m, "slabinfo - version: 2.1\n");
-diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c
---- linux-2.6.32.11/mm/util.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/util.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/mm/util.c linux-2.6.32.12/mm/util.c
+--- linux-2.6.32.12/mm/util.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/util.c 2010-04-04 20:46:41.716811517 -0400
@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -52590,9 +53171,9 @@ diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c
---- linux-2.6.32.11/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c
+--- linux-2.6.32.12/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -52803,9 +53384,22 @@ diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c
void *vmalloc_32_user(unsigned long size)
{
struct vm_struct *area;
-diff -urNp linux-2.6.32.11/net/atm/atm_misc.c linux-2.6.32.11/net/atm/atm_misc.c
---- linux-2.6.32.11/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/net/8021q/vlan.c linux-2.6.32.12/net/8021q/vlan.c
+--- linux-2.6.32.12/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/8021q/vlan.c 2010-04-29 17:46:37.373258882 -0400
+@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
+ err = -EPERM;
+ if (!capable(CAP_NET_ADMIN))
+ break;
+- if ((args.u.name_type >= 0) &&
+- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
++ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
+ struct vlan_net *vn;
+
+ vn = net_generic(net, vlan_net_id);
+diff -urNp linux-2.6.32.12/net/atm/atm_misc.c linux-2.6.32.12/net/atm/atm_misc.c
+--- linux-2.6.32.12/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -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;
@@ -52842,9 +53436,9 @@ diff -urNp linux-2.6.32.11/net/atm/atm_misc.c linux-2.6.32.11/net/atm/atm_misc.c
__SONET_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c
---- linux-2.6.32.11/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/net/atm/proc.c linux-2.6.32.12/net/atm/proc.c
+--- linux-2.6.32.12/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -52858,9 +53452,9 @@ diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c
}
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-2.6.32.11/net/atm/resources.c linux-2.6.32.11/net/atm/resources.c
---- linux-2.6.32.11/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/atm/resources.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/net/atm/resources.c linux-2.6.32.12/net/atm/resources.c
+--- linux-2.6.32.12/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/atm/resources.c 2010-04-04 20:46:41.716811517 -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)
@@ -52879,9 +53473,9 @@ diff -urNp linux-2.6.32.11/net/atm/resources.c linux-2.6.32.11/net/atm/resources
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.32.11/net/bridge/br_private.h linux-2.6.32.11/net/bridge/br_private.h
---- linux-2.6.32.11/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/net/bridge/br_private.h linux-2.6.32.12/net/bridge/br_private.h
+--- linux-2.6.32.12/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400
@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
#ifdef CONFIG_SYSFS
@@ -52891,9 +53485,9 @@ diff -urNp linux-2.6.32.11/net/bridge/br_private.h linux-2.6.32.11/net/bridge/br
extern int br_sysfs_addif(struct net_bridge_port *p);
/* br_sysfs_br.c */
-diff -urNp linux-2.6.32.11/net/bridge/br_stp_if.c linux-2.6.32.11/net/bridge/br_stp_if.c
---- linux-2.6.32.11/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/net/bridge/br_stp_if.c linux-2.6.32.12/net/bridge/br_stp_if.c
+--- linux-2.6.32.12/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
@@ -52903,9 +53497,9 @@ diff -urNp linux-2.6.32.11/net/bridge/br_stp_if.c linux-2.6.32.11/net/bridge/br_
printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
br->dev->name, r);
-diff -urNp linux-2.6.32.11/net/bridge/br_sysfs_if.c linux-2.6.32.11/net/bridge/br_sysfs_if.c
---- linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400
+diff -urNp linux-2.6.32.12/net/bridge/br_sysfs_if.c linux-2.6.32.12/net/bridge/br_sysfs_if.c
+--- linux-2.6.32.12/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400
@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
return ret;
}
@@ -52915,9 +53509,9 @@ diff -urNp linux-2.6.32.11/net/bridge/br_sysfs_if.c linux-2.6.32.11/net/bridge/b
.show = brport_show,
.store = brport_store,
};
-diff -urNp linux-2.6.32.11/net/core/dev.c linux-2.6.32.11/net/core/dev.c
---- linux-2.6.32.11/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/core/dev.c linux-2.6.32.12/net/core/dev.c
+--- linux-2.6.32.12/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400
@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
@@ -52936,9 +53530,9 @@ diff -urNp linux-2.6.32.11/net/core/dev.c linux-2.6.32.11/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.11/net/core/flow.c linux-2.6.32.11/net/core/flow.c
---- linux-2.6.32.11/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/core/flow.c linux-2.6.32.12/net/core/flow.c
+--- linux-2.6.32.12/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
static u32 flow_hash_shift;
@@ -52966,9 +53560,9 @@ diff -urNp linux-2.6.32.11/net/core/flow.c linux-2.6.32.11/net/core/flow.c
#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
-diff -urNp linux-2.6.32.11/net/dccp/ccids/ccid3.c linux-2.6.32.11/net/dccp/ccids/ccid3.c
---- linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/dccp/ccids/ccid3.c linux-2.6.32.12/net/dccp/ccids/ccid3.c
+--- linux-2.6.32.12/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400
@@ -41,7 +41,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -52978,9 +53572,9 @@ diff -urNp linux-2.6.32.11/net/dccp/ccids/ccid3.c linux-2.6.32.11/net/dccp/ccids
#endif
/*
-diff -urNp linux-2.6.32.11/net/dccp/dccp.h linux-2.6.32.11/net/dccp/dccp.h
---- linux-2.6.32.11/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/dccp/dccp.h linux-2.6.32.12/net/dccp/dccp.h
+--- linux-2.6.32.12/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400
@@ -44,9 +44,9 @@ extern int dccp_debug;
#define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
#define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -52994,9 +53588,9 @@ diff -urNp linux-2.6.32.11/net/dccp/dccp.h linux-2.6.32.11/net/dccp/dccp.h
#endif
extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.32.11/net/decnet/sysctl_net_decnet.c linux-2.6.32.11/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/decnet/sysctl_net_decnet.c linux-2.6.32.12/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400
@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -53015,9 +53609,9 @@ diff -urNp linux-2.6.32.11/net/decnet/sysctl_net_decnet.c linux-2.6.32.11/net/de
return -EFAULT;
*lenp = len;
-diff -urNp linux-2.6.32.11/net/ipv4/inet_hashtables.c linux-2.6.32.11/net/ipv4/inet_hashtables.c
---- linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/inet_hashtables.c linux-2.6.32.12/net/ipv4/inet_hashtables.c
+--- linux-2.6.32.12/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -53042,9 +53636,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/inet_hashtables.c linux-2.6.32.11/net/ipv4/i
if (tw) {
inet_twsk_deschedule(tw, death_row);
inet_twsk_put(tw);
-diff -urNp linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -53054,9 +53648,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1
if (*octets == NULL) {
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.32.11/net/ipv4/tcp_ipv4.c linux-2.6.32.11/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/tcp_ipv4.c linux-2.6.32.12/net/ipv4/tcp_ipv4.c
+--- linux-2.6.32.12/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400
@@ -84,6 +84,9 @@
int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
@@ -53101,9 +53695,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_ipv4.c linux-2.6.32.11/net/ipv4/tcp_ipv4
tcp_v4_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.32.11/net/ipv4/tcp_minisocks.c linux-2.6.32.11/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/tcp_minisocks.c linux-2.6.32.12/net/ipv4/tcp_minisocks.c
+--- linux-2.6.32.12/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -53126,9 +53720,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_minisocks.c linux-2.6.32.11/net/ipv4/tcp
if (!(flg & TCP_FLAG_RST))
req->rsk_ops->send_reset(sk, skb);
-diff -urNp linux-2.6.32.11/net/ipv4/tcp_probe.c linux-2.6.32.11/net/ipv4/tcp_probe.c
---- linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/tcp_probe.c linux-2.6.32.12/net/ipv4/tcp_probe.c
+--- linux-2.6.32.12/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400
@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -53138,9 +53732,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_probe.c linux-2.6.32.11/net/ipv4/tcp_pro
return -EFAULT;
cnt += width;
}
-diff -urNp linux-2.6.32.11/net/ipv4/tcp_timer.c linux-2.6.32.11/net/ipv4/tcp_timer.c
---- linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/tcp_timer.c linux-2.6.32.12/net/ipv4/tcp_timer.c
+--- linux-2.6.32.12/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400
@@ -21,6 +21,10 @@
#include <linux/module.h>
#include <net/tcp.h>
@@ -53166,9 +53760,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/tcp_timer.c linux-2.6.32.11/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.11/net/ipv4/udp.c linux-2.6.32.11/net/ipv4/udp.c
---- linux-2.6.32.11/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/ipv4/udp.c linux-2.6.32.12/net/ipv4/udp.c
+--- linux-2.6.32.12/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -53238,9 +53832,9 @@ diff -urNp linux-2.6.32.11/net/ipv4/udp.c linux-2.6.32.11/net/ipv4/udp.c
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-diff -urNp linux-2.6.32.11/net/ipv6/exthdrs.c linux-2.6.32.11/net/ipv6/exthdrs.c
---- linux-2.6.32.11/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/ipv6/exthdrs.c linux-2.6.32.12/net/ipv6/exthdrs.c
+--- linux-2.6.32.12/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400
@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
@@ -53250,9 +53844,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/exthdrs.c linux-2.6.32.11/net/ipv6/exthdrs.c
};
int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c
---- linux-2.6.32.11/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/ipv6/raw.c linux-2.6.32.12/net/ipv6/raw.c
+--- linux-2.6.32.12/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400
@@ -600,7 +600,7 @@ out:
return err;
}
@@ -53262,9 +53856,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c
struct flowi *fl, struct rt6_info *rt,
unsigned int flags)
{
-diff -urNp linux-2.6.32.11/net/ipv6/tcp_ipv6.c linux-2.6.32.11/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/ipv6/tcp_ipv6.c linux-2.6.32.12/net/ipv6/tcp_ipv6.c
+--- linux-2.6.32.12/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400
@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
return 0;
@@ -53285,9 +53879,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/tcp_ipv6.c linux-2.6.32.11/net/ipv6/tcp_ipv6
tcp_v6_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.32.11/net/ipv6/udp.c linux-2.6.32.11/net/ipv6/udp.c
---- linux-2.6.32.11/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/ipv6/udp.c linux-2.6.32.12/net/ipv6/udp.c
+--- linux-2.6.32.12/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400
@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
proto == IPPROTO_UDPLITE);
@@ -53298,9 +53892,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/udp.c linux-2.6.32.11/net/ipv6/udp.c
icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
kfree_skb(skb);
-diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -53423,9 +54017,9 @@ diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/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.11/net/mac80211/ieee80211_i.h linux-2.6.32.11/net/mac80211/ieee80211_i.h
---- linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400
-+++ linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/mac80211/ieee80211_i.h linux-2.6.32.12/net/mac80211/ieee80211_i.h
+--- linux-2.6.32.12/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400
++++ linux-2.6.32.12/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400
@@ -635,7 +635,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
@@ -53435,9 +54029,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/ieee80211_i.h linux-2.6.32.11/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.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/iface.c
---- linux-2.6.32.11/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/mac80211/iface.c linux-2.6.32.12/net/mac80211/iface.c
+--- linux-2.6.32.12/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400
@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
break;
}
@@ -53492,9 +54086,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/ifa
ieee80211_clear_tx_pending(local);
ieee80211_stop_device(local);
-diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main.c
---- linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400
-+++ linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/mac80211/main.c linux-2.6.32.12/net/mac80211/main.c
+--- linux-2.6.32.12/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400
++++ linux-2.6.32.12/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400
@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -53504,9 +54098,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c
---- linux-2.6.32.11/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/mac80211/pm.c linux-2.6.32.12/net/mac80211/pm.c
+--- linux-2.6.32.12/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400
@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -53516,9 +54110,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c
ieee80211_stop_device(local);
local->suspended = true;
-diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate.c
---- linux-2.6.32.11/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/mac80211/rate.c linux-2.6.32.12/net/mac80211/rate.c
+--- linux-2.6.32.12/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400
@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
struct rate_control_ref *ref, *old;
@@ -53528,9 +54122,21 @@ diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate
return -EBUSY;
ref = rate_control_alloc(name, local);
-diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util.c
---- linux-2.6.32.11/net/mac80211/util.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/mac80211/util.c 2010-04-04 20:46:41.724917264 -0400
+diff -urNp linux-2.6.32.12/net/mac80211/tx.c linux-2.6.32.12/net/mac80211/tx.c
+--- linux-2.6.32.12/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400
++++ linux-2.6.32.12/net/mac80211/tx.c 2010-04-29 17:49:58.741536660 -0400
+@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
+ return cpu_to_le16(dur);
+ }
+
+-static int inline is_ieee80211_device(struct ieee80211_local *local,
++static inline int is_ieee80211_device(struct ieee80211_local *local,
+ struct net_device *dev)
+ {
+ return local == wdev_priv(dev->ieee80211_ptr);
+diff -urNp linux-2.6.32.12/net/mac80211/util.c linux-2.6.32.12/net/mac80211/util.c
+--- linux-2.6.32.12/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400
++++ linux-2.6.32.12/net/mac80211/util.c 2010-04-29 17:49:58.749029456 -0400
@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
@@ -53548,9 +54154,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util
if (res) {
WARN(local->suspended, "Harware became unavailable "
"upon resume. This is could be a software issue"
-diff -urNp linux-2.6.32.11/net/sctp/socket.c linux-2.6.32.11/net/sctp/socket.c
---- linux-2.6.32.11/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/net/sctp/socket.c linux-2.6.32.12/net/sctp/socket.c
+--- linux-2.6.32.12/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400
@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
@@ -53568,9 +54174,9 @@ diff -urNp linux-2.6.32.11/net/sctp/socket.c linux-2.6.32.11/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.11/net/socket.c linux-2.6.32.11/net/socket.c
---- linux-2.6.32.11/net/socket.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/socket.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/net/socket.c linux-2.6.32.12/net/socket.c
+--- linux-2.6.32.12/net/socket.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/socket.c 2010-04-04 20:46:41.728797784 -0400
@@ -87,6 +87,7 @@
#include <linux/wireless.h>
#include <linux/nsproxy.h>
@@ -53725,9 +54331,9 @@ diff -urNp linux-2.6.32.11/net/socket.c linux-2.6.32.11/net/socket.c
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-diff -urNp linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400
@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
len -= *ppos;
if (len > *lenp)
@@ -53737,9 +54343,9 @@ diff -urNp linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.11/net/su
return -EFAULT;
*lenp = len;
*ppos += len;
-diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c
---- linux-2.6.32.11/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/net/sysctl_net.c linux-2.6.32.12/net/sysctl_net.c
+--- linux-2.6.32.12/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -53749,9 +54355,24 @@ diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c
int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode;
}
-diff -urNp linux-2.6.32.11/net/unix/af_unix.c linux-2.6.32.11/net/unix/af_unix.c
---- linux-2.6.32.11/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/net/tipc/socket.c linux-2.6.32.12/net/tipc/socket.c
+--- linux-2.6.32.12/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/tipc/socket.c 2010-04-29 17:46:37.401277007 -0400
+@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
+ } else {
+ if (res == 0)
+ res = -ETIMEDOUT;
+- else
+- ; /* leave "res" unchanged */
++ else {
++ /* leave "res" unchanged */
++ }
+ sock->state = SS_DISCONNECTING;
+ }
+
+diff -urNp linux-2.6.32.12/net/unix/af_unix.c linux-2.6.32.12/net/unix/af_unix.c
+--- linux-2.6.32.12/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400
@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -53809,9 +54430,39 @@ diff -urNp linux-2.6.32.11/net/unix/af_unix.c linux-2.6.32.11/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)];
-diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/samples/kobject/kset-example.c
---- linux-2.6.32.11/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/net/xfrm/xfrm_policy.c linux-2.6.32.12/net/xfrm/xfrm_policy.c
+--- linux-2.6.32.12/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/net/xfrm/xfrm_policy.c 2010-04-29 17:46:37.421275445 -0400
+@@ -1477,7 +1477,7 @@ free_dst:
+ goto out;
+ }
+
+-static int inline
++static inline int
+ xfrm_dst_alloc_copy(void **target, void *src, int size)
+ {
+ if (!*target) {
+@@ -1489,7 +1489,7 @@ xfrm_dst_alloc_copy(void **target, void
+ return 0;
+ }
+
+-static int inline
++static inline int
+ xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
+ {
+ #ifdef CONFIG_XFRM_SUB_POLICY
+@@ -1501,7 +1501,7 @@ xfrm_dst_update_parent(struct dst_entry
+ #endif
+ }
+
+-static int inline
++static inline int
+ xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
+ {
+ #ifdef CONFIG_XFRM_SUB_POLICY
+diff -urNp linux-2.6.32.12/samples/kobject/kset-example.c linux-2.6.32.12/samples/kobject/kset-example.c
+--- linux-2.6.32.12/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400
@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
}
@@ -53821,9 +54472,9 @@ diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/sample
.show = foo_attr_show,
.store = foo_attr_store,
};
-diff -urNp linux-2.6.32.11/scripts/basic/fixdep.c linux-2.6.32.11/scripts/basic/fixdep.c
---- linux-2.6.32.11/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/basic/fixdep.c linux-2.6.32.12/scripts/basic/fixdep.c
+--- linux-2.6.32.12/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400
@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
static void parse_config_file(char *map, size_t len)
@@ -53845,9 +54496,9 @@ diff -urNp linux-2.6.32.11/scripts/basic/fixdep.c linux-2.6.32.11/scripts/basic/
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.32.11/scripts/kallsyms.c linux-2.6.32.11/scripts/kallsyms.c
---- linux-2.6.32.11/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/kallsyms.c linux-2.6.32.12/scripts/kallsyms.c
+--- linux-2.6.32.12/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
@@ -53863,9 +54514,9 @@ diff -urNp linux-2.6.32.11/scripts/kallsyms.c linux-2.6.32.11/scripts/kallsyms.c
};
#define text_range_text (&text_ranges[0])
#define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/file2alias.c
---- linux-2.6.32.11/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/mod/file2alias.c linux-2.6.32.12/scripts/mod/file2alias.c
+--- linux-2.6.32.12/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -53920,9 +54571,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/
sprintf(alias, "dmi*");
-diff -urNp linux-2.6.32.11/scripts/mod/modpost.c linux-2.6.32.11/scripts/mod/modpost.c
---- linux-2.6.32.11/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/mod/modpost.c linux-2.6.32.12/scripts/mod/modpost.c
+--- linux-2.6.32.12/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400
@@ -835,6 +835,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
@@ -53990,9 +54641,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/modpost.c linux-2.6.32.11/scripts/mod/mod
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.32.11/scripts/mod/modpost.h linux-2.6.32.11/scripts/mod/modpost.h
---- linux-2.6.32.11/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/mod/modpost.h linux-2.6.32.12/scripts/mod/modpost.h
+--- linux-2.6.32.12/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -54012,9 +54663,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/modpost.h linux-2.6.32.11/scripts/mod/mod
struct module {
struct module *next;
-diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/sumversion.c
---- linux-2.6.32.11/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/mod/sumversion.c linux-2.6.32.12/scripts/mod/sumversion.c
+--- linux-2.6.32.12/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400
@@ -455,7 +455,7 @@ static void write_version(const char *fi
goto out;
}
@@ -54024,9 +54675,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/
warn("writing sum in %s failed: %s\n",
filename, strerror(errno));
goto out;
-diff -urNp linux-2.6.32.11/scripts/pnmtologo.c linux-2.6.32.11/scripts/pnmtologo.c
---- linux-2.6.32.11/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/scripts/pnmtologo.c linux-2.6.32.12/scripts/pnmtologo.c
+--- linux-2.6.32.12/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -54053,9 +54704,9 @@ diff -urNp linux-2.6.32.11/scripts/pnmtologo.c linux-2.6.32.11/scripts/pnmtologo
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.32.11/security/commoncap.c linux-2.6.32.11/security/commoncap.c
---- linux-2.6.32.11/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/security/commoncap.c linux-2.6.32.12/security/commoncap.c
+--- linux-2.6.32.12/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400
@@ -27,7 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
@@ -54078,9 +54729,9 @@ diff -urNp linux-2.6.32.11/security/commoncap.c linux-2.6.32.11/security/commonc
return 0;
}
-diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/security/integrity/ima/ima_api.c
---- linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/security/integrity/ima/ima_api.c linux-2.6.32.12/security/integrity/ima/ima_api.c
+--- linux-2.6.32.12/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400
@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
int result;
@@ -54090,9 +54741,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/secu
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) {
-diff -urNp linux-2.6.32.11/security/integrity/ima/ima_fs.c linux-2.6.32.11/security/integrity/ima/ima_fs.c
---- linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/security/integrity/ima/ima_fs.c linux-2.6.32.12/security/integrity/ima/ima_fs.c
+--- linux-2.6.32.12/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400
@@ -27,12 +27,12 @@
static int valid_policy = 1;
#define TMPBUFLEN 12
@@ -54108,9 +54759,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_fs.c linux-2.6.32.11/secur
return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
}
-diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security/integrity/ima/ima.h
---- linux-2.6.32.11/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/security/integrity/ima/ima.h linux-2.6.32.12/security/integrity/ima/ima.h
+--- linux-2.6.32.12/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400
@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
extern spinlock_t ima_queue_lock;
@@ -54122,9 +54773,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security
struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
};
extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.11/security/integrity/ima/ima_queue.c linux-2.6.32.11/security/integrity/ima/ima_queue.c
---- linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -0400
+diff -urNp linux-2.6.32.12/security/integrity/ima/ima_queue.c linux-2.6.32.12/security/integrity/ima/ima_queue.c
+--- linux-2.6.32.12/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -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);
@@ -54134,9 +54785,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_queue.c linux-2.6.32.11/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.11/security/Kconfig linux-2.6.32.11/security/Kconfig
---- linux-2.6.32.11/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/security/Kconfig 2010-04-04 21:03:05.108480196 -0400
+diff -urNp linux-2.6.32.12/security/Kconfig linux-2.6.32.12/security/Kconfig
+--- linux-2.6.32.12/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/security/Kconfig 2010-04-29 17:46:37.065247062 -0400
@@ -4,6 +4,499 @@
menu "Security options"
@@ -54145,6 +54796,15 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig
+
+menu "PaX"
+
++ config PAX_PER_CPU_PGD
++ bool
++
++ config TASK_SIZE_MAX_SHIFT
++ int
++ depends on X86_64
++ default 47 if !PAX_PER_CPU_PGD
++ default 42 if PAX_PER_CPU_PGD
++
+config PAX
+ bool "Enable various PaX features"
+ depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86)
@@ -54229,15 +54889,6 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig
+ bool 'hook'
+endchoice
+
-+ config PAX_PER_CPU_PGD
-+ bool
-+
-+ config TASK_SIZE_MAX_SHIFT
-+ int
-+ depends on X86_64
-+ default 47 if !PAX_PER_CPU_PGD
-+ default 42 if PAX_PER_CPU_PGD
-+
+endmenu
+
+menu "Non-executable pages"
@@ -54646,9 +55297,9 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/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.11/security/min_addr.c linux-2.6.32.11/security/min_addr.c
---- linux-2.6.32.11/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400
-+++ linux-2.6.32.11/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/security/min_addr.c linux-2.6.32.12/security/min_addr.c
+--- linux-2.6.32.12/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400
++++ linux-2.6.32.12/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -54665,9 +55316,9 @@ diff -urNp linux-2.6.32.11/security/min_addr.c linux-2.6.32.11/security/min_addr
}
/*
-diff -urNp linux-2.6.32.11/sound/aoa/codecs/onyx.c linux-2.6.32.11/sound/aoa/codecs/onyx.c
---- linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/aoa/codecs/onyx.c linux-2.6.32.12/sound/aoa/codecs/onyx.c
+--- linux-2.6.32.12/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400
@@ -53,7 +53,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -54696,9 +55347,9 @@ diff -urNp linux-2.6.32.11/sound/aoa/codecs/onyx.c linux-2.6.32.11/sound/aoa/cod
onyx->spdif_locked = onyx->analog_locked = 0;
mutex_unlock(&onyx->mutex);
-diff -urNp linux-2.6.32.11/sound/core/oss/pcm_oss.c linux-2.6.32.11/sound/core/oss/pcm_oss.c
---- linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/core/oss/pcm_oss.c linux-2.6.32.12/sound/core/oss/pcm_oss.c
+--- linux-2.6.32.12/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400
@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
@@ -54710,9 +55361,9 @@ diff -urNp linux-2.6.32.11/sound/core/oss/pcm_oss.c linux-2.6.32.11/sound/core/o
#endif /* CONFIG_SND_VERBOSE_PROCFS */
/*
-diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/seq/seq_lock.h
---- linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/core/seq/seq_lock.h linux-2.6.32.12/sound/core/seq/seq_lock.h
+--- linux-2.6.32.12/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
@@ -54728,9 +55379,9 @@ diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/
#endif /* SMP || CONFIG_SND_DEBUG */
-diff -urNp linux-2.6.32.11/sound/drivers/mts64.c linux-2.6.32.11/sound/drivers/mts64.c
---- linux-2.6.32.11/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/drivers/mts64.c linux-2.6.32.12/sound/drivers/mts64.c
+--- linux-2.6.32.12/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400
@@ -65,7 +65,7 @@ struct mts64 {
struct pardevice *pardev;
int pardev_claimed;
@@ -54779,9 +55430,9 @@ diff -urNp linux-2.6.32.11/sound/drivers/mts64.c linux-2.6.32.11/sound/drivers/m
return 0;
}
-diff -urNp linux-2.6.32.11/sound/drivers/portman2x4.c linux-2.6.32.11/sound/drivers/portman2x4.c
---- linux-2.6.32.11/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/drivers/portman2x4.c linux-2.6.32.12/sound/drivers/portman2x4.c
+--- linux-2.6.32.12/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400
@@ -83,7 +83,7 @@ struct portman {
struct pardevice *pardev;
int pardev_claimed;
@@ -54791,9 +55442,9 @@ diff -urNp linux-2.6.32.11/sound/drivers/portman2x4.c linux-2.6.32.11/sound/driv
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-2.6.32.11/sound/oss/sb_audio.c linux-2.6.32.11/sound/oss/sb_audio.c
---- linux-2.6.32.11/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/oss/sb_audio.c linux-2.6.32.12/sound/oss/sb_audio.c
+--- linux-2.6.32.12/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -54803,9 +55454,9 @@ diff -urNp linux-2.6.32.11/sound/oss/sb_audio.c linux-2.6.32.11/sound/oss/sb_aud
if (copy_from_user(lbuf8,
userbuf+useroffs + p,
locallen))
-diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_codec.c linux-2.6.32.12/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
}
@@ -54815,9 +55466,9 @@ diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci
#ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400
-+++ linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_patch.c linux-2.6.32.12/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400
++++ linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
return 0;
}
@@ -55124,9 +55775,9 @@ diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci
.build_specific = patch_ucb1400_specific,
};
-diff -urNp linux-2.6.32.11/sound/pci/ens1370.c linux-2.6.32.11/sound/pci/ens1370.c
---- linux-2.6.32.11/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/pci/ens1370.c linux-2.6.32.12/sound/pci/ens1370.c
+--- linux-2.6.32.12/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400
@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -55136,9 +55787,27 @@ diff -urNp linux-2.6.32.11/sound/pci/ens1370.c linux-2.6.32.11/sound/pci/ens1370
};
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.32.11/sound/pci/intel8x0.c linux-2.6.32.11/sound/pci/intel8x0.c
---- linux-2.6.32.11/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400
+diff -urNp linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c
+--- linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 2010-04-29 17:46:37.441762570 -0400
+@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
+ cp_ready);
+
+ /* TODO */
+- if (cp_state)
+- ;
+- if (cp_ready)
+- ;
++ if (cp_state) {
++ }
++ if (cp_ready) {
++ }
+ }
+
+
+diff -urNp linux-2.6.32.12/sound/pci/intel8x0.c linux-2.6.32.12/sound/pci/intel8x0.c
+--- linux-2.6.32.12/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400
@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -55157,9 +55826,9 @@ diff -urNp linux-2.6.32.11/sound/pci/intel8x0.c linux-2.6.32.11/sound/pci/intel8
};
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.32.11/sound/pci/intel8x0m.c linux-2.6.32.11/sound/pci/intel8x0m.c
---- linux-2.6.32.11/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400
+diff -urNp linux-2.6.32.12/sound/pci/intel8x0m.c linux-2.6.32.12/sound/pci/intel8x0m.c
+--- linux-2.6.32.12/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400
@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -55178,9 +55847,9 @@ diff -urNp linux-2.6.32.11/sound/pci/intel8x0m.c linux-2.6.32.11/sound/pci/intel
};
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.32.11/usr/gen_init_cpio.c linux-2.6.32.11/usr/gen_init_cpio.c
---- linux-2.6.32.11/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400
+diff -urNp linux-2.6.32.12/usr/gen_init_cpio.c linux-2.6.32.12/usr/gen_init_cpio.c
+--- linux-2.6.32.12/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
++++ linux-2.6.32.12/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -55203,10 +55872,10 @@ diff -urNp linux-2.6.32.11/usr/gen_init_cpio.c linux-2.6.32.11/usr/gen_init_cpio
} else
break;
}
-diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main.c
---- linux-2.6.32.11/virt/kvm/kvm_main.c 2010-03-15 11:52:04.000000000 -0400
-+++ linux-2.6.32.11/virt/kvm/kvm_main.c 2010-04-04 20:46:41.737788480 -0400
-@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode
+diff -urNp linux-2.6.32.12/virt/kvm/kvm_main.c linux-2.6.32.12/virt/kvm/kvm_main.c
+--- linux-2.6.32.12/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400
++++ linux-2.6.32.12/virt/kvm/kvm_main.c 2010-04-29 17:49:58.805045845 -0400
+@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
@@ -55214,7 +55883,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main
static struct file_operations kvm_vcpu_fops = {
.release = kvm_vcpu_release,
.unlocked_ioctl = kvm_vcpu_ioctl,
-@@ -2341,6 +2342,7 @@ static int kvm_vm_mmap(struct file *file
+@@ -2344,6 +2345,7 @@ static int kvm_vm_mmap(struct file *file
return 0;
}
@@ -55222,7 +55891,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main
static struct file_operations kvm_vm_fops = {
.release = kvm_vm_release,
.unlocked_ioctl = kvm_vm_ioctl,
-@@ -2428,6 +2430,7 @@ out:
+@@ -2431,6 +2433,7 @@ out:
return r;
}
@@ -55230,7 +55899,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main
static struct file_operations kvm_chardev_ops = {
.unlocked_ioctl = kvm_dev_ioctl,
.compat_ioctl = kvm_dev_ioctl,
-@@ -2437,6 +2440,9 @@ static struct miscdevice kvm_dev = {
+@@ -2440,6 +2443,9 @@ static struct miscdevice kvm_dev = {
KVM_MINOR,
"kvm",
&kvm_chardev_ops,
@@ -55240,7 +55909,7 @@ diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main
};
static void hardware_enable(void *junk)
-@@ -2711,7 +2717,7 @@ static void kvm_sched_out(struct preempt
+@@ -2714,7 +2720,7 @@ static void kvm_sched_out(struct preempt
kvm_arch_vcpu_put(vcpu);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 18:44:11 +0000